452 files changed, 46133 insertions, 0 deletions
diff --git a/das-java/trunk/distribution/binary/DISCLAIMER b/das-java/trunk/distribution/binary/DISCLAIMER
new file mode 100644
index 0000000000..a65af91c5a
--- /dev/null
+++ b/das-java/trunk/distribution/binary/DISCLAIMER
@@ -0,0 +1,7 @@
+Apache Tuscany is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
+\ No newline at end of file
diff --git a/das-java/trunk/distribution/binary/LICENSE b/das-java/trunk/distribution/binary/LICENSE
new file mode 100644
index 0000000000..9597d92eb3
--- /dev/null
+++ b/das-java/trunk/distribution/binary/LICENSE
@@ -0,0 +1,353 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+===============================================================================================================
+
+Other components and dependencies under Apache Software License 2.0 : 
+
+   log4j-1.2.14.jar    - Apache Logging Services
+   derby 10.2.2.0.jar  - Apache Derby
+   stax-api-1.0.1.jar  - The Streaming API for XML (StAX)
+   wstx-asl-3.2.0.jar  - WoodStox StAX implementation
+   standard-1.1.1.jar  - The Apache Jackarta Taglibs
+   jstl-1.1.2.jar      - The Apache Jackarta Taglibs
+   *.tld               - The Apache Jackarta Taglibs
+
+===============================================================================================================
+
+
+Apache Tuscany SDO for Java Subcomponents
+=========================================: 
+
+The Tuscany SDO for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
+
+Permission to copy, make derivative works of, and distribute the Service Data Objects 
+JavaDoc and Interface Definition Files files in any medium without fee or royalty as part 
+of a compliant implementation of the Service Data Objects Specification is hereby granted.  
+The Service Data Objects Specification may be found at any of the following locations:
+
+http://dev2dev.bea.com/technologies/commonj/index.jsp
+http://www.ibm.com/developerworks/library/specification/ws-sdo/
+http://oracle.com/technology/webservices/sca
+https://www.sdn.sap.com/
+http://www.xcalia/xdn/specs/sdo
+
+THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES 
+ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS 
+SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES AND THE IMPLEMENTATION OF THEIR CONTENTS, 
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE 
+SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or 
+publicity pertaining to the Service Component Architecture Specification or its contents without specific, 
+written prior permission. Title to copyright in the Service Data Objects Specification and the 
+JavaDoc and Interface Definition Files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+=================================================================================================================
+
+For the Eclipse EMF components
+(codegen-2.2.3.jar
+codegen-ecore-2.2.3.jar
+common-2.2.3.jar
+ecore-2.2.3.jar
+ecore-change-2.2.3.jar
+ecore-xmi-2.2.3.jar
+xsd-2.2.3.jar)
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+===================================================================================================
diff --git a/das-java/trunk/distribution/binary/NOTICE b/das-java/trunk/distribution/binary/NOTICE
new file mode 100644
index 0000000000..69a83ad3a1
--- /dev/null
+++ b/das-java/trunk/distribution/binary/NOTICE
@@ -0,0 +1,24 @@
+Apache Tuscany SDO for Java
+Copyright 2006, 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Unless otherwise indicated, all distribution made available by the Apache Software Foundation
+is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
+A copy of the AL is provided with this distribution as the LICENSE file present in the
+root directory, and is also available at http://www.apache.org/licenses/.
+
+The terms and conditions governing the distribution may refer to the AL or other license
+agreements, notices or terms and conditions. Some of these other license agreements may
+include (but are not limited to):
+
+  . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
+
+It is your obligation to read and accept all such terms and conditions prior to use of the
+distribution. If term or condition is provided, please contact the Apache Software Foundation
+to determine what terms and conditions govern that particular distribution.
+
+This product also includes software developed by the Open Service Oriented Architecture organisation
+(http://osoa.org). The license for this software may be found in the LICENSE file contained in this
+distribution.
diff --git a/das-java/trunk/distribution/binary/README b/das-java/trunk/distribution/binary/README
new file mode 100644
index 0000000000..8d292cbb06
--- /dev/null
+++ b/das-java/trunk/distribution/binary/README
@@ -0,0 +1,10 @@
+                           Apache Tuscany 
+             -------------------------------------------
+
+Welcome to Tuscany! Please read the release notes (RELEASE_NOTES) in this directory for
+details on the current release.
+
+Thanks from all of us on the Tuscany team for downloading the package; help
+us make it better by sending comments to tuscany-user@ws.apache.org.
+
+
diff --git a/das-java/trunk/distribution/binary/RELEASE_NOTES b/das-java/trunk/distribution/binary/RELEASE_NOTES
new file mode 100644
index 0000000000..b9c205a75e
--- /dev/null
+++ b/das-java/trunk/distribution/binary/RELEASE_NOTES
@@ -0,0 +1,33 @@
+DAS - Data Access Services
+
+Service Data Object(SDO) provides a uniform API for handling different types of data. Data Access Service (DAS) 
+simplifies handling of data when interacting with the back-end data source and frees application developers 
+from dealing with tedious and error-prone transformation between end source types and SDO Data Object Types/properties..
+
+What's new in Apache Tuscany DAS beta2
+======================================
+
+   The main purpose of the DAS beta2 release is to fix incompatibilites that were found with SDO 1.0 release.
+
+   The following JIRAs also were fixed on DAS beta2
+   
+     - TUSCANY-986  - DAS integration with SDO 2.1 APIs
+     - TUSCANY-961  - DAS: Using deprected SDO method causes Type lookup failure
+     - TUSCANY-1353 - Exception attempting to insert rows using DAS w/DataDirect JDBC driver
+     - TUSCANY-1453 - DAS can't read or write the blob field
+     - TUSCANY-1463 - Support for Clob and Array fields
+     - TUSCANY-1462 - Consistent use of Parameters in Config
+     - TUSCANY-1464 - Wrong query results when SELECT misses PKs
+     - TUSCANY-1465 - Allow passing ResultDescriptor for dynamic Commands
+     - TUSCANY-1720 - Modify sample readmes for - steps to run sample with other databases
+
+   
+   
+Details are described below.
+
+   DAS Java beta2 is a superset of previous DAS Java M1,M2 and Beta1 releases.
+   Anything in these previous releases is also in beta2, but beta2 contains features and bug fixes not present on them.
+
+Compatibility Concerns
+
+   - SDO Static types should be regenerated based on SDO 1.0 tools.
diff --git a/das-java/trunk/distribution/binary/pom.xml b/das-java/trunk/distribution/binary/pom.xml
new file mode 100644
index 0000000000..6fec609dac
--- /dev/null
+++ b/das-java/trunk/distribution/binary/pom.xml
@@ -0,0 +1,98 @@
+<?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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.das</groupId>
+        <artifactId>tuscany-das</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.tuscany.das.distribution</groupId>
+    <artifactId>tuscany-das-bin</artifactId>
+    <packaging>pom</packaging>
+    <name>Tuscany DAS Distribution (Binary)</name>
+    <description>Tuscany Distribution for DAS.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.das</groupId>
+            <artifactId>tuscany-das-rdb</artifactId>
+            <version>${das.version}</version>
+        </dependency>
+
+       <dependency>
+          <groupId>org.apache.tuscany.das.samples</groupId>
+          <artifactId>tuscany-das-sample-company-webapp</artifactId>
+          <version>${das.version}</version>
+          <type>war</type>
+      </dependency>        
+
+       <dependency>
+          <groupId>org.apache.tuscany.das.samples</groupId>
+          <artifactId>tuscany-das-sample-customer</artifactId>
+          <version>${das.version}</version>
+      </dependency>        
+
+       <dependency>
+          <groupId>org.apache.tuscany.das.samples</groupId>
+          <artifactId>tuscany-das-sample-advanced-webapp</artifactId>
+          <version>${das.version}</version>
+          <type>war</type>
+      </dependency>        
+
+       <dependency>
+          <groupId>org.apache.tuscany.das.samples</groupId>
+          <artifactId>tuscany-das-sample-transaction</artifactId>
+          <version>${das.version}</version>
+      </dependency>
+      
+       <dependency>
+          <groupId>org.apache.tuscany.das</groupId>
+          <artifactId>tuscany-das-tools</artifactId>
+          <version>${das.version}</version>
+      </dependency>      
+    </dependencies>
+
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <finalName>tuscany-das-${das.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/das.xml</descriptor>
+                    </descriptors>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/das-java/trunk/distribution/binary/src/main/assembly/das.xml b/das-java/trunk/distribution/binary/src/main/assembly/das.xml
new file mode 100644
index 0000000000..0d916640fd
--- /dev/null
+++ b/das-java/trunk/distribution/binary/src/main/assembly/das.xml
@@ -0,0 +1,174 @@
+<?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.
+-->
+<assembly>
+    <id>bin</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+
+    <fileSets>
+        <!-- include legal and other files -->
+        <fileSet>
+            <outputDirectory>tuscany-das-${das.version}</outputDirectory>
+            <includes>
+                <include>LICENSE*</include>
+                <include>NOTICE*</include>
+                <include>DISCLAIMER*</include>
+                <include>README*</include>
+                <include>RELEASE_NOTES*</include>
+            </includes>
+        </fileSet>
+        
+        <!-- include javadocs -->
+        <!-- this will silient fail and generate empty distribution if javadoc is not available -->
+	<fileSet>
+	   <directory>../../rdb/target/apidocs</directory>
+	   <outputDirectory>tuscany-das-${das.version}/doc</outputDirectory>
+	</fileSet>  
+		
+    </fileSets>
+
+        <files>
+            <!-- include readme for companyweb sample -->
+            <file>
+               <source>../../samples/company-webapp/readme.htm</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/company-webapp</outputDirectory>
+               <fileMode>0644</fileMode>
+            </file>
+            <!-- include companyweb sample -->
+            <file>
+               <source>../../samples/company-webapp/target/sample-company-webapp.war</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/company-webapp</outputDirectory>
+               <fileMode>0644</fileMode>
+            </file>
+
+            
+            
+            <!-- include readme for ajax das sample -->
+            <file>
+               <source>../../samples/advanced-webapp/readme.htm</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/advanced-webapp</outputDirectory>
+               <fileMode>0644</fileMode>
+            </file>
+            <!-- include ajax das sample -->
+            <file>
+               <source>../../samples/advanced-webapp/target/sample-advanced-webapp.war</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/advanced-webapp</outputDirectory>
+               <fileMode>0644</fileMode>
+            </file>
+            
+            
+            <!-- include readme for customer sample -->
+            <file>
+               <source>../../samples/customer/readme.htm</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/customer</outputDirectory>
+               <fileMode>0644</fileMode>
+            </file>
+            <!-- include customer sample -->
+            <file>
+               <source>../../samples/customer/target/sample-customer.jar</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/customer</outputDirectory>
+               <fileMode>0644</fileMode>
+            </file>
+            <file>
+               <source>../../samples/customer/build.xml</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/customer</outputDirectory>
+               <fileMode>0644</fileMode>
+            </file>
+            
+            <!-- include readme for transaction sample -->
+            <file>
+               <source>../../samples/transaction/readme.htm</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/transaction</outputDirectory>
+               <fileMode>0644</fileMode>
+            </file>
+            <!-- include transaction sample -->
+            <file>
+               <source>../../samples/transaction/target/sample-transaction.jar</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/transaction</outputDirectory>
+               <fileMode>0644</fileMode>
+            </file>
+            <file>
+               <source>../../samples/transaction/build.xml</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/transaction</outputDirectory>
+               <fileMode>0644</fileMode>
+            </file>
+            
+            <!-- include readme for tuscany-das-tools -->
+            <file>
+               <source>../../tools/readme.htm</source>
+               <outputDirectory>tuscany-das-${das.version}/tuscany-das-tools</outputDirectory>
+               <fileMode>0644</fileMode>
+            </file>
+            <!-- include das-tools -->
+            <file>
+               <source>../../tools/target/tuscany-das-tools.jar</source>
+               <outputDirectory>tuscany-das-${das.version}/tuscany-das-tools</outputDirectory>
+               <fileMode>0644</fileMode>
+            </file>
+            
+        </files>
+
+
+    <dependencySets>
+        <!-- DAS api impl -->
+        <dependencySet>
+            <outputDirectory>tuscany-das-${das.version}/lib</outputDirectory>
+            <includes>
+                <include>org.apache.tuscany.das:tuscany-das-rdb</include>
+            </includes>
+            <fileMode>0644</fileMode>
+        </dependencySet>
+        
+        <!-- DAS Samples - Customer derby dependency-->
+        <dependencySet>
+	    <outputDirectory>tuscany-das-${das.version}/samples/customer</outputDirectory>
+	        <includes>
+	            <include>org.apache.derby:derby</include>
+	        </includes>
+	    <fileMode>0644</fileMode>
+        </dependencySet>
+
+	<!-- DAS Samples - Transaction mysql dependency-->
+        <dependencySet>
+	    <outputDirectory>tuscany-das-${das.version}/samples/transaction</outputDirectory>
+	        <includes>
+	            <include>mysql:mysql-connector-java</include>
+	            <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+	            <include>org.apache.geronimo.components:geronimo-transaction</include>
+	            <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+	            <include>org.apache.tuscany.das.samples:tuscany-das-sample-dbconfig</include>
+	        </includes>	    
+	    <fileMode>0644</fileMode>
+        </dependencySet>
+
+        <!-- DAS tools - torque dependency-->
+        <dependencySet>
+	    <outputDirectory>tuscany-das-${das.version}/tuscany-das-tools</outputDirectory>
+	        <includes>
+	            <include>torque:torque-gen</include>
+	        </includes>
+	    <fileMode>0644</fileMode>
+        </dependencySet>
+        
+    </dependencySets>
+</assembly>
diff --git a/das-java/trunk/distribution/source/BUILDING b/das-java/trunk/distribution/source/BUILDING
new file mode 100644
index 0000000000..edc05e6cec
--- /dev/null
+++ b/das-java/trunk/distribution/source/BUILDING
@@ -0,0 +1,47 @@
+Building the Apache Tuscany DAS beta1
+=====================================
+
+Initial Setup
+-------------
+
+1) Install J2SE 5.0 SDK, which can be downloaded from 
+   http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_06 JDK.
+
+2) Make sure that your JAVA_HOME environment variable is set to the newly installed 
+   JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 
+   $JAVA_HOME$/bin (unix).
+
+3) Install Maven 2.0.5, which can be downloaded from http://maven.apache.org/download.html. 
+   Make sure that your PATH includes the MVN_HOME/bin directory. 
+
+
+Building
+--------
+
+1) Change to the top level directory to Apache Tuscany source distribution.
+2) Run
+
+	$> mvn
+
+   This will compile Apache Tuscany DAS and run all of the tests in the source
+   distribution. 
+
+   Depending on the load of remote Maven 2.0 repositories, you may have 
+   to run "mvn" several times utill the required dependencies are 
+   all located in your local maven repository. It usually takes some time for 
+   maven to download required dependencies in the first build. Once all the 
+   dependencies have been downloaded you may use the -o option to run maven
+   in offline mode, for example, 'mvn clean install -o'.
+
+
+Building the distributions
+--------------------------
+
+1) Change to the top level directory to Apache Tuscany source distribution.
+2) If you haven't run a complete build, please follow the steps above
+3) Run
+
+	$> mvn -Pdistribution
+
+   This will build the binary and source distribution with .zip and .gz 
+   formats in the distribution/target directory.
diff --git a/das-java/trunk/distribution/source/DISCLAIMER b/das-java/trunk/distribution/source/DISCLAIMER
new file mode 100644
index 0000000000..a65af91c5a
--- /dev/null
+++ b/das-java/trunk/distribution/source/DISCLAIMER
@@ -0,0 +1,7 @@
+Apache Tuscany is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
+\ No newline at end of file
diff --git a/das-java/trunk/distribution/source/LICENSE b/das-java/trunk/distribution/source/LICENSE
new file mode 100644
index 0000000000..9597d92eb3
--- /dev/null
+++ b/das-java/trunk/distribution/source/LICENSE
@@ -0,0 +1,353 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+===============================================================================================================
+
+Other components and dependencies under Apache Software License 2.0 : 
+
+   log4j-1.2.14.jar    - Apache Logging Services
+   derby 10.2.2.0.jar  - Apache Derby
+   stax-api-1.0.1.jar  - The Streaming API for XML (StAX)
+   wstx-asl-3.2.0.jar  - WoodStox StAX implementation
+   standard-1.1.1.jar  - The Apache Jackarta Taglibs
+   jstl-1.1.2.jar      - The Apache Jackarta Taglibs
+   *.tld               - The Apache Jackarta Taglibs
+
+===============================================================================================================
+
+
+Apache Tuscany SDO for Java Subcomponents
+=========================================: 
+
+The Tuscany SDO for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
+
+Permission to copy, make derivative works of, and distribute the Service Data Objects 
+JavaDoc and Interface Definition Files files in any medium without fee or royalty as part 
+of a compliant implementation of the Service Data Objects Specification is hereby granted.  
+The Service Data Objects Specification may be found at any of the following locations:
+
+http://dev2dev.bea.com/technologies/commonj/index.jsp
+http://www.ibm.com/developerworks/library/specification/ws-sdo/
+http://oracle.com/technology/webservices/sca
+https://www.sdn.sap.com/
+http://www.xcalia/xdn/specs/sdo
+
+THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES 
+ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS 
+SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES AND THE IMPLEMENTATION OF THEIR CONTENTS, 
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE 
+SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or 
+publicity pertaining to the Service Component Architecture Specification or its contents without specific, 
+written prior permission. Title to copyright in the Service Data Objects Specification and the 
+JavaDoc and Interface Definition Files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+=================================================================================================================
+
+For the Eclipse EMF components
+(codegen-2.2.3.jar
+codegen-ecore-2.2.3.jar
+common-2.2.3.jar
+ecore-2.2.3.jar
+ecore-change-2.2.3.jar
+ecore-xmi-2.2.3.jar
+xsd-2.2.3.jar)
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+===================================================================================================
diff --git a/das-java/trunk/distribution/source/NOTICE b/das-java/trunk/distribution/source/NOTICE
new file mode 100644
index 0000000000..69a83ad3a1
--- /dev/null
+++ b/das-java/trunk/distribution/source/NOTICE
@@ -0,0 +1,24 @@
+Apache Tuscany SDO for Java
+Copyright 2006, 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Unless otherwise indicated, all distribution made available by the Apache Software Foundation
+is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
+A copy of the AL is provided with this distribution as the LICENSE file present in the
+root directory, and is also available at http://www.apache.org/licenses/.
+
+The terms and conditions governing the distribution may refer to the AL or other license
+agreements, notices or terms and conditions. Some of these other license agreements may
+include (but are not limited to):
+
+  . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
+
+It is your obligation to read and accept all such terms and conditions prior to use of the
+distribution. If term or condition is provided, please contact the Apache Software Foundation
+to determine what terms and conditions govern that particular distribution.
+
+This product also includes software developed by the Open Service Oriented Architecture organisation
+(http://osoa.org). The license for this software may be found in the LICENSE file contained in this
+distribution.
diff --git a/das-java/trunk/distribution/source/README b/das-java/trunk/distribution/source/README
new file mode 100644
index 0000000000..8d292cbb06
--- /dev/null
+++ b/das-java/trunk/distribution/source/README
@@ -0,0 +1,10 @@
+                           Apache Tuscany 
+             -------------------------------------------
+
+Welcome to Tuscany! Please read the release notes (RELEASE_NOTES) in this directory for
+details on the current release.
+
+Thanks from all of us on the Tuscany team for downloading the package; help
+us make it better by sending comments to tuscany-user@ws.apache.org.
+
+
diff --git a/das-java/trunk/distribution/source/RELEASE_NOTES b/das-java/trunk/distribution/source/RELEASE_NOTES
new file mode 100644
index 0000000000..b9c205a75e
--- /dev/null
+++ b/das-java/trunk/distribution/source/RELEASE_NOTES
@@ -0,0 +1,33 @@
+DAS - Data Access Services
+
+Service Data Object(SDO) provides a uniform API for handling different types of data. Data Access Service (DAS) 
+simplifies handling of data when interacting with the back-end data source and frees application developers 
+from dealing with tedious and error-prone transformation between end source types and SDO Data Object Types/properties..
+
+What's new in Apache Tuscany DAS beta2
+======================================
+
+   The main purpose of the DAS beta2 release is to fix incompatibilites that were found with SDO 1.0 release.
+
+   The following JIRAs also were fixed on DAS beta2
+   
+     - TUSCANY-986  - DAS integration with SDO 2.1 APIs
+     - TUSCANY-961  - DAS: Using deprected SDO method causes Type lookup failure
+     - TUSCANY-1353 - Exception attempting to insert rows using DAS w/DataDirect JDBC driver
+     - TUSCANY-1453 - DAS can't read or write the blob field
+     - TUSCANY-1463 - Support for Clob and Array fields
+     - TUSCANY-1462 - Consistent use of Parameters in Config
+     - TUSCANY-1464 - Wrong query results when SELECT misses PKs
+     - TUSCANY-1465 - Allow passing ResultDescriptor for dynamic Commands
+     - TUSCANY-1720 - Modify sample readmes for - steps to run sample with other databases
+
+   
+   
+Details are described below.
+
+   DAS Java beta2 is a superset of previous DAS Java M1,M2 and Beta1 releases.
+   Anything in these previous releases is also in beta2, but beta2 contains features and bug fixes not present on them.
+
+Compatibility Concerns
+
+   - SDO Static types should be regenerated based on SDO 1.0 tools.
diff --git a/das-java/trunk/distribution/source/pom.xml b/das-java/trunk/distribution/source/pom.xml
new file mode 100644
index 0000000000..d6fe42ce63
--- /dev/null
+++ b/das-java/trunk/distribution/source/pom.xml
@@ -0,0 +1,66 @@
+<?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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.das</groupId>
+        <artifactId>tuscany-das</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.tuscany.das.distribution</groupId>
+    <artifactId>tuscany-das-src</artifactId>
+    <packaging>pom</packaging>
+    <name>Tuscany DAS Distribution (Source)</name>
+    <description>Tuscany Distribution for DAS.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.das</groupId>
+            <artifactId>tuscany-das-rdb</artifactId>
+            <version>${das.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <finalName>tuscany-das-${das.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/src.xml</descriptor>
+                    </descriptors>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/das-java/trunk/distribution/source/src/main/assembly/src.xml b/das-java/trunk/distribution/source/src/main/assembly/src.xml
new file mode 100644
index 0000000000..593e1bccd2
--- /dev/null
+++ b/das-java/trunk/distribution/source/src/main/assembly/src.xml
@@ -0,0 +1,63 @@
+<?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.
+-->
+
+<assembly>
+  <id>src</id>
+  <baseDirectory>tuscany-das-${das.version}-src</baseDirectory>
+  <formats>
+    <format>zip</format>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <includes>
+           <include>BUILDING*</include>
+           <include>LICENSE*</include>
+           <include>NOTICE*</include>
+           <include>DISCLAIMER*</include>
+           <include>README*</include>
+           <include>RELEASE_NOTES*</include>
+        <include>pom.xml</include>
+      </includes>
+      <useDefaultExcludes>true</useDefaultExcludes>
+    </fileSet>
+    <fileSet>
+      <directory>../../</directory>
+      <outputDirectory></outputDirectory>
+      <useDefaultExcludes>true</useDefaultExcludes>
+
+      <lineEnding>keep</lineEnding>
+      <includes>
+         <include>**/*.*</include>
+      </includes>
+      <excludes>
+         <exclude>**/ldap/**</exclude>
+         <exclude>**/target/**</exclude>
+         <exclude>**/dastest/**</exclude>
+         <exclude>**/.settings/**</exclude>
+         <exclude>**/**.mdl</exclude>
+         <exclude>**/derby.log</exclude>
+         <exclude>**/.project</exclude>
+         <exclude>**/.classpath</exclude>
+      </excludes>
+      <fileMode>0644</fileMode>
+    </fileSet>
+  </fileSets>
+</assembly>
+\ No newline at end of file
diff --git a/das-java/trunk/plugin/pom.xml b/das-java/trunk/plugin/pom.xml
new file mode 100644
index 0000000000..c64751d03d
--- /dev/null
+++ b/das-java/trunk/plugin/pom.xml
@@ -0,0 +1,107 @@
+<?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.
+-->
+<project>
+    <parent>
+        <groupId>org.apache.tuscany.das</groupId>
+        <artifactId>tuscany-das</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tuscany-das-plugin</artifactId>
+    <packaging>maven-plugin</packaging>
+    <name>Tuscany DAS Maven Plugin</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>2.0.4</version>
+            <scope>compile</scope>
+        </dependency>
+	<dependency>
+	    <groupId>org.apache.maven</groupId>
+	    <artifactId>maven-model</artifactId>
+	    <version>2.0.4</version>
+	</dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-project</artifactId>
+            <version>2.0.4</version>
+            <scope>compile</scope>
+        </dependency>       
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-descriptor</artifactId>
+            <version>2.0.4</version>
+            <scope>compile</scope>
+        </dependency>                
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.2.2.0</version>
+        </dependency>
+
+        <dependency>
+		    <groupId>torque</groupId>
+		    <artifactId>torque-gen</artifactId>
+		    <version>3.3-RC2</version>
+		</dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.das</groupId>
+            <artifactId>tuscany-das-tools</artifactId>
+            <version>${das.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+       
+    <profiles>
+        <profile>
+			<id>plugin-test</id>       
+           <build>
+			<plugins>
+			    <plugin>
+				<groupId>org.apache.tuscany.das</groupId>
+				<artifactId>tuscany-das-plugin</artifactId>
+				<version>${das.version}</version>
+				<executions>
+				    <execution>
+					<id>dbToxsd</id>
+				    	<phase>generate-resources</phase>
+					<configuration>
+					    <schemaFile>${basedir}/target/schema.xml</schemaFile>
+					    <modelFile>${basedir}/target/sdoModel.xsd</modelFile>
+					    <driverClass>org.apache.derby.jdbc.EmbeddedDriver</driverClass>
+					    <databaseURL>jdbc:derby:${basedir}/../rdb/target/dastest</databaseURL>
+					    <schemaName>APP</schemaName>
+					</configuration>			
+					<goals>
+					    <goal>generate</goal>
+					</goals>
+				    </execution>
+				  </executions>		    
+			    </plugin>	   
+			</plugins>
+    	</build>
+    </profile>
+   </profiles>
+    	 
+</project>
+\ No newline at end of file
diff --git a/das-java/trunk/plugin/src/main/java/org/apache/tuscany/das/plugin/GeneratorMojo.java b/das-java/trunk/plugin/src/main/java/org/apache/tuscany/das/plugin/GeneratorMojo.java
new file mode 100644
index 0000000000..3c0b671ec7
--- /dev/null
+++ b/das-java/trunk/plugin/src/main/java/org/apache/tuscany/das/plugin/GeneratorMojo.java
@@ -0,0 +1,111 @@
+/**
+ *
+ *  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.
+ */
+package org.apache.tuscany.das.plugin;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.tuscany.das.rdb.util.DBToXSDGenerator;
+import org.apache.tuscany.das.rdb.util.ModelXSDGenOption;
+
+/**
+ * @goal generate
+ * @phase generate-resources
+ * @description Generate XSD Model files from DB Schema or db schema XML file
+ */
+public class GeneratorMojo extends AbstractMojo {
+    /**
+     * The file containing db schema in xml
+     *
+     * @parameter property="schemaFile"
+     */
+    private String schemaFile;
+
+    /**
+     * The file that will contain Static SDO Model XSD
+     * @parameter
+     */
+    private String modelFile;
+
+    /**
+     * Specifies the driverClass to use for connecting to database.
+     *
+     * @parameter
+     */
+    private String driverClass;
+
+    /**
+     * Specifies the databaseURL
+     *
+     * @parameter
+     */
+    private String databaseURL;
+
+    /**
+     * DB Schema name.
+     *
+     * @parameter
+     */
+    private String schemaName;
+
+    /**
+     * Optional user name.
+     *
+     * @parameter
+     */
+    private String userName;
+
+    /**
+     * Optional password.
+     *
+     * @parameter
+     */
+    private String password;
+
+    public void execute() throws MojoExecutionException {
+    	//if driverClass, databaseURL and schemaName present, use it to connect to DB ,
+    	//if any from these 3 is absent, and schemaFile is present use it as input
+    	ModelXSDGenOption mo =  new ModelXSDGenOption();
+        if (null != driverClass && null != databaseURL && null != schemaName && null != schemaFile) {
+        	mo.setDriverClass(driverClass);
+        	mo.setDatabaseURL(databaseURL);
+        	mo.setSchemaName(schemaName);
+        	mo.setUserName(userName);
+        	mo.setPassword(password);
+        	mo.setSchemaFile(schemaFile);
+        	mo.setModelFile(modelFile);
+
+        	try {
+        		DBToXSDGenerator.getModelFileFromDB(mo);
+        	} catch(Exception e) {
+        		throw new MojoExecutionException(e.getMessage());
+        	}
+        } else if(null != schemaFile) {
+        	mo.setSchemaFile(schemaFile);
+        	mo.setModelFile(modelFile); //if null, STDOUT
+        	try {
+        		DBToXSDGenerator.getModelFileFromSchemaFile(mo);
+        	} catch(Exception e) {
+        		throw new MojoExecutionException(e.getMessage());
+        	}
+        } else {
+        	throw new MojoExecutionException("Provide DB Connection info or DB Schema XML file!");
+        }
+    }
+}
+\ No newline at end of file
diff --git a/das-java/trunk/pom.xml b/das-java/trunk/pom.xml
new file mode 100644
index 0000000000..56efdcd33a
--- /dev/null
+++ b/das-java/trunk/pom.xml
@@ -0,0 +1,160 @@
+<?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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany</groupId>
+        <artifactId>parent</artifactId>
+        <version>3-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.tuscany.das</groupId>
+    <artifactId>tuscany-das</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany DAS Implementation project</name>
+    
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/tuscany/java/das</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tuscany/java/das</developerConnection>
+        <url>http://svn.apache.org/repos/asf/tuscany/java/das/</url>
+    </scm>
+    
+    <properties>
+        <das.version>1.0-SNAPSHOT</das.version>
+        <sdo.version>1.1.1</sdo.version>
+    </properties>
+    
+    <!-- definition of repositories where the parent pom can be found -->
+    <repositories>
+        <repository>
+            <id>apache.snapshots</id>
+            <name>Apache Snapshot Repository</name>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>apache.incubator</id>
+            <name>Apache Incubator Repository</name>
+            <url>http://people.apache.org/repo/m2-incubating-repository/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.tuscany.sdo</groupId>
+                <artifactId>tuscany-sdo-impl</artifactId>
+                <version>${sdo.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.1</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <reportFormat>brief</reportFormat>
+                    <useFile>false</useFile>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+			<manifestEntries>
+			    <Extension-Name>${project.artifactId}</Extension-Name>
+			    <Specification-Title>${name}</Specification-Title>
+			    <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+			    <Specification-Version>${version}</Specification-Version>
+			    <Implementation-Title>${name}</Implementation-Title>
+			    <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+			    <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+			    <Implementation-Version>${version}</Implementation-Version>
+			</manifestEntries>                        
+                    </archive>
+                </configuration>
+		<version>2.1</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+            <modules>
+                <module>rdb</module>
+                <module>samples</module>
+                <module>tools</module>
+                <module>plugin</module>
+            </modules>
+        </profile>
+        
+        <profile>
+            <id>distribution</id>
+            <modules>
+                <module>rdb</module>
+                <module>samples</module>
+                <module>tools</module>
+                <module>plugin</module>
+                <module>distribution/binary</module>
+                <module>distribution/source</module>
+            </modules>
+        </profile>
+     </profiles>
+
+</project>
diff --git a/das-java/trunk/rdb/pom.xml b/das-java/trunk/rdb/pom.xml
new file mode 100644
index 0000000000..059a08c52b
--- /dev/null
+++ b/das-java/trunk/rdb/pom.xml
@@ -0,0 +1,272 @@
+<?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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.das</groupId>
+        <artifactId>tuscany-das</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>tuscany-das-rdb</artifactId>
+    <name>Tuscany DAS for Relational Databases</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-api-r2.1</artifactId>
+            <version>${sdo.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>${sdo.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-lib</artifactId>
+            <version>${sdo.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.2.2.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <defaultGoal>install</defaultGoal>
+    </build>
+
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+	    <build>
+		<plugins>
+		    <plugin>
+			<groupId>org.apache.tuscany.sdo</groupId>
+			<artifactId>tuscany-sdo-plugin</artifactId>
+			<version>${sdo.version}</version>
+			<executions>
+			    <execution>
+				<id>config</id>
+				<configuration>
+				    <schemaFile>${basedir}/src/main/resources/config.xsd</schemaFile>
+				    <noNotification>true</noNotification>
+				    <noUnsettable>true</noUnsettable>
+				</configuration>
+				<goals>
+				    <goal>generate</goal>
+				</goals>
+			    </execution>
+			    <execution>
+				<id>companynoid</id>
+				<configuration>
+				    <schemaFile>${basedir}/src/test/resources/companynoid.xsd</schemaFile>
+				    <noUnsettable>true</noUnsettable>
+				</configuration>
+				<goals>
+				    <goal>generate</goal>
+				</goals>
+			    </execution>			    
+			    <execution>
+				<id>company</id>
+				<configuration>
+				    <schemaFile>${basedir}/src/test/resources/company.xsd</schemaFile>
+				    <noUnsettable>true</noUnsettable>
+				</configuration>
+				<goals>
+				    <goal>generate</goal>
+				</goals>
+			    </execution>                
+			    <execution>
+				<id>customer</id>
+				<configuration>
+				    <schemaFile>${basedir}/src/test/resources/customer.xsd</schemaFile>
+				    <noUnsettable>true</noUnsettable>
+				</configuration>
+				<goals>
+				    <goal>generate</goal>
+				</goals>
+			    </execution>
+			    <execution>
+				<id>singer</id>
+				<configuration>
+				    <schemaFile>${basedir}/src/test/resources/SINGER.xsd</schemaFile>
+				    <noUnsettable>true</noUnsettable>
+				</configuration>
+				<goals>
+				    <goal>generate</goal>
+				</goals>
+			    </execution>			    
+			</executions>
+		    </plugin>
+
+		    <plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-surefire-plugin</artifactId>
+			<configuration>
+			    <includes>
+				<include>**/*AllTestsDerby.java</include>
+			    </includes>
+			</configuration>
+		    </plugin>
+		</plugins>
+	    </build>
+
+        </profile>
+
+        <profile>
+            <id>distribution</id>
+
+	    <build>
+		<plugins>
+		    <plugin>
+			<groupId>org.apache.tuscany.sdo</groupId>
+			<artifactId>tuscany-sdo-plugin</artifactId>
+			<version>${sdo.version}</version>
+			<executions>
+			    <execution>
+				<id>config</id>
+				<configuration>
+				    <schemaFile>${basedir}/src/main/resources/config.xsd</schemaFile>
+				    <noNotification>true</noNotification>
+				    <noUnsettable>true</noUnsettable>
+				</configuration>
+				<goals>
+				    <goal>generate</goal>
+				</goals>
+			    </execution>
+			    <execution>
+				<id>companynoid</id>
+				<configuration>
+				    <schemaFile>${basedir}/src/test/resources/companynoid.xsd</schemaFile>
+				    <noUnsettable>true</noUnsettable>
+				</configuration>
+				<goals>
+				    <goal>generate</goal>
+				</goals>
+			    </execution>			    
+			    <execution>
+				<id>company</id>
+				<configuration>
+				    <schemaFile>${basedir}/src/test/resources/company.xsd</schemaFile>
+				    <noUnsettable>true</noUnsettable>
+				</configuration>
+				<goals>
+				    <goal>generate</goal>
+				</goals>
+			    </execution>                
+			    <execution>
+				<id>customer</id>
+				<configuration>
+				    <schemaFile>${basedir}/src/test/resources/customer.xsd</schemaFile>
+				    <noUnsettable>true</noUnsettable>
+				</configuration>
+				<goals>
+				    <goal>generate</goal>
+				</goals>
+			    </execution>
+			    <execution>
+				<id>singer</id>
+				<configuration>
+				    <schemaFile>${basedir}/src/test/resources/SINGER.xsd</schemaFile>
+				    <noUnsettable>true</noUnsettable>
+				</configuration>
+				<goals>
+				    <goal>generate</goal>
+				</goals>
+			    </execution>			    			    
+			</executions>
+		    </plugin>
+
+		    <plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-surefire-plugin</artifactId>
+			<configuration>
+			    <includes>
+				<include>**/*AllTestsDerby.java</include>
+			    </includes>
+			</configuration>
+		    </plugin>
+
+
+		    <!-- Generates JavaDoc for DAS RDB API -->
+		    <plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-javadoc-plugin</artifactId>
+			<version>2.2</version>
+			<configuration>
+				<version>2.0</version>
+				<quiet>true</quiet>
+				<maven.javadoc.failonerror>0</maven.javadoc.failonerror>
+				<maven.javadoc.warningsreport>false</maven.javadoc.warningsreport>
+			</configuration>
+			<executions>
+				<execution>
+				    <id>package</id>
+				    <phase>package</phase>
+				    <goals>
+					<goal>jar</goal>
+				    </goals>
+				</execution>
+			</executions>
+		    </plugin>
+		</plugins>
+	    </build>
+
+        </profile>
+    </profiles>
+</project>
+
+
+
+
+
+
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java
new file mode 100644
index 0000000000..1e641b71e7
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java
@@ -0,0 +1,138 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.config.ResultDescriptor;
+
+import commonj.sdo.DataObject;
+
+/**
+ * A Command is used to execute a read or write to a database
+ */
+public interface Command {
+
+    /**
+     * Performs the function defined by the command
+     */
+    void execute();
+
+    /**
+     * Performs the function defined by the command and return the results in the root DataObject
+     * 
+     * @return the root DataObject
+     */
+    DataObject executeQuery();
+
+    /**
+     * Sets the value of the associated Parameter
+     * 
+     * @param index
+     *            the index of the Parameter
+     * @param value
+     *            the value for the Parameter
+     */
+    void setParameter(int index, Object value);
+
+    /**
+     * Returns the value of the associated Parameter
+     * 
+     * @param index
+     *            the index of the Parameter
+     * @return the value of the Parameter
+     */
+    Object getParameter(int index);
+
+    /**
+     * 
+     * @param name Name of parameter - should match exact name of database table column 
+     * as appearing in Command
+     * @param value 
+     * 		the value of the parameter
+     */
+    void setParameter(String name, Object value);
+    
+    /**
+     * 
+     * @param name
+     * 			the name of the parameter - should match exact name of database table column
+     * @return  the value of the parameter
+     */
+    Object getParameter(String name);
+    
+    /**
+     * Returns the value of the database-generated key. This method is specific 
+     * to an "insert" command and will be valid only after the command has
+     * been executed.
+     * 
+     * @return the generated key
+     */
+    int getGeneratedKey();
+
+    /**
+     * Allow set of ResultDescriptor when command is created on-the-fly
+     * @param resultDescriptorList
+     */
+    void setResultDescriptors(List resultDescriptorList);
+    
+    List getResultDescriptors();
+   
+    /**
+     * Add/replace based on columnIndex (>=0)embedded in resultDescriptor else add at end
+     * @param resultDescriptor
+     */
+    void addResultDescriptor(ResultDescriptor resultDescriptor);
+    
+    /**
+     * remove ResultDescriptor at given columnIndex(>=0) and return same. If not
+     * present return null. For -ve index, return null
+     * @param columnIndex
+     * @return
+     */
+    ResultDescriptor removeResultDescriptor(int columnIndex);
+    
+    /**
+     * Remove resultDescriptor only if matched for index(>=0), name, type, schema
+     * name and table name and return same, else return null For -ve index, ignore  
+     *  index and if unique match for rest of the attriutes, remove/return, if multiple
+     *  matches found, throw RuntimeException
+     * @param resultDescriptor
+     * @return
+     */
+    ResultDescriptor removeResultDescriptor(ResultDescriptor resultDescriptor);
+    
+    /**
+     * Return resultDescriptor if exact match for columnIndex(>=0) found  
+     * else return null;
+     * 
+     * @param columnIndex
+     * @return
+     */
+    ResultDescriptor getResultDescriptor(int columnIndex);
+    
+    /**
+     * Utility method
+     * @param ostrm
+     * @throws IOException
+     */
+    void printResultDescriptors(OutputStream ostrm) throws IOException;
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
new file mode 100644
index 0000000000..d4582374e1
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
@@ -0,0 +1,318 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb;
+
+import java.io.InputStream;
+import java.util.Vector;
+
+import org.apache.tuscany.das.rdb.config.Column;
+import org.apache.tuscany.das.rdb.config.Command;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.ConfigFactory;
+import org.apache.tuscany.das.rdb.config.Parameters;
+import org.apache.tuscany.das.rdb.config.Relationship;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.impl.ParametersExtendedImpl;
+import org.apache.tuscany.das.rdb.util.ConfigUtil;
+
+/**
+ * A ConfigHelper is used as an aid in programmatic construction of Config instances.
+ * Manual contrution fo COnfig is an alternative to providing needed configuration
+ * information in an XML file
+ * 
+ */
+public class ConfigHelper {
+
+    private Config config;
+
+    private MappingWrapper configWrapper;
+
+    private ConfigFactory factory = ConfigFactory.INSTANCE;
+
+    /**
+     * Default constructor
+     */
+    public ConfigHelper() {
+        config = factory.createConfig();
+        configWrapper = new MappingWrapper(config);
+    }
+
+    /**
+     * Constructor that receives a Config stream
+     * This is usefull to extend a config file
+     * @param configStream The configuration stream
+     */
+    public ConfigHelper(InputStream configStream) {
+        this.config = ConfigUtil.loadConfig(configStream);
+        configWrapper = new MappingWrapper(config);
+    }
+    
+    /**
+     * Constructor that receives a Config object
+     * @param config The configuration object
+     */
+    public ConfigHelper(Config config) {
+        this.config = config;
+        configWrapper = new MappingWrapper(config);
+    }
+
+    /**
+     * Add PK information
+     * @param columnName The column to be taken as PK
+     */
+    public void addPrimaryKey(String columnName) {
+        configWrapper.addPrimaryKey(columnName);
+    }
+
+    /**
+     * Add PK information, with different TypeName
+     * @param columnName
+     * @param typeName
+     */
+    public void addPrimaryKey(String columnName, String propertyName) {
+        configWrapper.addPrimaryKey(columnName, propertyName);
+    }
+    
+    /**
+     * Add relationship information
+     * @param parentName
+     * @param childName
+     * @return
+     */
+    public Relationship addRelationship(String parentName, String childName) {
+        return addRelationship(parentName, childName, null);
+    }
+    
+    /**
+     * Add relationship information
+     * @param parentName
+     * @param childName
+     * @param relationshipName
+     * @return
+     */
+    public Relationship addRelationship(String parentName, String childName, String relationshipName) {
+        return configWrapper.addRelationship(parentName, childName, relationshipName);
+    }
+    
+    /**
+     * Add relationship information
+     * @param parentNames
+     * @param childNames
+     * @return
+     */
+    public Relationship addRelationship(Vector parentNames, Vector childNames) {
+        return addRelationship(parentNames, childNames, null);
+    }
+
+    /**
+     * Add relationship information
+     * @param parentNames
+     * @param childNames
+     * @param relationshipName
+     * @return
+     */
+    public Relationship addRelationship(Vector parentNames, Vector childNames, String relationshipName) {
+        return configWrapper.addRelationship(parentNames, childNames, relationshipName);
+    }
+    
+    /**
+     * Add table information
+     * @param name
+     * @param typeName
+     * @return
+     */
+    public Table addTable(String name, String typeName) {
+        return configWrapper.addTable(name, typeName);
+    }
+    
+    /**
+     * Add table information with schema information
+     * @param name
+     * @param schemaName
+     * @param typeName
+     * @return
+     */
+    public Table addTable(String name, String schemaName, String typeName) {
+        return configWrapper.addTable(name, schemaName, typeName);
+    }
+    
+    /**
+     * Add column information
+     * @param table
+     * @param columnName
+     * @param propertyName
+     * @return
+     */
+    public Column addColumn(Table table, String columnName, String propertyName) {
+        return configWrapper.addColumn(table, columnName, propertyName);
+    }
+
+    /**
+     * Add an update statement for a given table
+     * @param table
+     * @param statement
+     * @param parameters String - names separated with space
+     */
+    public void addUpdateStatement(Table table, String statement, String parameters) {    	
+    	ParametersExtendedImpl parametersExtendedImpl = new ParametersExtendedImpl();
+    	parametersExtendedImpl.addParameters(ParametersExtendedImpl.getParameters(parameters));
+        configWrapper.addUpdateStatement(table, statement, parametersExtendedImpl);
+    }
+
+    /**
+     * Add an update statement for a given table
+     * @param table
+     * @param statement
+     * @param parameters <Parameters>
+     */    
+    public void addUpdateStatement(Table table, String statement, Parameters parameters) {
+         configWrapper.addUpdateStatement(table, statement, parameters);
+     }
+    
+    /**
+     * Add create statement for a given table
+     * @param table
+     * @param statement
+     * @param parameters String - names separated with space
+     */
+    public void addCreateStatement(Table table, String statement, String parameters) {
+    	ParametersExtendedImpl parametersExtendedImpl = new ParametersExtendedImpl();
+    	parametersExtendedImpl.addParameters(ParametersExtendedImpl.getParameters(parameters));    	
+        configWrapper.addCreateStatement(table, statement, parametersExtendedImpl);
+    }
+    	
+    /**
+     * Add create statement for a given table
+     * @param table
+     * @param statement
+     * @param parameters <Parameters>
+     */    
+    public void addCreateStatement(Table table, String statement, Parameters parameters) {   	
+        configWrapper.addCreateStatement(table, statement, parameters);
+    }
+
+    /**
+     * Add delete statement for a given table
+     * @param table
+     * @param statement
+     * @param parameters String - names separated with space
+     */
+    public void addDeleteStatement(Table table, String statement, String parameters) {
+    	ParametersExtendedImpl parametersExtendedImpl = new ParametersExtendedImpl();
+    	parametersExtendedImpl.addParameters(ParametersExtendedImpl.getParameters(parameters));    	
+        configWrapper.addDeleteStatement(table, statement, parametersExtendedImpl);
+    }
+
+    /**
+     * Add delete statement for a given table
+     * @param table
+     * @param statement
+     * @param parameters <Parameters>
+     */    
+    public void addDeleteStatement(Table table, String statement, Parameters parameters) {
+        configWrapper.addDeleteStatement(table, statement, parameters);
+    }
+
+    /**
+     * Add datasource connection information
+     * @param dataSourceName
+     */
+    public void addConnectionInfo(String dataSourceName) {
+        configWrapper.addConnectionInfo(dataSourceName, true);
+    }
+
+    /**
+     * Add datasource connection information and flag about using managed transactions
+     * @param dataSourceName
+     * @param managedtx
+     */
+    public void addConnectionInfo(String dataSourceName, boolean managedtx) {
+        configWrapper.addConnectionInfo(dataSourceName, managedtx);
+    }
+
+    /**
+     * Add driver manager connection information
+     * @param driverClass
+     * @param databaseURL
+     * @param user
+     * @param password
+     * @param loginTimeout
+     */
+    public void addConnectionInfo(String driverClass, String databaseURL, String user, String password, int loginTimeout) {
+        configWrapper.addConnectionInfo(driverClass, databaseURL, user, password, loginTimeout);
+    }
+
+    /**
+     * Set the data object model
+     * @param dataObjectModel
+     */
+    public void setDataObjectModel(String dataObjectModel) {
+        configWrapper.getConfig().setDataObjectModel(dataObjectModel);
+    }
+
+    /**
+     * Add a select command
+     * @param name
+     * @param sql
+     * @return
+     */
+    public Command addSelectCommand(String name, String sql) {
+        return configWrapper.addCommand(name, sql, "select");
+    }
+
+    /**
+     * Add a update command
+     * @param name
+     * @param sql
+     * @return
+     */
+    public Command addUpdateCommand(String name, String sql) {
+        return configWrapper.addCommand(name, sql, "update");
+    }
+
+    /**
+     * Add a insert command
+     * @param name
+     * @param sql
+     * @return
+     */
+    public Command addInsertCommand(String name, String sql) {
+        return configWrapper.addCommand(name, sql, "insert");
+    }
+
+    /**
+     * Add a delete command
+     * @param name
+     * @param sql
+     * @return
+     */
+    public Command addDeleteCommand(String name, String sql) {
+        return configWrapper.addCommand(name, sql, "delete");
+    }
+
+    /**
+     * Get a reference to the config object
+     * @return
+     */
+    public Config getConfig() {
+        return config;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
new file mode 100644
index 0000000000..24f2e5ee2e
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
@@ -0,0 +1,54 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb;
+
+/**
+ * A lightweight Table-column <--> DataObject-property converter framework. Converters 
+ * allow a user to insert a transformation between a column value
+ * and is destination DataObject property value. For example, by default, a VARCHAR 
+ * column will be represented as a String in its corresponding
+ * DataObject property. A user could insert a converter that transforms the the VARCHAR 
+ * value to an Integer. If this is done then although the column
+ * returns character data, the DataObject property will be an Integer
+ * 
+ * 
+ */
+public interface Converter {
+
+    /**
+     * Transform the columnData object to a new value and possibly 
+     * new type. This should be the invers operation of #getColumnValue
+     * 
+     * @param columnData
+     *            The column value to transorm
+     * @return Returns the transformed value
+     */
+    Object getPropertyValue(Object columnData);
+
+    /**
+     * Transform the columnData object to a new value and possibly new 
+     * type. This should be the invers operation of #getPropertyValue
+     * 
+     * @param propertyData
+     *            The property value to transform
+     * @return Returns the transformed value
+     */
+    Object getColumnValue(Object propertyData);
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java
new file mode 100644
index 0000000000..43f1e30d1a
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java
@@ -0,0 +1,67 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb;
+
+import org.apache.tuscany.das.rdb.impl.DASFactoryImpl;
+
+import commonj.sdo.DataObject;
+
+/**
+ * A CommandGroup represents a set of {@link Command} and single {@link ApplyChangesCommand} 
+ * that are created from a common config file.
+ * 
+ */
+public interface DAS {
+
+    DASFactory FACTORY = new DASFactoryImpl();
+
+    /**
+     * The change history is scanned and modifications to the graph of data objects are flushed to the database.
+     * 
+     * @param root
+     *            the topmost containing data object
+     */
+    void applyChanges(DataObject root);
+
+    /**
+     * Gets the named command from this factory's inventory
+     * 
+     * @param name
+     *            The identifying name of the requested command
+     * @return Returns the identified command
+     */
+    Command getCommand(String name);
+
+    /**
+     * If the CommandGroup is managing connections then this method must be called 
+     * when the client is done with the instance.
+     * 
+     */
+    void releaseResources();
+
+    /**
+     * Creates a Command based on the provided SQL statement
+     * 
+     * @param sql
+     *            The SQL statement
+     * @return returns a Command instance
+     */
+    Command createCommand(String sql);
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java
new file mode 100644
index 0000000000..313fff225a
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java
@@ -0,0 +1,74 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb;
+
+import java.io.InputStream;
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.config.Config;
+
+/**
+ * A DASFactory produces {@link DAS} instances.
+ */
+public interface DASFactory {
+
+    /**
+     * Creates a DAS based on the provided config file stream
+     * 
+     * @param configStream
+     *            A stream over a DAS config file
+     * @return returns a DAS instance
+     */
+    DAS createDAS(InputStream configStream);
+    
+    /**
+     * Creates a DAS based on the provide config file stream and connection
+     * @param configStream
+     * @param connection
+     * @return
+     */
+    DAS createDAS(InputStream configStream, Connection connection);
+    
+    /**
+     * Creates a DAS based on the provided config
+     * 
+     * @param config
+     *            A DAS config object
+     * @return returns a DAS instance
+     */
+    DAS createDAS(Config config);
+
+    /**
+     * Creates a DAS based on the provided config and connection
+     * @param config
+     * @param connection
+     * @return
+     */
+    DAS createDAS(Config config, Connection connection);
+
+    /**
+     * Creates a DAS based on the provided connection
+     * @param connection
+     * @return
+     */
+    DAS createDAS(Connection connection);
+    
+
+}
+
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
new file mode 100644
index 0000000000..aa18558fce
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
@@ -0,0 +1,64 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb;
+
+import commonj.sdo.DataObject;
+
+/**
+ * An iterator-like interface to conveniently move through chunks of data. The 
+ * idea is that a Pager works with a read Command. The read command
+ * returns a large amount of data and the client wants to work with chunks 
+ * of it at a time. So the Pager is created on the command and each call to
+ * next returns the next chunk of data. This is done completely disconnected. 
+ * No cursor is maintained between calls to #next.
+ * 
+ * TODO - This is very preliminary. We need to look at this interface 
+ * in the context of disonnected scenarios such as a web app. The Pager instance
+ * will probably be saved in session so it must be very light and cannot 
+ * reference a connection. Also, we probably need to define a factory or add a
+ * method to set page size.
+ * 
+ * 
+ */
+public interface Pager {
+
+    /**
+     * Get the next page of data
+     * 
+     * @return the next page of data
+     */
+    DataObject next();
+
+    /**
+     * Get the page prior to the last page returned
+     * 
+     * @return the previous page
+     */
+    DataObject previous();
+
+    /**
+     * Return a specific identified page.
+     * 
+     * @param page
+     *            The number of the page to return
+     * @return the indicated page
+     */
+    DataObject getPage(int page);
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
new file mode 100644
index 0000000000..6c010b3ee8
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
@@ -0,0 +1,945 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.config.wrapper;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.config.Column;
+import org.apache.tuscany.das.rdb.config.Command;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.ConfigFactory;
+import org.apache.tuscany.das.rdb.config.ConnectionInfo;
+import org.apache.tuscany.das.rdb.config.ConnectionProperties;
+import org.apache.tuscany.das.rdb.config.Create;
+import org.apache.tuscany.das.rdb.config.Delete;
+import org.apache.tuscany.das.rdb.config.KeyPair;
+import org.apache.tuscany.das.rdb.config.Parameters;
+import org.apache.tuscany.das.rdb.config.Relationship;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.config.Update;
+
+import commonj.sdo.Property;
+
+public class MappingWrapper {
+
+    private static final ConfigFactory FACTORY = ConfigFactory.INSTANCE;
+
+    private final Logger logger = Logger.getLogger(MappingWrapper.class);
+
+    private Config config;
+    
+	// TUSCANY-2288
+	private List insertOrder;
+	private List deleteOrder;
+	private Set rootTableNames;
+	// --
+
+
+    public MappingWrapper() {
+        config = FACTORY.createConfig();
+        //JIRA-952
+        this.checkSchemaNameSupport();
+    }
+
+	//JIRA-952 - check if there is any entry with no schemaName when support is ON
+    public void checkSchemaNameSupport(){
+        if(config.isDatabaseSchemaNameSupported()){
+        	List tableList = config.getTable();
+        	for(int i=0; i<tableList.size(); i++){
+        		Table t = (Table)tableList.get(i);
+        		if(t.getSchemaName() == null || t.getSchemaName().equals("")){
+        			throw new RuntimeException("No schemaName provided for tableName "+t.getTableName()+" when schemaNameSupport is ON");
+        		}
+        		
+        		if(t.getTypeName()==null){
+        			t.setTypeName(t.getSchemaName()+"."+t.getTableName());
+        		}
+        	}
+        }
+    }
+    public MappingWrapper(Config mapping) {
+        if (mapping == null) {
+            this.config = FACTORY.createConfig();
+        } else {
+            this.config = mapping;
+        }
+        //JIRA-952
+        checkSchemaNameSupport();
+    }
+
+    public Config getConfig() {
+        return this.config;
+    }
+
+    public Table getTable(String tableName) {
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Looking for table " + tableName);
+        }
+
+        Iterator i = config.getTable().iterator();
+        while (i.hasNext()) {
+            Table t = (Table) i.next();
+            //JIRA-952
+            if(this.config.isDatabaseSchemaNameSupported()){
+            	if (tableName.equalsIgnoreCase(t.getSchemaName()+"."+t.getTableName())) {
+                    return t;
+                }
+            }else{
+            if (tableName.equalsIgnoreCase(t.getTableName())) {
+                return t;
+                }            	
+            }
+        }
+
+        return null;
+    }
+
+    public Table getTableByTypeName(String typeName) {
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Looking for table by property: " + typeName);
+        }
+
+        Iterator i = config.getTable().iterator();
+        while (i.hasNext()) {
+            Table t = (Table) i.next();
+            TableWrapper wrapper = new TableWrapper(t);
+            if (typeName.equals(wrapper.getTypeName())) {
+                return t;
+            }
+        }
+        return null;
+
+    }
+
+    public void addImpliedRelationship(String parentTableName, String childTableName, String fkColumnName) {
+
+        // Don't create a relationship for something like Book.Book_ID
+        if (parentTableName.equalsIgnoreCase(childTableName)) {
+            return;
+        }
+
+        // Don't create a relationship if one already exists in the config
+        Iterator i = config.getRelationship().iterator();
+        while (i.hasNext()) {
+            Relationship r = (Relationship) i.next();
+            if (r.getPrimaryKeyTable().equalsIgnoreCase(parentTableName) && r.getForeignKeyTable().equalsIgnoreCase(childTableName)) {
+                return;
+            }
+        }
+
+        Relationship r = FACTORY.createRelationship();
+        r.setName(childTableName);
+        r.setPrimaryKeyTable(parentTableName);
+        r.setForeignKeyTable(childTableName);
+
+        KeyPair pair = FACTORY.createKeyPair();
+        pair.setPrimaryKeyColumn("ID");
+        pair.setForeignKeyColumn(fkColumnName);
+
+        r.getKeyPair().add(pair);
+        r.setMany(true);
+
+        config.getRelationship().add(r);
+    }
+
+    public Relationship addRelationship(String parentName, String childName) {
+    	return addRelationship(parentName, childName, null); 
+    }
+    
+    public Relationship addRelationship(String parentName, String childName, String relationshipName) {
+
+    	//JIRA-952
+        QualifiedColumn parent = null;
+        QualifiedColumn child = null;
+
+        if(this.config.isDatabaseSchemaNameSupported()){
+        	parent = new QualifiedColumn(parentName, true);
+        	child = new QualifiedColumn(childName, true);
+        }
+        else{
+        	parent = new QualifiedColumn(parentName);
+        	child = new QualifiedColumn(childName);        	
+        }
+        
+        Relationship r = FACTORY.createRelationship();
+        //JIRA-952
+        if(this.config.isDatabaseSchemaNameSupported()){        	
+        	if(relationshipName == null)
+        		r.setName(child.getSchemaName()+"."+child.getTableName());
+        	else
+        		r.setName(relationshipName);
+        	
+            r.setPrimaryKeyTable(parent.getSchemaName()+"."+parent.getTableName());
+            r.setForeignKeyTable(child.getSchemaName()+"."+child.getTableName());        	
+        }
+        else{
+        	if(relationshipName == null)
+        		r.setName(child.getTableName());
+        	else
+        		r.setName(relationshipName);
+        	
+	        r.setPrimaryKeyTable(parent.getTableName());
+	        r.setForeignKeyTable(child.getTableName());
+        }
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Created relationship from " + r.getPrimaryKeyTable() 
+                    + " to " + r.getForeignKeyTable() + " named " + r.getName());
+        }
+
+        KeyPair pair = FACTORY.createKeyPair();
+        pair.setPrimaryKeyColumn(parent.getColumnName());
+        pair.setForeignKeyColumn(child.getColumnName());
+
+        r.getKeyPair().add(pair);
+        r.setMany(true);
+
+        config.getRelationship().add(r);
+
+        return r;
+
+    }
+    
+    public Relationship addRelationship(Vector parentNames, Vector childNames) {
+    	return addRelationship(parentNames, childNames, null);
+    }
+    
+    public Relationship addRelationship(Vector parentNames, Vector childNames, String relationshipName) {
+        //create vector for each
+        if(parentNames.size() != childNames.size()){
+            throw new RuntimeException("Can not for relationship for multiple keys, different sizes");
+        }
+        
+        Vector parentColumns = new Vector();
+        Vector childColumns = new Vector();
+        
+        for(int i=0; i<parentNames.size(); i++){
+            QualifiedColumn parent = null;
+            QualifiedColumn child = null;
+            
+            if(this.config.isDatabaseSchemaNameSupported()){
+            	parent = new QualifiedColumn((String)parentNames.get(i), true);
+            	child = new QualifiedColumn((String)childNames.get(i), true);
+            }
+            else{
+            	parent = new QualifiedColumn((String)parentNames.get(i));
+            	child = new QualifiedColumn((String)childNames.get(i));
+            }
+            
+            parentColumns.add(parent);
+            childColumns.add(child);
+        }
+
+        //all parent columns should be from same table and schema
+        //all child columns should be from same table and schema
+        checkTableNames(parentColumns);
+    	checkSchemaNames(parentColumns);
+        
+        checkTableNames(childColumns);
+    	checkSchemaNames(childColumns);
+        
+        Relationship r = FACTORY.createRelationship();
+        //JIRA-952
+        if(this.config.isDatabaseSchemaNameSupported()){
+        	if(relationshipName == null)
+        		r.setName(((QualifiedColumn)childColumns.get(0)).getSchemaName()+"."
+        				+((QualifiedColumn)childColumns.get(0)).getTableName());
+        	else
+        		r.setName(relationshipName);
+        	
+            r.setPrimaryKeyTable(((QualifiedColumn)parentColumns.get(0)).getSchemaName()+"."
+            		+((QualifiedColumn)parentColumns.get(0)).getTableName());
+            r.setForeignKeyTable(((QualifiedColumn)childColumns.get(0)).getSchemaName()+"."
+            		+((QualifiedColumn)childColumns.get(0)).getTableName());        	
+        }
+        else{
+        	if(relationshipName == null)
+        		r.setName(((QualifiedColumn)childColumns.get(0)).getTableName());
+        	else
+        		r.setName(relationshipName);
+        	
+	        r.setPrimaryKeyTable(((QualifiedColumn)parentColumns.get(0)).getTableName());
+	        r.setForeignKeyTable(((QualifiedColumn)childColumns.get(0)).getTableName());
+        }
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Created relationship from " + r.getPrimaryKeyTable() 
+                    + " to " + r.getForeignKeyTable() + " named " + r.getName());
+        }
+        
+        KeyPair pair = null;
+        
+        for(int i=0; i<parentColumns.size(); i++){
+            pair = FACTORY.createKeyPair();
+            pair.setPrimaryKeyColumn(((QualifiedColumn)parentColumns.get(i)).getColumnName());
+            pair.setForeignKeyColumn(((QualifiedColumn)childColumns.get(i)).getColumnName());
+            r.getKeyPair().add(pair);
+        }
+        
+        r.setMany(true);
+        config.getRelationship().add(r);
+
+        return r;
+    }    
+    
+    public void checkTableNames(Vector columns){
+        String expectedTableName = ((QualifiedColumn)columns.get(0)).getTableName();        
+
+        for(int i=0; i<columns.size(); i++){
+            QualifiedColumn currColumn = (QualifiedColumn)columns.get(i);
+            String currTableName = currColumn.getTableName();
+            
+            if(!currTableName.equals(expectedTableName)){
+                throw new RuntimeException("Columns in one side of relationship can not be from different tables");
+            }           
+        }       
+    }
+    
+    public void checkSchemaNames(Vector columns){
+    	if(!this.config.isDatabaseSchemaNameSupported()){
+    		return;
+    	}
+    	
+    	 String	expectedSchemaName = ((QualifiedColumn)columns.get(0)).getSchemaName();
+
+    	for(int i=0; i<columns.size(); i++){
+    		QualifiedColumn currColumns = (QualifiedColumn)columns.get(i);
+    		String	currSchemaName = currColumns.getSchemaName();
+    		    		
+    		if(!currSchemaName.equals(expectedSchemaName)){
+    			throw new RuntimeException("Columns in one side of relationship can not be from different schema");
+    		}
+    	}
+    }
+    public void addPrimaryKey(String columnName) {
+        addPrimaryKey(Collections.singletonList(columnName));
+    }
+
+    public void addPrimaryKey(String columnName, String propertyName) {
+        addPrimaryKey(Collections.singletonList(columnName), propertyName);
+    }
+    
+    public void addPrimaryKey(List columnNames) {
+
+        Iterator i = columnNames.iterator();
+        while (i.hasNext()) {
+            String columnName = (String) i.next();
+
+            QualifiedColumn pkColumn = null;
+           	pkColumn = new QualifiedColumn(columnName, this.config.isDatabaseSchemaNameSupported());
+            //Table t = findOrCreateTable(pkColumn.getTableName());
+            Table t = findOrCreateTable(pkColumn);
+            Column c = findOrCreateColumn(t, pkColumn.getColumnName());
+            c.setPrimaryKey(true);
+        }
+    }
+
+    public void addPrimaryKey(List columnNames, String propertyName) {
+
+        Iterator i = columnNames.iterator();
+        while (i.hasNext()) {
+            String columnName = (String) i.next();
+
+            QualifiedColumn pkColumn = null;
+           	pkColumn = new QualifiedColumn(columnName, this.config.isDatabaseSchemaNameSupported());
+            //Table t = findOrCreateTable(pkColumn.getTableName());
+            Table t = findOrCreateTable(pkColumn);
+            Column c = findOrCreateColumn(t, pkColumn.getColumnName());
+            c.setPrimaryKey(true);
+            c.setPropertyName(propertyName);
+        }
+    }
+    
+    public String getTableTypeName(String tableName) {
+        Table t = getTable(tableName);
+        if (t == null) {
+            return tableName;
+        }
+        String propertyName = t.getTypeName();
+
+        if (propertyName == null) {
+            return tableName;
+        }
+
+        return propertyName;
+    }
+
+    public Column getColumn(Table t, String columnName) {
+        if (t == null) {
+            return null;
+        }
+        Iterator i = t.getColumn().iterator();
+        while (i.hasNext()) {
+            Column c = (Column) i.next();
+            if (c.getColumnName().equals(columnName)) {
+                return c;
+            }
+        }
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("WARNING: Could not find column " + columnName + " in table " + t.getTableName());
+        }
+
+        return null;
+    }
+
+    public Column getColumnByPropertyName(Table t, String propertyName) {
+        if (t == null) {
+            return null;
+        }
+        
+        Iterator i = t.getColumn().iterator();
+        while (i.hasNext()) {
+            Column c = (Column) i.next();
+            
+            if (c.getColumnName().equals(propertyName)) {
+                return c;
+            }
+            
+            if (c.getPropertyName() != null && c.getPropertyName().equals(propertyName)) {
+                return c;
+            }
+        }
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("WARNING: Could not find column " + propertyName + " in table " + t.getTableName());
+        }
+
+        return null;
+    }
+
+    public String getColumnPropertyName(String tableName, String columnName) {
+        Table t = getTable(tableName);
+        Column c = getColumn(t, columnName);
+        if (c == null) {
+            return columnName;
+        }
+
+        String propertyName = c.getPropertyName();
+        if (propertyName == null) {
+            return c.getColumnName();
+        }
+
+        return propertyName;
+    }
+
+    public Table addTable(String tableName, String typeName) {
+        Table table = getTable(tableName);
+        if (table != null) {
+            throw new RuntimeException("Table " + tableName + "already exists");
+        }
+
+        table = ConfigFactory.INSTANCE.createTable();
+        table.setTableName(tableName);
+        table.setTypeName(typeName);
+        config.getTable().add(table);
+
+        return table;
+    }
+
+    //JIRA-952
+    public Table addTable(String tableName, String schemaName, String typeName) {    	
+        Table table = null;
+        
+        if(this.config.isDatabaseSchemaNameSupported()){
+        	table = getTable(schemaName+"."+tableName);	
+        }
+        else{
+        	table = getTable(tableName);
+        }
+        
+        if (table != null) {
+        	if(this.config.isDatabaseSchemaNameSupported()){
+        		throw new RuntimeException("Table " + schemaName+"."+tableName + "already exists");	
+        	}
+        	else{
+        		throw new RuntimeException("Table " + tableName + "already exists");
+        	}            
+        }
+
+        table = ConfigFactory.INSTANCE.createTable();
+        table.setTableName(tableName);
+        
+        if(this.config.isDatabaseSchemaNameSupported()){
+        	table.setSchemaName(schemaName);
+        }
+        else{
+        	table.setSchemaName("");
+        }
+        
+        table.setTypeName(typeName);
+        config.getTable().add(table);
+
+        return table;
+    }
+    public Column addColumn(Table table, String name, String propertyName) {
+        Column column = ConfigFactory.INSTANCE.createColumn();
+        column.setColumnName(name);
+        column.setPropertyName(propertyName);
+        
+        table.getColumn().add(column);
+        return column;
+    }
+    
+    //JIRA-952
+    private Table findOrCreateTable(String schemaName, String tableName) {
+        Table table = null;
+        
+        if(this.config.isDatabaseSchemaNameSupported()){
+        	table = getTable(schemaName+"."+tableName);	
+        }
+        else{
+        	table = getTable(tableName);	
+        }        
+        if (table == null) {
+            table = ConfigFactory.INSTANCE.createTable();
+            table.setTableName(tableName);
+            table.setSchemaName(schemaName);
+            
+            if(this.config.isDatabaseSchemaNameSupported()){
+            	table.setTypeName(schemaName+"."+tableName);
+            }
+            else{
+            	table.setTypeName(tableName);
+            }
+            config.getTable().add(table);
+        }
+        return table;
+
+    }
+
+    //JIRA-952
+    private Table findOrCreateTable(QualifiedColumn column) {   	
+    	Table table = null;
+    	if(this.config.isDatabaseSchemaNameSupported()){
+    		table = getTable(column.getSchemaName()+"."+column.getTableName());
+    	}
+    	else{
+    		table = getTable(column.getTableName());
+    	}
+
+        if (table == null) {
+            table = ConfigFactory.INSTANCE.createTable();
+            table.setTableName(column.getTableName());
+            table.setSchemaName(column.getSchemaName());
+            config.getTable().add(table);
+        }
+        return table;
+
+    }
+    private Column findOrCreateColumn(Table t, String name) {
+        Iterator i = t.getColumn().iterator();
+        while (i.hasNext()) {
+            Column c = (Column) i.next();
+            if (name.equals(c.getColumnName())) {
+                return c;
+            }
+        }
+
+        Column c = ConfigFactory.INSTANCE.createColumn();
+        c.setColumnName(name);
+        t.getColumn().add(c);
+        return c;
+    }
+
+    public boolean hasRecursiveRelationships() {
+        if (config != null) {
+            Iterator i = getConfig().getRelationship().iterator();
+            while (i.hasNext()) {
+                Relationship r = (Relationship) i.next();
+                if (r.getPrimaryKeyTable().equals(r.getForeignKeyTable())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    
+    public Set getRecursiveTypeNames() {
+    	Set typeNames = new HashSet();
+        if (config != null) {
+            Iterator i = getConfig().getRelationship().iterator();
+            while (i.hasNext()) {
+                Relationship r = (Relationship) i.next();
+                if (r.getPrimaryKeyTable().equals(r.getForeignKeyTable())) {
+                	typeNames.add(getTableTypeName(r.getPrimaryKeyTable()));
+                }
+            }
+        }
+        return typeNames;
+    	
+    }
+
+    /*Parameter name is SDO Type name and so requires mapping in table<->type, if one is available in Config*/
+    public Collection getRelationshipsByChildTable(String name) {
+    	Table table = getTableByTypeName(name);
+    	
+    	if(table != null) {
+	    	if(config.isDatabaseSchemaNameSupported()) {
+	    		name = table.getSchemaName()+"."+table.getTableName();	
+	    	} else {
+	    		name = table.getTableName();
+	    	}
+    	}
+    	//table can be null, when no <Table> in Config and Query based Dynamic Types are used during query
+    	
+        List results = new ArrayList();
+        if (config != null) {
+            Iterator i = getConfig().getRelationship().iterator();
+            while (i.hasNext()) {
+                Relationship r = (Relationship) i.next();
+                if (name.equals(r.getForeignKeyTable())) {
+                    results.add(r);
+                }
+            }
+        }
+        return results;
+    }
+
+	public Set getRootTableNames() {
+		if (this.logger.isDebugEnabled()) {
+			this.logger.debug("Getting root tables");
+		}
+		if (rootTableNames == null) {
+			rootTableNames = new HashSet();
+			if (config == null) return rootTableNames;
+			// parse all relationships
+			Set allParents = new HashSet();
+			Set allChildren = new HashSet();
+			Iterator i = getConfig().getRelationship().iterator();
+			while (i.hasNext()) {
+				Relationship r = (Relationship) i.next();
+				String parent = r.getPrimaryKeyTable();
+				String child = r.getForeignKeyTable();
+				if (parent.equals(child)) {
+					// self-relationship
+					// do not add to all children list to allow root detection
+					allParents.add(parent);
+				} else {
+					allParents.add(parent);
+					allChildren.add(child);
+				}
+			}
+			// find roots (depth 0)
+			// roots are tables that are present in the parents set, but not in the children set
+			for (Iterator itParents = allParents.iterator(); itParents.hasNext(); ) {
+				String parent = (String) itParents.next();
+				if (!allChildren.contains(parent)) {
+					rootTableNames.add(parent);
+				}
+			}
+		}
+		if (this.logger.isDebugEnabled()) {
+			this.logger.debug(rootTableNames);
+		}
+		return rootTableNames;
+	}
+    
+	// TUSCANY-2288
+	public List getInsertOrder() {
+		if (this.logger.isDebugEnabled()) {
+			this.logger.debug("Getting insert order");
+		}
+		if (insertOrder == null) {
+			insertOrder = new ArrayList();
+			if (config == null) return insertOrder;
+			// correct insert order: tables sorted by ascending depth
+			// parse all relationships
+			Set allParents = new HashSet();
+			Set allChildren = new HashSet();
+			Map parentToChild = new HashMap();
+			Iterator i = getConfig().getRelationship().iterator();
+			while (i.hasNext()) {
+				Relationship r = (Relationship) i.next();
+				String parent = r.getPrimaryKeyTable();
+				String child = r.getForeignKeyTable();
+				if (parent.equals(child)) {
+					// self-relationship
+					// do not add to parent to child map to avoid loops
+					// do not add to all children list to allow root detection
+					allParents.add(parent);
+				} else {
+					allParents.add(parent);
+					allChildren.add(child);
+					Set children = (Set) parentToChild.get(parent);
+					if (children == null) {
+						children = new HashSet();
+						parentToChild.put(parent, children);
+					}
+					children.add(child);
+				}
+			}
+			// build list of tables ordered by depth
+			List depthList = new ArrayList();
+			// find roots (depth 0)
+			// roots are tables that are present in the parents set, but not in the children set
+			Set roots = new HashSet();
+			for (Iterator itParents = allParents.iterator(); itParents.hasNext(); ) {
+				String parent = (String) itParents.next();
+				if (!allChildren.contains(parent)) {
+					roots.add(parent);
+				}
+			}
+			// traverse table graph to populate depth list
+			traverseTableGraph(roots, 0, parentToChild, depthList, new ArrayList());
+			// build insert order from depth list
+			for (Iterator itDepths = depthList.iterator(); itDepths.hasNext(); ) {
+				Set tables = (Set) itDepths.next();
+				insertOrder.addAll(tables);
+			}
+		}
+		if (this.logger.isDebugEnabled()) {
+			this.logger.debug(insertOrder);
+		}
+		return insertOrder;
+	}
+
+	private void traverseTableGraph(Set parents, int parentDepth, Map parentToChild, List depthList, List branch) {
+		int childDepth = parentDepth + 1;
+		// expand depth list if necessary
+		for (int i = depthList.size() - 1; i < parentDepth; i++) {
+			Set tables = new HashSet();
+			depthList.add(tables);
+		}
+		// loop thru parents
+		for (Iterator itParents = parents.iterator(); itParents.hasNext(); ) {
+			String parent = (String) itParents.next();
+			if (branch.contains(parent)) {
+				// we found a cycle
+				// we don't handle cycles
+				// stop traversing branch to avoid infinite loop
+				break;
+			}
+			// add parent to depth list
+			addTableToDepthList(parent, parentDepth, depthList);
+			// make recursive call on children
+			Set children = (Set) parentToChild.get(parent);
+			if (children != null && children.size() > 0) {
+				List parentBranch = new ArrayList();
+				parentBranch.addAll(branch);
+				parentBranch.add(parent);
+				traverseTableGraph(children, childDepth, parentToChild, depthList, parentBranch);
+			}
+		}
+	}
+
+	private void addTableToDepthList(String table, int depth, List depthList) {
+		// in this method, keep in mind that the same table can appear multiple times at multiple depths inside the table graph
+		// check if table is already somewhere in depth list
+		int currentDepth = getTableDepth(table, depthList);
+		if (currentDepth == -1) {
+			// table not in depth list
+			// add it
+			Set tables = (Set) depthList.get(depth);
+			tables.add(table);
+		} else if (currentDepth < depth) {
+			// table already in depth list, at a lower depth
+			// the table should only be present once, at the greatest possible depth
+			// replace table at the new depth
+			Set tables = (Set) depthList.get(currentDepth);
+			tables.remove(table);
+			tables = (Set) depthList.get(depth);
+			tables.add(table);
+		} else {
+			// table already in depth list, at a greater or same depth
+			// nothing to do, since the table should only be present once, at the greatest possible depth
+		}
+	}
+
+	private int getTableDepth(String table, List depthList) {
+		int depth = -1;
+		// loop thru depth list
+		int count = depthList.size();
+		for (int i = 0; i < count; i++) {
+			Set tables = (Set) depthList.get(i);
+			if (tables != null && tables.contains(table)) {
+				depth = i;
+				break;
+			}
+		}
+		return depth;
+	}
+
+
+	public List getDeleteOrder() {
+		if (deleteOrder == null) {
+			deleteOrder = new ArrayList();
+			deleteOrder.addAll(getInsertOrder());
+			Collections.reverse(deleteOrder);
+		}
+		return deleteOrder;
+	}
+
+	// --
+
+
+    //JIRA-952
+    public void addConverter(String name, String converter) {
+        QualifiedColumn column = new QualifiedColumn(name, this.config.isDatabaseSchemaNameSupported());
+        Table t = null;
+       	t = findOrCreateTable(column);
+        Column c = findOrCreateColumn(t, column.getColumnName());
+        c.setConverterClassName(converter);
+    }
+
+    public String getConverter(String tableName, String columnName) {
+        Table t = getTable(tableName);
+        Column c = getColumn(t, columnName);
+        if (c != null) {
+            return c.getConverterClassName();
+        }
+        return null;
+    }
+
+    public Map getConverters(Table table) {
+        Map converters = new HashMap();
+
+        Iterator columns = table.getColumn().iterator();
+        while (columns.hasNext()) {
+            Column c = (Column) columns.next();
+            if (c.getConverterClassName() != null) {
+                String property = c.getPropertyName();
+                if (property == null) {
+                    property = c.getColumnName();
+                }
+                converters.put(property, c.getConverterClassName());
+            }
+        }
+        return converters;
+    }
+
+    public Relationship getRelationshipByReference(Property ref) {
+        Iterator i = config.getRelationship().iterator();
+        while (i.hasNext()) {
+            Relationship r = (Relationship) i.next();
+            if (ref.getName().equals(r.getName())) {
+            	if (getTableTypeName(r.getPrimaryKeyTable()).equals(ref.getContainingType().getName())) return r;
+            } else if(ref.getOpposite().getName().equals(r.getName())) {
+            	if (getTableTypeName(r.getForeignKeyTable()).equals(ref.getContainingType().getName())) return r;
+            }
+        }
+        throw new RuntimeException("Could not find relationship " + ref.getName() + " in the configuration");
+    }
+
+    public Relationship getRelationshipByName(String name) {
+        Iterator i = config.getRelationship().iterator();
+        while (i.hasNext()) {
+            Relationship r = (Relationship) i.next();
+            if (name.equals(r.getName())) {
+                return r;
+            }
+        }
+        throw new RuntimeException("Could not find relationship " + name + " in the configuration");
+    }
+
+    public void addUpdateStatement(Table table, String statement, Parameters parameters) {
+
+        Update update = ConfigFactory.INSTANCE.createUpdate();
+        update.setSql(statement);
+        update.setParameters(parameters);
+        table.setUpdate(update);
+
+    }
+
+    public void addDeleteStatement(Table table, String statement, Parameters parameters) {
+
+        Delete delete = ConfigFactory.INSTANCE.createDelete();
+        delete.setSql(statement);
+        delete.setParameters(parameters);
+        table.setDelete(delete);
+
+    }
+
+    public void addCreateStatement(Table table, String statement, Parameters parameters) {
+
+        Create create = ConfigFactory.INSTANCE.createCreate();
+        create.setSql(statement);
+        create.setParameters(parameters);
+        table.setCreate(create);
+
+    }
+
+    //JIRA-948 support for driver manager connection
+    public void addConnectionInfo(String dataSourceName, boolean managedtx){
+        ConnectionInfo info = ConfigFactory.INSTANCE.createConnectionInfo();
+        info.setDataSource(dataSourceName);
+        info.setManagedtx(managedtx);
+
+        config.setConnectionInfo(info);
+    }
+    
+    public void addConnectionInfo(String driverClass, String connectionURL, String user, String password, int loginTimeout) {
+        ConnectionInfo info = ConfigFactory.INSTANCE.createConnectionInfo();
+        
+        ConnectionProperties connectionProperties = ConfigFactory.INSTANCE.createConnectionProperties(); 
+        connectionProperties.setDriverClass(driverClass);
+        connectionProperties.setDatabaseURL(connectionURL);
+        connectionProperties.setUserName(user);
+        connectionProperties.setPassword(password);
+        connectionProperties.setLoginTimeout(loginTimeout);            
+
+        info.setConnectionProperties(connectionProperties);
+        config.setConnectionInfo(info);
+    }
+    //JIRA-948 end
+
+    public Command addCommand(String name, String sql, String kind) {
+        Command cmd = ConfigFactory.INSTANCE.createCommand();
+        cmd.setName(name);
+        cmd.setKind(kind);
+        cmd.setSQL(sql);
+
+        config.getCommand().add(cmd);
+
+        return cmd;
+    }
+
+    //JIRA-952
+    public void addImpliedPrimaryKey(String schemaName, String tableName, String columnName) {
+        Table t = findOrCreateTable(schemaName, tableName);//JIRA-952
+
+        Iterator i = t.getColumn().iterator();
+        boolean hasPK = false;
+        while (i.hasNext()) {
+            Column c = (Column) i.next();
+            if (c.isPrimaryKey()) {
+                hasPK = true;
+            }
+        }
+
+        if (!hasPK) {
+            Column c = findOrCreateColumn(t, columnName);
+            c.setPrimaryKey(true);
+        }
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
new file mode 100644
index 0000000000..95e5e78c54
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.config.wrapper;
+
+import org.apache.log4j.Logger;
+
+public class QualifiedColumn {
+
+    private final String tableName;
+
+    private final String columnName;
+    private final String schemaName;//JIRA-952
+
+    private final Logger logger = Logger.getLogger(QualifiedColumn.class);
+
+    public QualifiedColumn(String name) {
+    	this.schemaName = "";
+        int index = name.indexOf('.');
+        if ( index == -1 ) {
+            throw new RuntimeException("Column " + name + " must be qualified with a table name");
+        }
+        tableName = name.substring(0, index);
+        columnName = name.substring(index + 1);
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Table name:  " + tableName);
+            this.logger.debug("Column name: " + columnName);
+        }
+    }
+
+    //JIRA-952
+    public QualifiedColumn(String name, boolean isDatabaseSchemaNameSupported) {
+        int index = name.indexOf('.');
+        if ( index == -1 ) {
+            throw new RuntimeException("Column " + name + " must be qualified with a table name and optional schema name");
+        }
+        
+        int lastIndex = name.lastIndexOf('.');
+        		
+        if(index == lastIndex && isDatabaseSchemaNameSupported){
+        	throw new RuntimeException("Column " + name + " must be qualified with a table name and schema name");
+        }
+                
+        if(isDatabaseSchemaNameSupported){
+            schemaName = name.substring(0, index);
+            tableName = name.substring(index+1, lastIndex);
+            columnName = name.substring(lastIndex + 1);        	
+        }
+        else{
+        	schemaName = "";
+            tableName = name.substring(0, index);
+            columnName = name.substring(index + 1);
+        }
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Table name:  " + tableName);
+            this.logger.debug("Column name: " + columnName);
+        }
+    }
+    public String getTableName() {
+        return this.tableName;
+    }
+
+    //JIRA-952
+    public String getSchemaName() {
+        return this.schemaName;
+    }
+    public String getColumnName() {
+        return this.columnName;
+    }
+    //JIRA-952
+    public String toString(){
+    	if(this.schemaName == null || this.schemaName.equals(""))
+    		return this.tableName+"."+this.columnName;
+    	else
+    		return this.schemaName+"."+this.tableName+"."+this.columnName;
+    }
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java
new file mode 100644
index 0000000000..af2ab7ca5b
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java
@@ -0,0 +1,50 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.config.wrapper;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.config.KeyPair;
+import org.apache.tuscany.das.rdb.config.Relationship;
+
+public class RelationshipWrapper {
+
+    private Relationship relationship;
+    private List foreignKeys;
+
+    public RelationshipWrapper(Relationship r) {
+        this.relationship = r;
+    }
+
+    public Collection getForeignKeys() {
+    	if (foreignKeys == null) {
+    		foreignKeys = new ArrayList();
+            Iterator i = this.relationship.getKeyPair().iterator();
+            while (i.hasNext()) {
+                KeyPair pair = (KeyPair) i.next();
+                foreignKeys.add(pair.getForeignKeyColumn());
+            }
+    	}
+        return foreignKeys;
+    }
+    
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
new file mode 100644
index 0000000000..ef420eedf2
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
@@ -0,0 +1,149 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.config.wrapper;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.config.Column;
+import org.apache.tuscany.das.rdb.config.Table;
+
+public class TableWrapper {
+
+    private Table table;
+
+    public TableWrapper(Table table) {
+        this.table = table;
+    }
+
+    public String getTypeName() {
+        return table.getTypeName() == null ? table.getTableName() : table.getTypeName();
+    }
+    
+    public String getTableName() {
+        return table.getTableName();
+    }
+
+    public Collection getPrimaryKeyNames() {
+        List pkNames = new ArrayList();
+        Iterator i = table.getColumn().iterator();
+        while (i.hasNext()) {
+            Column c = (Column) i.next();
+            if (c.isPrimaryKey()) {
+                pkNames.add(c.getColumnName());
+            }
+        }
+        return pkNames;
+    }
+
+    public Collection getPrimaryKeyProperties() {
+
+        List keyProperties = new ArrayList();
+        Iterator columns = table.getColumn().iterator();
+        while (columns.hasNext()) {
+            Column c = (Column) columns.next();
+            if (c.isPrimaryKey()) {
+                keyProperties.add(getColumnPropertyName(c));
+            }
+        }
+
+        return keyProperties;
+    }
+
+    private String getColumnPropertyName(Column c) {
+        if (c.getPropertyName() != null) {
+            return c.getPropertyName();
+        }
+
+        return c.getColumnName();
+    }
+
+    public boolean isGeneratedColumnProperty(String name) {
+        Column c = getColumnByPropertyName(name);
+        return c == null ? false : c.isGenerated();
+    }
+
+    public String getConverter(String propertyName) {
+        Column c = getColumnByPropertyName(propertyName);
+        return (c == null) ? null : c.getConverterClassName();
+    }
+
+    public Column getColumnByPropertyName(String propertyName) {
+        Iterator columns = table.getColumn().iterator();
+        while (columns.hasNext()) {
+            Column c = (Column) columns.next();
+            String property = c.getPropertyName();
+            if (property == null) {
+                property = c.getColumnName();
+            }
+            if (propertyName.equals(property)) {
+                return c;
+            }
+        }
+
+        return null;
+    }
+
+    public Column getCollisionColumn() {
+        Iterator columns = table.getColumn().iterator();
+        while (columns.hasNext()) {
+            Column c = (Column) columns.next();
+            if (c.isCollision()) {
+                return c;
+            }
+        }
+
+        return null;
+
+    }
+
+    public String getCollisionColumnPropertyName() {
+        Column c = getCollisionColumn();
+        if (c.getPropertyName() != null) {
+            return c.getPropertyName();
+        } 
+        return c.getColumnName();
+        
+    }
+
+    public String getManagedColumnPropertyName() {
+        Iterator i = table.getColumn().iterator();
+        while (i.hasNext()) {
+            Column c = (Column) i.next();
+            if (c.isCollision() && c.isManaged()) {
+                return c.getPropertyName() == null ? c.getColumnName() : c.getPropertyName();
+            }
+        }
+        return null;
+
+    }
+
+    public Column getManagedColumn() {
+        Iterator i = table.getColumn().iterator();
+        while (i.hasNext()) {
+            Column c = (Column) i.next();
+            if (c.isCollision() && c.isManaged()) {
+                return c;
+            }
+        }
+        return null;
+    }
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/DataSourceInitializationException.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/DataSourceInitializationException.java
new file mode 100644
index 0000000000..6a644b7ed9
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/DataSourceInitializationException.java
@@ -0,0 +1,36 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.exception;
+
+public class DataSourceInitializationException extends RuntimeException  {
+    
+    private static final long serialVersionUID = 302160989411041041L;
+
+    public DataSourceInitializationException(String string) {
+        super(string);
+    }
+	
+	public DataSourceInitializationException(Throwable e){
+		super(e);
+	}
+    
+    public DataSourceInitializationException(String string, Throwable e) {
+        super(string, e);
+    }
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/OptimisticConcurrencyException.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/OptimisticConcurrencyException.java
new file mode 100644
index 0000000000..dc64d7dc94
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/OptimisticConcurrencyException.java
@@ -0,0 +1,31 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.exception;
+
+
+public class OptimisticConcurrencyException extends RuntimeException {
+
+    private static final long serialVersionUID = -8430445422807942933L;
+
+    public OptimisticConcurrencyException(String string) {
+        super(string);
+    }
+
+   
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java
new file mode 100644
index 0000000000..05d97723a7
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java
@@ -0,0 +1,36 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.generator.impl;
+
+import org.apache.tuscany.das.rdb.Converter;
+
+public class BaseGenerator {
+
+    protected Converter getConverter(String converter) {
+        if (converter != null) {
+            try {
+                return (Converter) Thread.currentThread().getContextClassLoader().loadClass(converter).newInstance();
+            } catch (Exception ex) {
+                throw new RuntimeException(ex);
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
new file mode 100644
index 0000000000..ad2a90c841
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
@@ -0,0 +1,91 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.generator.impl;
+
+import java.util.Iterator;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
+import org.apache.tuscany.das.rdb.impl.DeleteCommandImpl;
+import org.apache.tuscany.das.rdb.impl.ParameterExtendedImpl;
+import org.apache.tuscany.das.rdb.impl.SDODataTypeHelper;
+import org.apache.tuscany.das.rdb.impl.SDODataTypes;
+
+public final class DeleteGenerator extends BaseGenerator {
+
+    public static final DeleteGenerator INSTANCE = new DeleteGenerator();
+
+    private final Logger logger = Logger.getLogger(DeleteGenerator.class);
+
+    private DeleteGenerator() {
+        super();
+    }
+
+    //JIRA-952
+    private String getDeleteStatement(MappingWrapper mapping, Table t) {
+        TableWrapper table = new TableWrapper(t);
+
+        StringBuffer statement = new StringBuffer();
+        statement.append("delete from ");
+        if(mapping.getConfig().isDatabaseSchemaNameSupported()){
+        	statement.append(t.getSchemaName()+"."+t.getTableName());
+        }
+        else{
+        statement.append(t.getTableName());
+        }
+        statement.append(" where ");
+
+        Iterator names = table.getPrimaryKeyNames().iterator();
+        Iterator properties = table.getPrimaryKeyProperties().iterator();
+        while (names.hasNext() && properties.hasNext()) {
+            String name = (String) names.next();
+            statement.append(name);
+            statement.append(" = ?");
+            if (names.hasNext() && properties.hasNext()) {
+                statement.append(" and ");
+            }
+        }
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(statement.toString());
+        }
+
+        return statement.toString();
+    }
+
+    public DeleteCommandImpl getDeleteCommand(MappingWrapper mapping, Table t) {
+        TableWrapper tw = new TableWrapper(t);
+        DeleteCommandImpl deleteCommand = new DeleteCommandImpl(getDeleteStatement(mapping, t));
+
+        Iterator i = tw.getPrimaryKeyProperties().iterator();
+        for (int idx = 1; i.hasNext(); idx++) {
+            String property = (String) i.next();
+            ParameterExtendedImpl p = new ParameterExtendedImpl();
+            p.setName(property);
+            p.setColumnType(SDODataTypeHelper.columnTypeForSDOType(SDODataTypes.OBJECT));
+            p.setConverter(getConverter(tw.getConverter(property)));
+            p.setIndex(idx);
+            deleteCommand.addParameter(p);
+        }
+        return deleteCommand;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
new file mode 100644
index 0000000000..d174629ad9
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
@@ -0,0 +1,182 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.generator.impl;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.config.Column;
+import org.apache.tuscany.das.rdb.config.Relationship;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.config.wrapper.RelationshipWrapper;
+import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
+import org.apache.tuscany.das.rdb.impl.InsertCommandImpl;
+import org.apache.tuscany.das.rdb.impl.ParameterExtendedImpl;
+import org.apache.tuscany.das.rdb.impl.SDODataTypeHelper;
+import org.apache.tuscany.das.rdb.util.CollectionsUtil;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+
+public final class InsertGenerator extends BaseGenerator {
+
+    public static final InsertGenerator INSTANCE = new InsertGenerator();
+
+    private final Logger logger = Logger.getLogger(InsertGenerator.class);
+
+    private InsertGenerator() {
+        super();
+    }
+
+    public InsertCommandImpl getInsertCommand(MappingWrapper config, DataObject changedObject, Table t) {
+        List parameters = new ArrayList();
+        TableWrapper table = new TableWrapper(t);
+        StringBuffer statement = new StringBuffer("insert into ");
+        //JIRA-952
+        if(config.getConfig().isDatabaseSchemaNameSupported()){
+        	statement.append(t.getSchemaName()+"."+t.getTableName());
+        }
+        else{
+        statement.append(t.getTableName());
+        }
+        HashSet changedProperties = getAttributeProperties(changedObject, config, table);
+        Iterator i;
+        if ( changedProperties.isEmpty() ) {
+            i = changedObject.getType().getProperties().iterator();
+        } else {
+            i = changedProperties.iterator();
+        }
+
+        List attributes = new ArrayList();
+        List generatedKeys = new ArrayList();
+        while (i.hasNext()) {
+            Property attr = (Property) i.next();
+            if ( attr.getType().isDataType()) {
+                if (table.isGeneratedColumnProperty(attr.getName())) {
+                 generatedKeys.add(attr.getName());
+             } else {
+                 attributes.add(attr.getName());
+                    parameters.add(changedObject.getType().getProperty(attr.getName()));
+             }
+            }
+        }
+
+        statement.append("(");
+        Iterator attrs = attributes.iterator();
+        while (attrs.hasNext()) {
+            String name = (String) attrs.next();
+            statement.append("");
+            Column c = config.getColumnByPropertyName(t, name);
+            statement.append(c == null ? name : c.getColumnName());
+            if (attrs.hasNext()) {
+                statement.append(", ");
+            } else {
+                statement.append(")");
+            }
+        }
+
+        statement.append(" values (");
+        for (int idx = 1; idx <= attributes.size(); idx++) {
+            statement.append('?');
+            if (idx < attributes.size()) {
+                statement.append(", ");
+            } else {
+                statement.append(")");
+            }
+        }
+
+        InsertCommandImpl cmd = new InsertCommandImpl(statement.toString(), 
+                (String[]) generatedKeys.toArray(new String[0]));
+        Iterator params = parameters.iterator();
+        for (int idx = 1; params.hasNext(); idx++) {
+            Property property = (Property) params.next();
+            ParameterExtendedImpl p = new ParameterExtendedImpl();
+            p.setName(property.getName());
+            p.setType(property.getType());
+            p.setColumnType(SDODataTypeHelper.columnTypeForSDOType(property.getType()));
+            p.setConverter(getConverter(table.getConverter(property.getName())));
+            p.setIndex(idx);
+            cmd.addParameter(p);
+
+        }
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(statement.toString());
+        }
+
+        return cmd;
+
+    }
+
+    private HashSet getAttributeProperties(DataObject obj, MappingWrapper config, TableWrapper tw) {
+        HashSet fields = new HashSet();
+        Iterator i = obj.getType().getProperties().iterator();
+        while (i.hasNext()) {
+            Property p = (Property) i.next();
+            if (p.getType().isDataType()) {
+                if (obj.isSet(p)) {
+                    if (fields.add(p) == false) {
+                        throw new RuntimeException("Foreign key properties should not be set when the corrsponding relationship has changed");
+                    }
+                }
+            } else {
+                if (obj.isSet(p)) {
+                    Relationship relationship = config.getRelationshipByReference(p);
+                    if ((p.getOpposite() != null && p.getOpposite().isMany()) 
+                            || (hasState(tw, relationship, obj))) {
+                        RelationshipWrapper r = new RelationshipWrapper(relationship);
+                        Iterator keys = r.getForeignKeys().iterator();
+                        while (keys.hasNext()) {
+                            String key = (String) keys.next();
+                            String keyProperty = config.getColumnPropertyName(tw.getTableName(), key);
+                            Property keyProp = obj.getType().getProperty(keyProperty);
+                            if ( keyProp == null ) 
+                                throw new RuntimeException("Invalid foreign key column: " + key);
+                            if (fields.add(keyProp) == false) {
+                                throw new RuntimeException("Foreign key properties should not be set when the corresponding relationship has changed");
+                            }
+                        }
+                    }
+
+                }
+            }
+        }
+
+        return fields;
+
+    }
+
+    private boolean hasState(TableWrapper tw, Relationship rel, DataObject changedObject) {
+
+        if (!rel.isMany()) {
+                   
+            RelationshipWrapper rw = new RelationshipWrapper(rel);
+            if ((rel.getForeignKeyTable().equals(tw.getTableName())) 
+                    && (CollectionsUtil.disjoint(tw.getPrimaryKeyProperties(), rw.getForeignKeys()))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
new file mode 100644
index 0000000000..d74d3f413f
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
@@ -0,0 +1,271 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.generator.impl;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.config.Column;
+import org.apache.tuscany.das.rdb.config.Relationship;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.config.wrapper.RelationshipWrapper;
+import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
+import org.apache.tuscany.das.rdb.impl.CollisionParameter;
+import org.apache.tuscany.das.rdb.impl.ManagedParameterImpl;
+import org.apache.tuscany.das.rdb.impl.OptimisticWriteCommandImpl;
+import org.apache.tuscany.das.rdb.impl.ParameterExtendedImpl;
+import org.apache.tuscany.das.rdb.impl.SDODataTypeHelper;
+import org.apache.tuscany.das.rdb.impl.UpdateCommandImpl;
+import org.apache.tuscany.das.rdb.util.CollectionsUtil;
+
+import commonj.sdo.ChangeSummary;
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+import commonj.sdo.Type;
+import commonj.sdo.ChangeSummary.Setting;
+
+public final class UpdateGenerator extends BaseGenerator {
+
+    public static final UpdateGenerator INSTANCE = new UpdateGenerator();
+
+    private final Logger logger = Logger.getLogger(UpdateGenerator.class);
+
+    private UpdateGenerator() {
+        super();
+    }
+
+    /*Utility to check if the given HashSet of Properties contains a property with certain name*/
+    private boolean isContained(HashSet changedFields, String propertyName) {
+    	Iterator itr = changedFields.iterator();
+    	while(itr.hasNext()) {
+    		Property changedProperty = (Property)itr.next();
+    		if(changedProperty.getName().equals(propertyName)) {
+    			return true;
+    		}
+    	}
+    	return false;
+    }
+    
+    public UpdateCommandImpl getUpdateCommand(MappingWrapper mapping, DataObject changedObject, Table table) {      
+        List parameters = new ArrayList();
+        Type type = changedObject.getType();
+        TableWrapper tableWrapper = new TableWrapper(table);
+        // get changed fields 
+        ChangeSummary summary = changedObject.getDataGraph().getChangeSummary();
+        HashSet changedFields = getChangedFields(mapping, summary, changedObject, tableWrapper); 
+        // if there are no changed fields return null
+        if (changedFields.size() == 0) {
+        	return null; 
+        }
+        // compose statement 
+        StringBuffer statement = new StringBuffer("update ");
+        if(mapping.getConfig().isDatabaseSchemaNameSupported()){
+        	statement.append(table.getSchemaName()+"."+table.getTableName());
+        }
+        else{
+        	statement.append(table.getTableName());
+        }
+        statement.append(" set ");
+
+        Iterator i = changedFields.iterator();
+      
+        int idx = 1;
+        while (i.hasNext()) {
+            Property property = (Property) i.next();
+            Column c = tableWrapper.getColumnByPropertyName(property.getName());          
+            
+            if ((c == null) || !c.isCollision() || !c.isPrimaryKey()) { 
+                String columnName = c == null ? property.getName() : c.getColumnName();
+                appendFieldSet(statement, idx > 1, columnName);
+                parameters.add(createParameter(tableWrapper, property, idx++));
+            } 
+        }
+        
+        Column c = tableWrapper.getManagedColumn();
+        if (c != null) {
+            appendFieldSet(statement, idx > 1, c.getColumnName());
+            String propertyName = c.getPropertyName() == null ? c.getColumnName() : c.getPropertyName();
+            parameters.add(createManagedParameter(tableWrapper, 
+                    changedObject.getInstanceProperty(propertyName), idx++));
+        }
+        
+        statement.append(" where ");
+
+        Iterator pkColumnNames = tableWrapper.getPrimaryKeyNames().iterator();
+        Iterator pkPropertyNames = tableWrapper.getPrimaryKeyProperties().iterator();
+        while (pkColumnNames.hasNext() && pkPropertyNames.hasNext()) {
+            String columnName = (String) pkColumnNames.next();
+            String propertyName = (String) pkPropertyNames.next();
+            
+            if(!isContained(changedFields, propertyName)) {//if PK itself is changed, don't add here, will get added below as collision parameter
+	            statement.append(columnName);
+	            statement.append(" = ?");
+	            if (pkColumnNames.hasNext() && pkPropertyNames.hasNext()) {
+	                statement.append(" and ");
+	            }
+	            parameters.add(createParameter(tableWrapper, type.getProperty(propertyName), idx++));
+            }
+        }
+
+        if (tableWrapper.getCollisionColumn() == null) {
+            Iterator iter = changedFields.iterator();
+            while (iter.hasNext()) {
+            	if(statement.lastIndexOf(" where ") != statement.length()-7)
+            		statement.append(" and ");
+            	
+                Property changedProperty = (Property) iter.next();
+                Column column = tableWrapper.getColumnByPropertyName(changedProperty.getName()); 
+                statement.append(column == null ? changedProperty.getName() : column.getColumnName());
+                                 
+                Object value;
+                Setting setting = summary.getOldValue(changedObject, changedProperty);
+                // Setting is null if this is a relationship change
+                if (setting == null) {
+                    value = changedObject.get(changedProperty);
+                } else {
+                    value = setting.getValue();
+                }
+                
+                if (value == null) {                   
+                    statement.append(" is null");                    
+                } else {
+                	ParameterExtendedImpl param = createCollisionParameter(tableWrapper, changedProperty, idx++);
+                    statement.append(" = ?");
+                    param.setValue(value);
+                    parameters.add(param);
+                }
+                
+               
+            }
+           
+        } else {
+        	if(statement.lastIndexOf(" where ") != statement.length()-7)
+        		statement.append(" and ");
+
+        	statement.append(tableWrapper.getCollisionColumn().getColumnName());
+            statement.append(" = ?");
+            parameters.add(createParameter(tableWrapper, 
+                    type.getProperty(tableWrapper.getCollisionColumnPropertyName()), idx++));                       
+        }                  
+
+        UpdateCommandImpl updateCommand = new OptimisticWriteCommandImpl(statement.toString());
+        
+        Iterator params = parameters.iterator();
+        while (params.hasNext()) {     
+        	ParameterExtendedImpl ptemp = (ParameterExtendedImpl) params.next();
+        	updateCommand.addParameter(ptemp);
+        }
+           
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(statement.toString());
+        }
+
+        return updateCommand;
+    }
+
+  
+
+    private void appendFieldSet(StringBuffer statement, boolean appendComma, String columnName) {
+        if (appendComma) {
+            statement.append(", ");
+        }
+        statement.append(columnName);
+        statement.append(" = ?");
+    }
+
+
+
+    private HashSet getChangedFields(MappingWrapper config, ChangeSummary summary, DataObject obj, TableWrapper tw) {
+        HashSet changes = new HashSet();
+        
+        Iterator i = summary.getOldValues(obj).iterator();
+        while (i.hasNext()) {
+            ChangeSummary.Setting setting = (ChangeSummary.Setting) i.next();
+            
+            if (setting.getProperty().getType().isDataType()) {
+               if ( changes.add(setting.getProperty()) == false ) {
+                   throw new RuntimeException("Foreign key properties should not be set when the corresponding relationship has changed");
+               }
+            } else {
+                Property ref = setting.getProperty();
+                
+                Relationship relationship = config.getRelationshipByReference(ref);
+                if ((ref.getOpposite() != null && ref.getOpposite().isMany()) 
+                        || (hasState(tw, relationship, obj))) {
+                    RelationshipWrapper r = new RelationshipWrapper(config.getRelationshipByReference(ref));
+
+                    Iterator keys = r.getForeignKeys().iterator();
+                    while (keys.hasNext()) {
+                        String key = (String) keys.next();
+                        String keyProperty = config.getColumnPropertyName(tw.getTableName(), key);
+                        Property keyProp = obj.getType().getProperty(keyProperty);
+                        if ( keyProp == null ) {
+                            throw new RuntimeException("Invalid foreign key column: " + key);
+                        }
+                        if (changes.add(keyProp) == false) {
+                            throw new RuntimeException("Foreign key properties should not be set when the corresponding relationship has changed");
+                        }
+                    }
+                }
+            }
+        }
+        return changes;
+    }
+
+    private boolean hasState(TableWrapper tw, Relationship rel, DataObject changedObject) {
+        if (!rel.isMany()) {
+            RelationshipWrapper rw = new RelationshipWrapper(rel);
+            if ((rel.getForeignKeyTable().equals(tw.getTableName())) 
+                    && (CollectionsUtil.disjoint(tw.getPrimaryKeyProperties(), rw.getForeignKeys()))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+    
+    private ParameterExtendedImpl fillExtendedParameter(ParameterExtendedImpl param, TableWrapper table, Property property, int idx) {
+        param.setName(property.getName());
+        param.setType(property.getType());
+        param.setConverter(getConverter(table.getConverter(property.getName())));
+        if (idx != -1) {
+            param.setIndex(idx);
+        }
+        param.setColumnType(SDODataTypeHelper.columnTypeForSDOType(property.getType()));
+        return param;
+    }
+    private ParameterExtendedImpl createCollisionParameter(TableWrapper tableWrapper, Property property, int i) {
+    	ParameterExtendedImpl param = new CollisionParameter();
+    	return fillExtendedParameter(param, tableWrapper, property, i);
+    }
+    
+    private ParameterExtendedImpl createManagedParameter(TableWrapper table, Property property, int idx) {
+    	ParameterExtendedImpl param = new ManagedParameterImpl();
+    	return fillExtendedParameter(param, table, property, idx);
+    }
+
+    private ParameterExtendedImpl createParameter(TableWrapper table, Property property, int idx) {
+    	ParameterExtendedImpl param = new ParameterExtendedImpl();
+    	return fillExtendedParameter(param, table, property, idx);
+    }
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
new file mode 100644
index 0000000000..0e5fc48c0c
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
@@ -0,0 +1,123 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.graphbuilder.impl;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+import commonj.sdo.Type;
+import commonj.sdo.helper.DataFactory;
+
+public final class DataObjectMaker {
+
+    private final DataObject rootObject;
+    private final Map containmentPropertyMap;
+    private final Map typeMap;
+
+    private static final Logger logger = Logger.getLogger(DataObjectMaker.class);
+
+    public DataObjectMaker(DataObject root) {
+        this.rootObject = root;
+        containmentPropertyMap = new HashMap();
+        typeMap = new HashMap();
+        Iterator i = this.rootObject.getType().getProperties().iterator();
+        while (i.hasNext()) {
+            Property p = (Property) i.next();
+            Type type = p.getType();
+            String typeName = type.getName();
+            typeMap.put(typeName, type);
+            if (p.isContainment()) {
+            	containmentPropertyMap.put(typeName, p);
+            }
+        }
+    }
+
+    /**
+     * @param tableData
+     * @return
+     */
+    public DataObject createAndAddDataObject(TableData tableData, ResultMetadata resultMetadata) {
+        // Get a Type from the package and create a standalone DataObject
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Looking for Type for " + tableData.getTableName());
+        }
+
+        String tableName = tableData.getTableName();
+        Type tableClass = (Type) typeMap.get(tableName);
+
+        if (tableClass == null) {
+            throw new RuntimeException("An SDO Type with name " + tableData.getTableName() + " was not found");
+        }
+
+        DataObject obj = DataFactory.INSTANCE.create(tableClass);
+
+        // Now, check to see if the root data object has a containment reference
+        // to this EClass. If so, add it to the graph. If not, it will be taken
+        // care of when we process relationships
+        Property containmentProp = (Property) containmentPropertyMap.get(tableName);
+        if (containmentProp != null) {
+            if (containmentProp.isMany()) {
+                rootObject.getList(containmentProp).add(obj);
+            } else {
+                this.rootObject.set(containmentProp, obj);
+            }
+        }
+
+        // Set the column values
+        Iterator columnNames = resultMetadata.getPropertyNames(tableData.getTableName()).iterator();
+        Type objType = obj.getType();
+        while (columnNames.hasNext()) {
+            String propertyName = (String) columnNames.next();
+            Property p = objType.getProperty(propertyName);
+            if (p == null) {
+            	// Try again, ignoring case
+            	p = findProperty(objType, propertyName);
+                if (p == null) {
+                    throw new RuntimeException("Type " + obj.getType().getName() 
+                            + " does not contain a property named " + propertyName);
+                }
+            }
+
+            Object value = tableData.getColumnData(propertyName);
+
+            obj.set(p, value);
+        }
+
+        return obj;
+    }
+
+    // temporary, ignoring case
+    private Property findProperty(Type type, String columnName) {
+        Iterator properties = type.getProperties().iterator();
+        while (properties.hasNext()) {
+            Property p = (Property) properties.next();
+            if (columnName.equalsIgnoreCase(p.getName())) {
+                return p;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
new file mode 100644
index 0000000000..a08f184b9a
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
@@ -0,0 +1,84 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.graphbuilder.impl;
+
+import java.sql.Blob;
+import java.sql.SQLException;
+
+import org.apache.tuscany.das.rdb.Converter;
+
+public class DefaultConverter implements Converter {
+
+    public DefaultConverter() {
+        super();
+    }
+
+    public Object getColumnValue(Object data) {
+        return data;
+    }
+
+    public Object getPropertyValue(Object data) {
+        // if (type.isInstance(data))
+        // return data;
+        //
+        // if ( data == null )
+        // return null;
+        //
+        // String name = type.getInstanceClass().getName();
+        // if (name == "java.lang.Byte" || name == "byte") {
+        // return new Byte(data.toString());
+        // }
+        //
+        // else if (name == "java.lang.Double" || name == "double") {
+        // return new Double(data.toString());
+        // }
+        //
+        // else if (name == "java.lang.Float" || name == "float") {
+        // return new Float(data.toString());
+        // }
+        //
+        // else if (name == "java.lang.Integer" || name == "int") {
+        // return new Integer(data.toString());
+        // }
+        //
+        // else if (name == "java.lang.Long" || name == "long") {
+        // return new Long(data.toString());
+        // }
+        //
+        // else if (name == "java.lang.Short" || name == "short") {
+        // return new Short(data.toString());
+        // }
+        //
+        // else if (name == "java.lang.String") {
+        // return String.valueOf(data.toString());
+        // }
+
+        if (data instanceof Blob) {
+            Blob b = (Blob) data;
+            try {
+                return b.getBytes(1, (int) b.length());
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+        } 
+       
+        return data;
+       
+    }
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
new file mode 100644
index 0000000000..5be56d77d8
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
@@ -0,0 +1,283 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.graphbuilder.impl;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.Relationship;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.impl.ResultSetShape;
+import org.apache.tuscany.sdo.api.SDOUtil;
+
+import commonj.sdo.Property;
+import commonj.sdo.Type;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
+
+/**
+ */
+public final class GraphBuilderMetadata {
+
+	private static final Logger logger = Logger.getLogger(GraphBuilderMetadata.class);
+	
+    private MappingWrapper configWrapper;
+
+    private final Collection resultSets = new ArrayList();
+    
+    private String typeURI;
+    
+    private List definedTypes;
+
+    private Type rootType;
+
+    private HelperContext defaultHelperContext = HelperProvider.getDefaultContext();
+    private HelperContext helperContext = HelperProvider.getInstance().getDefaultContext(); 
+ 
+
+    public GraphBuilderMetadata(List results, Config model, ResultSetShape shape) throws SQLException {
+        this.configWrapper = new MappingWrapper(model);
+        if (model != null) {
+            this.typeURI = model.getDataObjectModel();
+        }
+
+        Iterator i = results.iterator();
+        while (i.hasNext()) {
+            ResultSet rs = (ResultSet) i.next();
+            ResultMetadata resultMetadata = new ResultMetadata(rs, configWrapper, shape);
+            resultSets.add(resultMetadata);
+        }
+
+     }
+
+    /**
+     * Returns the collection of ResultMetadata objects
+     */
+    public Collection getResultMetadata() {
+        return this.resultSets;
+    }
+    
+    /**
+     * Returns the set of defined relationships
+     */
+
+    public Collection getRelationships() {
+        return configWrapper.getConfig().getRelationship();
+    }
+
+    /**
+     * Returns the root Type
+     */
+    public Type getRootType() {
+        if (this.rootType == null) {
+            if (this.typeURI == null) {
+                createDynamicTypes();
+            } else {
+                createDynamicRoot();
+            }
+        }
+
+        return this.rootType;
+    }
+
+    public MappingWrapper getConfigWrapper() {
+        return this.configWrapper;
+    }
+
+    /**
+     * Creates a set of SDO Types based on the query results and supplied config information
+     */
+
+    private void createDynamicTypes() {
+
+        Type root = SDOUtil.createType(helperContext, getDefaultURI(), "DataGraphRoot", false);
+		if (this.logger.isDebugEnabled()) {
+			this.logger.debug("GBMD.createDynamicTypes():created Type for "+getDefaultURI());
+		}
+
+		Iterator iter = getResultMetadata().iterator();
+        while (iter.hasNext()) {
+
+            ResultMetadata resultMetadata = (ResultMetadata) iter.next();
+
+			// Create a Type for each Table represented in the ResultSet
+			Iterator names = resultMetadata.getAllTablePropertyNames().iterator();
+			while (names.hasNext()) {
+				String tableName = (String) names.next();
+				if (root.getProperty(tableName) == null) {
+					Type tableType = SDOUtil.createType(helperContext, getDefaultURI(), tableName, false);
+					Property property = SDOUtil.createProperty(root, tableName, tableType);
+					SDOUtil.setMany(property, true);
+					SDOUtil.setContainment(property, true);
+					if (this.logger.isDebugEnabled()) {
+						this.logger.debug("GBMD.createDynamicTypes():CREATING NEW TABLE TYPE & PROPERTY :"+tableName);
+					}                    
+				}
+			}
+
+			// TODO tablePropertyMap is temporary until Tuscany-203 is fixed
+			Map tablePropertyMap = new HashMap();
+
+			for (int i = 1; i <= resultMetadata.getResultSetSize(); i++) {
+
+				Property ref = root.getProperty(resultMetadata.getTablePropertyName(i));
+
+				if (ref == null) {
+					throw new RuntimeException("Could not find table " + resultMetadata.getTablePropertyName(i) 
+							+ " in the SDO model");
+				}
+
+				// TODO Temporary code to check to see if a property has already been added.
+				// Replace when Tuscany-203 is fixed
+				List addedProperties = (List) tablePropertyMap.get(ref.getName());
+				if (addedProperties == null) {
+					addedProperties = new ArrayList();
+					tablePropertyMap.put(ref.getName(), addedProperties);
+				}
+
+
+
+				String columnName = resultMetadata.getColumnPropertyName(i);
+
+				// TODO temporary check until Tuscany-203 is fixed
+				if (!addedProperties.contains(columnName)) {
+					addedProperties.add(columnName);
+					Type atype = resultMetadata.getDataType(i);
+
+					SDOUtil.createProperty(ref.getType(), columnName, atype);
+
+				}
+
+			}
+        }
+
+        MappingWrapper wrapper = getConfigWrapper();
+        Iterator i = getRelationships().iterator();
+        while (i.hasNext()) {
+            Relationship r = (Relationship) i.next();
+
+            String parentName = wrapper.getTableTypeName(r.getPrimaryKeyTable());
+            String childName = wrapper.getTableTypeName(r.getForeignKeyTable());
+
+            if (parentName == null) {
+                throw new RuntimeException("The parent table (" + r.getPrimaryKeyTable() 
+                        + ") in relationship " + r.getName()
+                        + " was not found in the mapping information.");
+            } else if (childName == null) {
+                throw new RuntimeException("The child table (" + r.getForeignKeyTable() 
+                        + ") in relationship " + r.getName()
+                        + " was not found in the mapping information.");
+            }
+
+            Property parentProperty = root.getProperty(parentName);
+            Property childProperty = root.getProperty(childName);
+
+            if (parentProperty == null) {
+                throw new RuntimeException("The parent table (" + parentName + ") in relationship " 
+                        + r.getName() + " was not found.");
+            } else if (childProperty == null) {
+                throw new RuntimeException("The child table (" + childName + ") in relationship " 
+                        + r.getName() + " was not found.");
+            }
+
+            Type parent = parentProperty.getType();
+            Type child = childProperty.getType();
+
+            Property parentProp = SDOUtil.createProperty(parent, r.getName(), child);
+            Property childProp = SDOUtil.createProperty(child, r.getName() + "_opposite", parent);
+            SDOUtil.setOpposite(parentProp, childProp);
+            SDOUtil.setOpposite(childProp, parentProp);
+            SDOUtil.setMany(parentProp, r.isMany());
+        }
+
+        this.rootType = root;
+    }
+
+    private String getDefaultURI() {
+        return "http:///org.apache.tuscany.das.rdb/das";
+    }
+
+    /**
+     * Create a dynamic root Type to act as a container Type for a set of generated Types
+     * 
+     */
+    private void createDynamicRoot() {
+        Type root = SDOUtil.createType(helperContext, getDefaultURI() + "/DataGraphRoot", "DataGraphRoot", false);
+
+        List types = getDefinedTypes();
+        
+        if (types == null) {
+            throw new RuntimeException("SDO Types have not been registered for URI " + typeURI);
+        }
+
+        Iterator i = types.iterator();
+        while (i.hasNext()) {
+            Type type = (Type) i.next();
+            Property property = SDOUtil.createProperty(root, type.getName(), type);
+            SDOUtil.setContainment(property, true);
+            SDOUtil.setMany(property, true);
+        }
+        this.rootType = root;
+    }
+
+    public List getDefinedTypes() {
+    	if (this.definedTypes == null) {
+        	List types = null;
+        	List defaultTypes = null;
+            if (this.typeURI == null) {
+            	types = SDOUtil.getTypes(helperContext, getDefaultURI());
+            	defaultTypes = SDOUtil.getTypes(defaultHelperContext, getDefaultURI());
+            	if(defaultTypes != null){
+    	            if(types == null) {
+    	            	types = defaultTypes;
+    	            }
+    	            else {
+    	            	types.addAll(defaultTypes);	
+    	            }
+            	}
+            	this.definedTypes = types;
+            } else {
+                types = SDOUtil.getTypes(helperContext, typeURI);        
+                defaultTypes = SDOUtil.getTypes(defaultHelperContext, typeURI);
+                if(defaultTypes != null){
+        	        if(types == null) {
+        	        	types = defaultTypes;
+        	        }
+        	        else {
+        	        	types.addAll(defaultTypes);	
+        	        }   
+                }
+                
+                if(rootType != null)
+                	types.add(rootType);
+                this.definedTypes = types;
+            }
+    	}
+    	return this.definedTypes;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
new file mode 100644
index 0000000000..bc3ca440b9
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.graphbuilder.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
+import commonj.sdo.DataObject;
+
+/**
+ * 
+ * Used to store and look up table objects based on primary key This could be a lot more 
+ * efficient if we could use LinkedHashMap from JDK 1.4
+ */
+public class MultiTableRegistry implements TableRegistry {
+    private static final Logger logger = Logger.getLogger(MultiTableRegistry.class);
+
+    private Map tableNameMap;
+
+    private Map tableValueMap;
+
+    public MultiTableRegistry() {
+        tableNameMap = new HashMap();
+        tableValueMap = new HashMap();
+    }
+
+    /**
+     * Get the table with the specified name and primary key
+     * 
+     * @param tableName
+     * @param primaryKey
+     * @return EDataObject
+     */
+    public DataObject get(String tableName, List primaryKey) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Looking for table " + tableName + " with PK " + primaryKey);
+            this.logger.debug("\tReturning " + getPkMap(tableName).get(primaryKey));
+        }
+        return (DataObject) getPkMap(tableName).get(primaryKey);
+    }
+
+    /**
+     * Add the table with the specified name and primary key
+     * 
+     * @param tableName
+     * @param primaryKey
+     * @param value
+     */
+    public void put(String tableName, List primaryKey, DataObject value) {
+        if (getPkMap(tableName).put(primaryKey, value) == null) {
+            getCreateValueList(tableName).add(value);
+        }
+    }
+
+    /**
+     * Get the HashMap that contains the primary key to table object mappings.
+     * 
+     * @param tableName
+     * @return HashMap
+     */
+    private Map getPkMap(String tableName) {
+        Map pkMap = (HashMap) tableNameMap.get(tableName);
+        if (pkMap == null) {
+            pkMap = new HashMap();
+            tableNameMap.put(tableName, pkMap);
+        }
+        return pkMap;
+    }
+
+    private List getCreateValueList(String tableName) {
+        List values = (List) tableValueMap.get(tableName);
+        if (values == null) {
+            values = new ArrayList();
+            tableValueMap.put(tableName, values);
+        }
+        return values;
+    }
+
+    public boolean contains(String tableName, List primaryKey) {
+        return get(tableName, primaryKey) == null ? false : true;
+
+    }
+
+    public void remove(String tableName, List primaryKey) {
+    	getPkMap(tableName).get(primaryKey);
+    	Map pkMap = (HashMap) tableNameMap.get(tableName);
+    	
+    	if(pkMap.get(primaryKey) != null) {
+    		pkMap.remove(primaryKey);	
+    	}
+    	
+    	if(pkMap.size() == 0) {
+    		tableNameMap.remove(tableName);
+    	}
+    }    
+}
+\ No newline at end of file
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
new file mode 100644
index 0000000000..39f35150ec
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
@@ -0,0 +1,411 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.graphbuilder.impl;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.tuscany.das.rdb.Converter;
+import org.apache.tuscany.das.rdb.config.Column;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
+import org.apache.tuscany.das.rdb.impl.ResultSetShape;
+import org.apache.tuscany.das.rdb.impl.SDODataTypes;
+
+import commonj.sdo.Type;
+
+public final class ResultMetadata {
+
+    private Map tableToPropertyMap = new HashMap();
+
+    private List typeNames = new ArrayList();
+
+    private List propertyNames = new ArrayList();
+
+    private final ResultSet resultSet;
+
+    private final ResultSetShape resultSetShape;
+
+    private final MappingWrapper configWrapper;
+
+    private Converter[] converters;
+
+    private Map tableToPrimaryKeysMap = new HashMap();
+    
+    //JIRA-952
+    public ResultMetadata(ResultSet rs, MappingWrapper cfgWrapper, ResultSetShape shape) throws SQLException {
+
+        this.resultSet = rs;
+        this.configWrapper = cfgWrapper;
+
+        if (shape == null) {
+            this.resultSetShape = new ResultSetShape(rs.getMetaData(), configWrapper.getConfig());
+        } else {
+            this.resultSetShape = shape;
+        }
+
+        this.converters = new Converter[resultSetShape.getColumnCount()];
+
+        Map impliedRelationships = new HashMap();
+        String schemaName = "";
+        String idSpell = null;
+        for (int i = 1; i <= resultSetShape.getColumnCount(); i++) {
+            String tableName = resultSetShape.getTableName(i);
+             schemaName = resultSetShape.getSchemaName(i);
+            if (( tableName == null ) || ( tableName.equals(""))) {
+                throw new RuntimeException("Unable to obtain table information from JDBC. DAS configuration must specify ResultDescriptors");
+            }
+            String typeName = null;
+            
+            if(this.configWrapper.getConfig().isDatabaseSchemaNameSupported()){
+            	typeName = configWrapper.getTableTypeName(schemaName+"."+tableName);
+            }
+            else{
+            	typeName = configWrapper.getTableTypeName(tableName);	
+            }
+            String columnName = resultSetShape.getColumnName(i);
+
+            String colName = "";
+            if (columnName.regionMatches(true, columnName.length()-3, "_ID", 0, 3)) {
+            	idSpell = columnName.substring(columnName.length()-3, columnName.length());            	
+            	if(this.configWrapper.getConfig().isDatabaseSchemaNameSupported()){
+            		colName = schemaName+"."+columnName;
+            		impliedRelationships.put(colName, schemaName+"."+tableName);
+            	}
+            	else{
+            		colName = columnName;
+            		impliedRelationships.put(colName, tableName);	
+            	}
+            } else if (columnName.equalsIgnoreCase("ID")) {
+                configWrapper.addImpliedPrimaryKey(schemaName, tableName, columnName);
+            }
+
+            String propertyName = null;
+            
+            if(this.configWrapper.getConfig().isDatabaseSchemaNameSupported()){
+            	propertyName = configWrapper.getColumnPropertyName(schemaName+"."+tableName, columnName);	
+            }
+            else{
+            	propertyName = configWrapper.getColumnPropertyName(tableName, columnName);
+            }
+            String converterName = null;
+            
+            if(this.configWrapper.getConfig().isDatabaseSchemaNameSupported()){
+            	converterName = configWrapper.getConverter(schemaName+"."+tableName, resultSetShape.getColumnName(i));
+            }
+            else{
+            	converterName = configWrapper.getConverter(tableName, resultSetShape.getColumnName(i));	
+            }
+
+            converters[i - 1] = loadConverter(converterName, resultSetShape.getColumnType(i));
+
+            typeNames.add(typeName);
+            propertyNames.add(propertyName);
+
+            Collection properties = (Collection) tableToPropertyMap.get(typeName);
+            if (properties == null) {
+                properties = new ArrayList();
+            }
+            properties.add(propertyName);
+            tableToPropertyMap.put(typeName, properties);
+            
+        }
+        
+        //System.out.println("tableToPropertyMap "+tableToPropertyMap);
+        fillTableToPrimaryKeysMap();
+        
+        Iterator i = impliedRelationships.keySet().iterator();
+        while (i.hasNext()) {
+            String columnName = (String) i.next();
+            String pkTableName = columnName.substring(0, columnName.indexOf(idSpell));//_id, _Id, _iD, _ID anything
+            String fkTableName = (String) impliedRelationships.get(columnName);
+            List pkTableProperties = (List) tableToPropertyMap.get(configWrapper.getTableTypeName(pkTableName));
+            if ((pkTableProperties != null) && (pkTableProperties.contains("ID"))) {
+                configWrapper.addImpliedRelationship(pkTableName, fkTableName, columnName);
+            }
+        }
+        // Add any tables defined in the model but not included in the ResultSet
+        // to the list of propertyNames
+        Config model = configWrapper.getConfig();
+        if (model != null) {
+            Iterator tablesFromModel = model.getTable().iterator();
+            while (tablesFromModel.hasNext()) {
+                TableWrapper t = new TableWrapper((Table) tablesFromModel.next());
+                if (tableToPropertyMap.get(t.getTypeName()) == null) {
+                    tableToPropertyMap.put(t.getTypeName(), Collections.EMPTY_LIST);
+                }
+            }
+        }
+    }
+
+    //Now fill tableToPrimaryKeysMap.Complete for whichever tables are there in tableToPrimaryKeysMap,
+    //Also case of implied PK and it is not there in SELECT, provide way to still fill it in
+    //tableToPrimaryKeysMap - the column should be present in Config (though not defed as PK)
+    //And consider the classic case, when we assume all columns to be PKs - when no info
+    //in config for table or "all columns"
+    private void fillTableToPrimaryKeysMap(){
+	    Iterator itr = tableToPropertyMap.keySet().iterator();
+	    while(itr.hasNext()){
+	    	String curTableName = (String)itr.next();
+	    	boolean treatAllPKs = false;//flag for, when all cols need to be treated as PKs
+	    	
+	    	if(tableToPrimaryKeysMap.containsKey(curTableName)){
+	    		continue;//don't keep refilling same hashset for each ResultMetadata constructor,
+	    	}
+	    	
+	    	List columnsForTable = null;
+	    	if(configWrapper.getTableByTypeName(curTableName) != null) {
+	    		 columnsForTable = configWrapper.getTableByTypeName(curTableName).getColumn();        		 
+	    	}
+	    	else if(configWrapper.getTable(curTableName) != null){
+			 columnsForTable = configWrapper.getTable(curTableName).getColumn();
+			 configWrapper.getTable(curTableName).setTypeName(curTableName);//keep configWrapper consistent with Type info
+	    	}
+	    	else{
+	    		treatAllPKs = true;//can not find table/type, need to consider all columns as PKs
+	    	}
+	    	
+	    	if(columnsForTable != null){
+	            for(int ii=0; ii<columnsForTable.size(); ii++){
+	            	Column curCol = (Column)columnsForTable.get(ii);
+	            	
+	            	if(curCol.isPrimaryKey() || curCol.getColumnName().equalsIgnoreCase("ID")){//need to compare col name
+	            		//with ID as that is the one from dbms metadata or resul set shape metadata
+	            		//but when putting in map, need to put property and if not present then column
+	    	            Collection pks = (Collection) tableToPrimaryKeysMap.get(curTableName);
+	    	            if(pks == null){
+	    	            	pks = new HashSet();
+	    	            }
+	
+	    	            if(curCol.getPropertyName() != null){
+	    	            	pks.add(curCol.getPropertyName());
+	    	            }
+	    	            else{
+	        	            pks.add(curCol.getColumnName());
+	        	            curCol.setPropertyName(curCol.getColumnName());//make config consistent
+	        	            if(!((Collection)tableToPropertyMap.get(curTableName)).contains(curCol.getColumnName())){
+	        	            	((Collection)tableToPropertyMap.get(curTableName)).add(curCol.getColumnName());
+	        	            }
+	    	            }
+	    	            tableToPrimaryKeysMap.put(curTableName, pks);	        	            		
+	            	}
+	            }        		
+	    	}
+	    	else{
+	    		treatAllPKs = true;//table present in cfg , but no cols
+	    	}
+	    	
+	    	if(treatAllPKs){
+	    		tableToPrimaryKeysMap.put(curTableName, null);//case when all columns are considered PKs
+	    	}
+	    }
+    }
+    
+    private Converter loadConverter(String converterName, Type type) {
+        if (converterName != null) {
+
+            try {
+                Class converterClazz = Class.forName(converterName, true, 
+                        Thread.currentThread().getContextClassLoader());
+                if (null != converterClazz) {
+                    return (Converter) converterClazz.newInstance();
+                }
+
+                converterClazz = Class.forName(converterName);
+                if (converterClazz != null) {
+                    return (Converter) converterClazz.newInstance();
+                }
+            } catch (ClassNotFoundException ex) {
+                throw new RuntimeException(ex);
+            } catch (IllegalAccessException ex) {
+                throw new RuntimeException(ex);
+            } catch (InstantiationException ex) {
+                throw new RuntimeException(ex);
+            }
+        }
+        if (SDODataTypes.BYTES.getName().equals(type.getName()) && SDODataTypes.BYTES.getURI().equals(type.getURI())) {
+            return new DefaultConverter();
+        } else {
+        	return null;
+        }
+    }
+
+    public String getColumnPropertyName(int i) {
+        return (String) propertyNames.get(i - 1);
+    }
+
+    public String getDatabaseColumnName(int i) {
+        return resultSetShape.getColumnName(i);
+    }
+
+    public String getTableName(String columnName) {
+        return (String) typeNames.get(propertyNames.indexOf(columnName));
+    }
+
+    public int getTableSize(String tableName) {
+        return ((Collection) tableToPropertyMap.get(tableName)).size();
+    }
+
+    public Type getDataType(String columnName) {
+        return resultSetShape.getColumnType(propertyNames.indexOf(columnName));
+    }
+
+    public String getTablePropertyName(int i) {
+        return (String) typeNames.get(i - 1);
+    }
+
+    public Collection getAllTablePropertyNames() {
+        return tableToPropertyMap.keySet();
+    }
+
+    public HashSet getAllPKsForTable(String tableName){
+    	if(tableToPrimaryKeysMap.containsKey(tableName))
+    		return (HashSet)tableToPrimaryKeysMap.get(tableName);
+    	else{
+    		HashSet tmpHashSet = new HashSet();
+    		tmpHashSet.add("");//case when there were cols in cfg but could not find any PK in it and no ID column in cfg/result set
+    		return tmpHashSet;
+    	}
+    		
+    }
+    
+    public String toString() {
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (Table Names: ");
+        Iterator i = typeNames.iterator();
+        while (i.hasNext()) {
+            String tableName = (String) i.next();
+            result.append(' ');
+            result.append(tableName);
+            result.append(',');
+        }
+
+        result.append(" columnNames: ");
+
+        i = propertyNames.iterator();
+        while (i.hasNext()) {
+            String columnName = (String) i.next();
+            result.append(' ');
+            result.append(columnName);
+            result.append(',');
+        }
+
+        result.append(" mappingModel: ");
+        result.append(this.configWrapper.getConfig());
+
+        result.append(" resultSet: ");
+        result.append(resultSet);
+
+        result.append(" resultSetSize: ");
+        result.append(resultSetShape.getColumnCount());
+        result.append(')');
+        return result.toString();
+
+    }
+
+    /**
+     * @return
+     */
+    public int getNumberOfTables() {
+        return tableToPropertyMap.keySet().size();
+    }
+
+    /**
+     * Return whether the column at the given position is part of a primary key.
+     * If we don't have this information, we assume every column is a primary
+     * key. This results in uniqueness checks using all columns in a table.
+     * 
+     * @param i
+     * @return
+     */
+    public boolean isPKColumn(int i) {
+
+        Table t = configWrapper.getTableByTypeName(getTablePropertyName(i));
+        if (t == null) {
+            return true;
+        }
+
+        // If no Columns have been defined, consider every column to be part of
+        // the PK
+        if (t.getColumn().isEmpty()) {
+            return true;
+        }
+
+        Column c = configWrapper.getColumn(t, getDatabaseColumnName(i));
+
+        if (c == null) {
+            return false;
+        }
+
+        if (c.isPrimaryKey()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param i
+     * @return Type
+     */
+    public Type getDataType(int i) {
+        return resultSetShape.getColumnType(i);
+    }
+
+    /**
+     * @param tableName
+     * @return Collection
+     */
+    public Collection getPropertyNames(String tableName) {
+        return (Collection) tableToPropertyMap.get(tableName);
+    }
+
+    public ResultSet getResultSet() {
+        return this.resultSet;
+    }
+
+    public int getResultSetSize() {
+        return resultSetShape.getColumnCount();
+    }
+
+    public boolean isRecursive() {
+        return configWrapper.hasRecursiveRelationships();
+    }
+    
+    public Set getRecursiveTypeNames() {
+    	return configWrapper.getRecursiveTypeNames();
+    }
+
+    public Object convert(int i, Object data) {
+    	return (converters[i - 1] == null) ? data : converters[i - 1].getPropertyValue(data);
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
new file mode 100644
index 0000000000..fa17ebb098
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
@@ -0,0 +1,180 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.graphbuilder.impl;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+
+import commonj.sdo.DataObject;
+
+/**
+ *
+ * A ResultSetProcessor is used to transform the data in a ResultSet into a set of inter-related EDataObjects.
+ */
+public class ResultSetProcessor {
+    private static final Logger logger = Logger.getLogger(ResultSetProcessor.class);
+
+    private TableRegistry registry;
+
+    private GraphBuilderMetadata metadata;
+
+    private final DataObjectMaker doMaker;
+    
+    private final RowObjects tableObjects;
+
+    public ResultSetProcessor(DataObject g, GraphBuilderMetadata gbmd) {
+
+        this.metadata = gbmd;
+        if (metadata.getRelationships().size() == 0) {
+            registry = new SingleTableRegistry();
+        } else {
+            registry = new MultiTableRegistry();
+        }
+
+        doMaker = new DataObjectMaker(g);
+        
+        tableObjects = new RowObjects(metadata, registry);
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(metadata);
+        }
+
+    }
+
+    /**
+     * Process the ResultSet. For each row in the ResultSet, a
+     *
+     * @link ResultSetRow object will be created to represent the row as a set of EDataObjects. Then,
+     * the relevant relationships will be constructed
+     *       between each object in the
+     * @link ResultSetRow.
+     *
+     * @param start
+     * @param end
+     */
+    public void processResults(int start, int end) throws SQLException {
+
+        Iterator i = metadata.getResultMetadata().iterator();
+        while (i.hasNext()) {
+            ResultMetadata resultMetadata = (ResultMetadata) i.next();
+            ResultSet results = resultMetadata.getResultSet();
+
+            processResultSet(results, resultMetadata, start, end);
+
+            // TODO These statements HAVE to be closed or we will have major problems
+            // results.getStatement().close();
+            results.close();
+        }
+    }
+
+    private void processResultSet(ResultSet rs, ResultMetadata rsMetadata, int start, int end) throws SQLException {
+        ResultSetRow rsr = new ResultSetRow(rsMetadata);
+        if (rs.getType() == ResultSet.TYPE_FORWARD_ONLY) {
+            while (rs.next() && start < end) {
+            	rsr.processRow(rs);
+                int rootRowsCreated = addRowToGraph(rsr, rsMetadata);
+                start += rootRowsCreated;
+            }
+        } else {
+        	int position = start;
+            while (rs.absolute(position) && start < end) {
+            	rsr.processRow(rs);
+            	int rootRowsCreated = addRowToGraph(rsr, rsMetadata);
+                start += rootRowsCreated;
+                ++position;
+            }
+        }
+    }
+
+    /**
+     * @param row
+     * @param resultMetadata
+     * @return the number of root rows created
+     */
+    private int addRowToGraph(ResultSetRow row, ResultMetadata resultMetadata) throws SQLException {
+    	int rootRowsCreated = 0;
+    	int objectsCreated = 0;
+    	boolean recursive = row.isRecursive();
+    	Set rootTableNames = metadata.getConfigWrapper().getRootTableNames();
+        tableObjects.clear();
+    	Iterator tables = row.getAllTableData().iterator();
+        while (tables.hasNext()) {
+            TableData rawDataFromRow = (TableData) tables.next();
+
+            if (!rawDataFromRow.hasValidPrimaryKey() ||
+            		(rawDataFromRow.hasNullPrimaryKey() && !rawDataFromRow.isTableEmpty())) {//some PK null , but other data present
+            	//continue; - need to throw exception as anyway the result will give a wrong impression
+            	//when any one table in result set misses PK column or has null value in PK column
+            	throw new RuntimeException("Table "+rawDataFromRow.getTableName()+" in query does not include Primary Key "+
+            			"column or has null value in it, can not proceed!");
+            }
+
+            String tableName = rawDataFromRow.getTableName();
+            DataObject tableObject = registry.get(tableName, rawDataFromRow.getPrimaryKeyValues());
+            boolean newlyCreated = (tableObject == null);
+            // check whether row is a new root row
+            if (newlyCreated) {
+            	objectsCreated++;
+            	// increment root row count
+            	// in case of recursive table, assuming that first table occurrence is the root
+                if (rootTableNames.contains(tableName) && rawDataFromRow.getIndex() == 0) rootRowsCreated++;
+                // get whole table data 
+                // (only for non-recursive statements; recursive statements already have the whole table data)
+                if (!recursive) rawDataFromRow = row.processRowForTable(tableName);
+            	// create data object
+            	tableObject = doMaker.createAndAddDataObject(rawDataFromRow, resultMetadata);
+                if (this.logger.isDebugEnabled()) {
+                    this.logger.debug("Putting table " + tableName + " with PK "
+                            + rawDataFromRow.getPrimaryKeyValues() + " into registry");
+                }
+
+                registry.put(tableName, rawDataFromRow.getPrimaryKeyValues(), tableObject);
+            }
+            else{
+                if (this.logger.isDebugEnabled()) {
+                    this.logger.debug("Not Null tableObject");
+                }
+            }
+
+            if(tableObject != null){
+            	if (this.logger.isDebugEnabled()) {
+                    this.logger.debug("Do not allow any Null tableObject in tableObjects");
+                }
+            	tableObjects.put(tableName, tableObject, newlyCreated);
+            }
+        }
+        
+        if (objectsCreated == 0) {
+            // duplicated row
+        	if (this.logger.isDebugEnabled()) {
+        		this.logger.debug("Found duplicated row");
+        	}
+        } else {
+        	tableObjects.processRelationships();
+        }
+        
+        return rootRowsCreated;
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
new file mode 100644
index 0000000000..70e0961b09
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
@@ -0,0 +1,390 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.graphbuilder.impl;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+
+/**
+ * 
+ * A ResultSetRow is used to transform a row of a ResultSet into a set of EDataObjects.
+ */
+public class ResultSetRow {
+    private static final Logger logger = Logger.getLogger(ResultSetRow.class);
+
+    private final ResultMetadata metadata;
+    private final boolean recursive;
+    private final int resultSetSize;
+    private Collection allTableNames;
+    private Set recursiveTablePropertyNames;
+    private Set tablesWithNoPK = new HashSet();
+    private String[] tablePropertyNames;
+    private String[] columnPropertyNames;
+    private boolean[] isPKColumn;
+    private int[] indexesForPKs;
+    private Map indexesByTablePropertyName = new HashMap();
+    private Map tableMap = new HashMap();
+    private List allTableData = new ArrayList();
+    private ResultSet currentResultSet;
+
+    /**
+     * Method ResultSetRow.
+     * 
+     * @param m
+     *            the result metadata
+     */
+    public ResultSetRow(ResultMetadata m) throws SQLException {
+        this.metadata = m;
+        this.recursiveTablePropertyNames = m.getRecursiveTypeNames();
+        this.recursive = (recursiveTablePropertyNames.size() > 0);
+        this.resultSetSize = m.getResultSetSize();
+        cacheMetadata();
+        getAllTableNamesForRS();
+        getTablesWithNoPK();
+    }
+    
+    /**
+     * Processes a single row in the ResultSet.
+     * 
+     * @param rs
+     *            A ResultSet positioned on the desired row
+     */
+    public final void processRow(ResultSet rs)  throws SQLException {
+    	// clear previous data
+    	for (Iterator itTableData = allTableData.iterator(); itTableData.hasNext(); ) {
+    		TableData tableData = (TableData) itTableData.next();
+    		tableData.clear();
+    	}
+        allTableData = new ArrayList();
+        // set current resultSet
+        currentResultSet = rs;
+        // process row
+        if (recursive) {
+            processRecursiveRow();
+        } else {
+        	processNonRecursiveRow();
+        }
+    }
+    
+    public final TableData processRowForTable(String tablePropertyName) throws SQLException {
+        int[] indexes = (int[]) indexesByTablePropertyName.get(tablePropertyName);
+		TableData table = getRawData(tablePropertyName);
+        int count = indexes.length;
+        for (int j = 0; j < count; j++) {
+        	int i = indexes[j];
+        	if (!isPKColumn[i]) {
+        		// skipping primary key columns since they've already been processed by processRow()
+	        	Object data = getObject(currentResultSet, i);
+	            if (this.logger.isDebugEnabled()) {
+	                this.logger.debug("Adding column: " + columnPropertyNames[i] + "\tValue: " 
+	                        + data + "\tTable: "
+	                        + tablePropertyNames[i]);
+	            }
+	            table.addData(columnPropertyNames[i], false, data);
+        	}
+		}
+        return table;
+    }
+
+    private void processNonRecursiveRow() throws SQLException {
+        // parse primary keys only
+        // the rest will be parsed as needed
+        int count = indexesForPKs.length;
+        for (int j = 0; j < count; j++) {
+        	int i = indexesForPKs[j];
+        	Object data = getObject(currentResultSet, i);
+        	if (data == null) {
+        		// primary key is null, check other columns
+        		String tablePropertyName = tablePropertyNames[i];
+        		// if table data already exists then this has already been done
+        		if (!tableMap.containsKey(tablePropertyName)) {
+        			TableData table = getRawData(tablePropertyName);
+        			processRowForTable(tablePropertyName);
+        			// add table data only if not empty
+        			if (!table.isTableEmpty()) {
+        	            table.addData(columnPropertyNames[i], true, data);
+        				allTableData.add(table);
+        			}
+        		}
+        	} else {
+        		// add table data
+				TableData table = getRawData(tablePropertyNames[i]);
+				if (!allTableData.contains(table)) allTableData.add(table);
+	            if (this.logger.isDebugEnabled()) {
+	                this.logger.debug("Adding column: " + columnPropertyNames[i] + "\tValue: " 
+	                        + data + "\tTable: "
+	                        + tablePropertyNames[i]);
+	            }
+	            table.addData(columnPropertyNames[i], true, data);
+        	}
+		}
+        checkResultSetMissesPK();
+        }
+
+    //get all table names involved in current result set
+    //can not use metadata.getAllTablePropertyNames()
+    //as it gives table names for all tables from Config
+    private void getAllTableNamesForRS(){
+    	allTableNames = new HashSet(resultSetSize);
+    	for (int i = 1; i <= resultSetSize; i++) {
+    		allTableNames.add(tablePropertyNames[i]);
+    	}
+    }
+    
+    private void cacheMetadata() {
+    	tablePropertyNames = new String[resultSetSize + 1];
+    	columnPropertyNames = new String[resultSetSize + 1];
+    	isPKColumn = new boolean[resultSetSize + 1];
+    	String tablePropertyName = null;
+    	boolean isPK;
+    	List pkColumnList = new ArrayList();
+    	// loop thru indexes
+        for (int i = 1; i <= resultSetSize; i++) {
+        	columnPropertyNames[i] = metadata.getColumnPropertyName(i);
+        	tablePropertyName = metadata.getTablePropertyName(i);
+        	tablePropertyNames[i] = tablePropertyName;
+        	List indexes = (List) indexesByTablePropertyName.get(tablePropertyName);
+        	if (indexes == null) {
+        		indexes = new ArrayList();
+        		indexesByTablePropertyName.put(tablePropertyName, indexes);
+        	}
+        	indexes.add(new Integer(i));
+        	isPK = metadata.isPKColumn(i);
+        	isPKColumn[i] = isPK;
+        	if (isPK) {
+        		pkColumnList.add(new Integer(i));
+        	}
+        }
+        // reorganize indexes by table property name
+        for (Iterator itTablePropertyNames = indexesByTablePropertyName.keySet().iterator(); itTablePropertyNames.hasNext(); ) {
+        	tablePropertyName = (String) itTablePropertyNames.next();
+        	List indexes = (List) indexesByTablePropertyName.get(tablePropertyName);
+        	int count = indexes.size();
+        	int[] indexArray = new int[count];
+        	for (int i = 0; i < count; i++) {
+        		indexArray[i] = ((Integer) indexes.get(i)).intValue();
+        	}
+        	indexesByTablePropertyName.put(tablePropertyName, indexArray);
+        }
+        // reorganize indexes for PKs
+        int count = pkColumnList.size();
+        indexesForPKs = new int[count];
+        for (int i = 0; i < count; i++) {
+        	indexesForPKs[i] = ((Integer) pkColumnList.get(i)).intValue();
+        }
+    }
+    	
+    private void getTablesWithNoPK(){
+        //case when result set omits PK column, take care of compound PKs too
+        boolean tableRSHasPK;
+        Iterator itr = allTableNames.iterator();
+        while(itr.hasNext()){
+        	tableRSHasPK = false;
+        	String currentTableName = (String)itr.next();
+        	HashSet pks = metadata.getAllPKsForTable(currentTableName);
+        	HashSet pksInRS = new HashSet();
+        	for(int j=1; j<=resultSetSize; j++){
+            	if(currentTableName.equals(tablePropertyNames[j]) &&
+            			isPKColumn[j] ){
+            		pksInRS.add(columnPropertyNames[j]);
+            	}
+            }
+        	
+        	//if pks null, means its classic case when all cols should be PKs
+        	if(pks == null){
+        		tableRSHasPK = true;
+        	}        	
+        	//case when there were cols in cfg but could not find any PK in it and no ID column in cfg 
+        	else if(pks != null && pks.size()==1 && pks.contains("")){
+        		tableRSHasPK = false;        		
+        	}        	
+        	else if(pks != null && pksInRS.size() == pks.size()){        		
+        		Iterator itr1 = pks.iterator();
+        		int indx=0;
+        		while(itr1.hasNext()){
+        			if(!pksInRS.contains((String)itr1.next())){
+        				indx++;			
+        			}
+        		}
+        		
+	        	if(indx == 0){
+	        		if (this.logger.isDebugEnabled()) {
+	        			this.logger.debug("has PK TRUE - matched");	
+	        		}	        		
+	        		tableRSHasPK = true;	
+	        	}else{
+	        		if (this.logger.isDebugEnabled()) {
+	        			this.logger.debug("has PK FALSE- mismatched");	
+	        		}	        		
+	        		tableRSHasPK = false;
+	        	}
+        	}
+        	else{
+        		if (this.logger.isDebugEnabled()) {
+        			this.logger.debug("has PK FALSE - rest all cases");	
+        		}
+        	}        	
+        	
+        	if (!tableRSHasPK) tablesWithNoPK.add(currentTableName);
+
+    		if (this.logger.isDebugEnabled()) {
+            	this.logger.debug("table "+currentTableName+" hasValidPK "+tableRSHasPK);
+    		}
+        }
+    }
+
+    private void checkResultSetMissesPK(){
+    	//Default is TRUE(from TableData), so consider only FALSE case
+        Iterator itr = tablesWithNoPK.iterator();
+        while(itr.hasNext()){
+        	String currentTableName = (String)itr.next();
+           	TableData table = getRawData(currentTableName);
+           	table.setValidPrimaryKey(false);
+			allTableData.add(table);
+        }
+    }
+    
+    private void processRecursiveRow() throws SQLException {
+        int i = 1;
+        // create map to keep track of recursive indexes
+        // each recursive table contains a 0-based index to keep track of the sequence
+        Map recursiveIndexes = new HashMap();
+        for (Iterator itTablePropertyNames = recursiveTablePropertyNames.iterator(); itTablePropertyNames.hasNext(); ) {
+        	recursiveIndexes.put(itTablePropertyNames.next(), new Integer(-1));
+        }
+        
+        // loop thru result set columns
+        // assuming that the columns of each recursive table are grouped together (metadata do not allow for further granularity)
+        while (i <= resultSetSize) {
+        	TableData table;
+        	String tablePropertyName = tablePropertyNames[i];
+        	if (recursiveTablePropertyNames.contains(tablePropertyName)) {
+        		// increment current recursive index for table
+        		int recursiveIndex = ((Integer) recursiveIndexes.get(tablePropertyName)).intValue() + 1;
+        		recursiveIndexes.put(tablePropertyName, new Integer(recursiveIndex));
+        		// get table data
+                table = getRecursiveRawData(tablePropertyName, recursiveIndex);
+        	} else {
+                table = getRawData(tablePropertyNames[i]);
+        	}
+ 
+            while ((i <= resultSetSize) && (isPKColumn[i])) {
+                Object data = getObject(currentResultSet, i);
+                if (this.logger.isDebugEnabled()) {
+                    this.logger.debug("Adding column: " + columnPropertyNames[i]
+                            + "\tValue: " + data + "\tTable: "
+                            + tablePropertyNames[i]);
+                }
+                table.addData(columnPropertyNames[i], true, data);
+                i++;
+            }
+
+            while ((i <= resultSetSize) && (!isPKColumn[i])) {
+                Object data = getObject(currentResultSet, i);
+                if (this.logger.isDebugEnabled()) {
+                    this.logger.debug("Adding column: " + columnPropertyNames[i] 
+                            + "\tValue: " + data + "\tTable: "
+                            + tablePropertyNames[i]);
+                }
+                table.addData(columnPropertyNames[i], false, data);
+                i++;
+            }
+            
+            // skip table if empty
+            if (table.isTableEmpty()) {
+            	table.clear();
+            } else {
+            	this.allTableData.add(table);
+            }
+
+        }
+        
+        checkResultSetMissesPK();        
+    }
+
+    /**
+     * @param rs
+     * @param metadata
+     * @param i
+     * @return
+     */
+    private Object getObject(ResultSet rs, int i) throws SQLException {
+
+        Object data = rs.getObject(i);
+
+        if (rs.wasNull()) {
+            return null;
+        } 
+            
+        return metadata.convert(i, data);
+        
+    }
+
+    /**
+     * Returns a HashMap that holds data for the specified table If the HashMap 
+     * doesn't exist, it will be created. This is used internally to build
+     * the ResultSetRow, whereas getTable is used externally to retrieve existing table data.
+     * 
+     * @param tableName
+     *            The name of the table
+     * @return HashMap
+     */
+    private TableData getRawData(String tableName) {
+
+        TableData table = (TableData) tableMap.get(tableName);
+
+        if (table == null) {
+            table = new TableData(tableName);
+            tableMap.put(tableName, table);
+        }
+
+        return table;
+    }
+    
+    private TableData getRecursiveRawData(String tableName, int recursiveIndex) {
+    	String key = tableName + ":" + recursiveIndex;
+        TableData table = (TableData) tableMap.get(key);
+
+        if (table == null) {
+            table = new TableData(tableName, recursiveIndex);
+            tableMap.put(key, table);
+        }
+
+        return table;
+    }
+
+    public List getAllTableData() {
+        return this.allTableData;
+    }
+    
+    public boolean isRecursive() {
+    	return recursive;
+    }
+    
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
new file mode 100644
index 0000000000..b41b7379c8
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
@@ -0,0 +1,205 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.graphbuilder.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.config.KeyPair;
+import org.apache.tuscany.das.rdb.config.Relationship;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+
+public class RowObjects {
+    private static final Logger logger = Logger.getLogger(RowObjects.class);
+
+    private Map objectsByTableName;
+
+    private List tableObjects;
+    
+    private Set newTableObjectNames;
+
+    private Map tableTypeNames;
+    
+    private Map relationshipMap;
+
+    private final GraphBuilderMetadata metadata;
+
+    private final TableRegistry registry;
+    
+    private final MappingWrapper configWrapper;
+    
+    private final boolean hasRecursiveRelationships;
+
+    public RowObjects(GraphBuilderMetadata metadata, TableRegistry registry) {
+        objectsByTableName = new HashMap();
+        tableObjects = new ArrayList();
+        newTableObjectNames = new HashSet();
+        tableTypeNames = new HashMap();
+        this.metadata = metadata;
+        this.registry = registry;
+        this.configWrapper = metadata.getConfigWrapper();
+        this.hasRecursiveRelationships = configWrapper.hasRecursiveRelationships();
+        if (!hasRecursiveRelationships) buildRelationshipMap();
+    }
+    
+    private void buildRelationshipMap() {
+    	relationshipMap = new HashMap();
+        Iterator i = metadata.getRelationships().iterator();
+        while (i.hasNext()) {
+            Relationship r = (Relationship) i.next();
+            String parentTypeName = getTableTypeName(r.getPrimaryKeyTable());
+            String childTypeName = getTableTypeName(r.getForeignKeyTable());
+            // Add relationship under child type name
+            List relationships = (List) relationshipMap.get(childTypeName);
+            if (relationships == null) {
+            	relationships = new ArrayList();
+            	relationshipMap.put(childTypeName, relationships);
+            }
+            relationships.add(r);
+            // Add relationship under parent type name
+            relationships = (List) relationshipMap.get(parentTypeName);
+            if (relationships == null) {
+            	relationships = new ArrayList();
+            	relationshipMap.put(parentTypeName, relationships);
+            }
+            relationships.add(r);
+        }
+    }
+    
+    public void clear() {
+    	objectsByTableName.clear();
+    	tableObjects.clear();
+    	newTableObjectNames.clear();
+    }
+
+    public void put(String key, DataObject value, boolean newlyCreated) {
+        objectsByTableName.put(key, value);
+        tableObjects.add(value);
+        if (newlyCreated) newTableObjectNames.add(key);
+    }
+
+    public DataObject get(String tablePropertyName) {
+        return (DataObject) objectsByTableName.get(tablePropertyName);
+    }
+    
+    private String getTableTypeName(String tableName) {
+    	String typeName = (String) tableTypeNames.get(tableName);
+    	if (typeName == null) {
+    		typeName = configWrapper.getTableTypeName(tableName);
+    		tableTypeNames.put(tableName, typeName);
+    	}
+    	return typeName;
+    }
+
+    public void processRelationships() {
+        if (hasRecursiveRelationships) {
+            processRecursiveRelationships(configWrapper);
+            return;
+        }
+        
+        // the relationship needs to be set only if the parent or the child is newly created
+        // otherwise the relationship has already been set
+        Set relationshipsToSet = new HashSet();
+        Iterator itNewTableObjectNames = newTableObjectNames.iterator();
+        while (itNewTableObjectNames.hasNext()) {
+        	List relationships = (List) relationshipMap.get((String) itNewTableObjectNames.next());
+        	if (relationships != null) relationshipsToSet.addAll(relationships);
+        }
+        
+        Iterator i = relationshipsToSet.iterator();
+        while (i.hasNext()) {
+            Relationship r = (Relationship) i.next();
+
+            String parentTypeName = getTableTypeName(r.getPrimaryKeyTable());
+            String childTypeName = getTableTypeName(r.getForeignKeyTable());
+            DataObject parent = get(parentTypeName);
+            DataObject child = get(childTypeName);
+
+            if (this.logger.isDebugEnabled()) {
+                this.logger.debug("Parent table: " + parent);
+                this.logger.debug("Child table: " + child);
+            }
+
+            setOrAdd(parent, child, r.getName());
+        }
+    }
+
+    private void processRecursiveRelationships(MappingWrapper wrapper) {
+        Iterator i = tableObjects.iterator();
+        while (i.hasNext()) {
+            DataObject table = (DataObject) i.next();
+
+            Iterator relationships = wrapper.getRelationshipsByChildTable(table.getType().getName()).iterator();
+            while (relationships.hasNext()) {
+                Relationship r = (Relationship) relationships.next();
+
+                DataObject parentTable = findParentTable(table, r, wrapper);
+
+
+                setOrAdd(parentTable, table, r.getName());
+            }
+
+        }
+    }
+
+    private void setOrAdd(DataObject parent, DataObject child, String propertyName) {
+        if (parent == null || child == null) return;
+        Property p = parent.getType().getProperty(propertyName);
+        if (p.isMany()) {
+            parent.getList(p).add(child);
+        } else {
+            parent.set(p, child);
+        }
+    }
+
+    private DataObject findParentTable(DataObject childTable, Relationship r, MappingWrapper wrapper) {
+
+        List fkValue = new ArrayList();
+        Iterator keyPairs = r.getKeyPair().iterator();
+        while (keyPairs.hasNext()) {
+            KeyPair pair = (KeyPair) keyPairs.next();
+            String childProperty = wrapper.getColumnPropertyName(r.getPrimaryKeyTable(), pair.getForeignKeyColumn());
+
+            Property p = childTable.getType().getProperty(childProperty);
+            fkValue.add(childTable.get(p));
+        }
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Trying to find parent of " + r.getForeignKeyTable() + " with FK " + fkValue);
+        }
+
+        DataObject parentTable = registry.get(r.getPrimaryKeyTable(), fkValue);
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Parent table from registry: " + parentTable);
+        }
+
+        return parentTable;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
new file mode 100644
index 0000000000..54474fa4b3
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
@@ -0,0 +1,49 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.graphbuilder.impl;
+
+import java.util.List;
+
+import commonj.sdo.DataObject;
+
+public class SingleTableRegistry implements TableRegistry {
+
+
+    public SingleTableRegistry() {
+        // Empty Constructor
+    }
+
+    public DataObject get(String tableName, List primaryKey) {
+        return null;
+    }
+
+ 
+    public void put(String tableName, List primaryKey, DataObject value) {
+        // do nothing
+
+    }
+
+    public boolean contains(String name, List list) {
+        return false;
+    }
+
+    public void remove(String tableName, List primaryKey) {
+    	
+    }    
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
new file mode 100644
index 0000000000..a99f7ff12f
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
@@ -0,0 +1,123 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.graphbuilder.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
+public final class TableData {
+    private static final Logger logger = Logger.getLogger(TableData.class);
+
+    private Map columnData;
+
+    private List primaryKey;;
+
+    private final String name;
+    
+    private int index = 0;
+
+    private boolean hasValidPrimaryKey = true;
+
+    private boolean hasNullPrimaryKey = false;
+    
+    public TableData(String tableName) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Creating TableData for table " + tableName);
+        }
+
+        this.name = tableName;
+        this.columnData = new HashMap();
+        this.primaryKey = new ArrayList();
+    }
+    
+    public TableData(String tableName, int index) {
+    	this(tableName);
+    	this.index = index;
+    }
+    
+    public void clear() {
+    	columnData.clear();
+    	primaryKey.clear();
+    	hasValidPrimaryKey = true;
+    	hasNullPrimaryKey = false;
+    }
+
+    public void addData(String columnName, boolean isPrimaryKeyColumn, Object data) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Adding column " + columnName + " with value " + data);
+        }
+
+        if(data != null)
+        	columnData.put(columnName, data);
+        if (isPrimaryKeyColumn) {
+            if (data == null) {
+                if (this.logger.isDebugEnabled()) {
+                    this.logger.debug("Column " + columnName + " is a primary key column and is null");
+                }
+            	hasNullPrimaryKey = true;
+                //hasValidPrimaryKey = false; - if uncommented and JIRA-1464, RecursiveTests.testReadEngineParts() will fail
+            } else {
+            	primaryKey.add(data);
+            }
+        }
+    }
+
+    public Object getColumnData(String columnName) {
+        return columnData.get(columnName);
+    }
+
+    public String getTableName() {
+        return this.name;
+    }
+    
+    public int getIndex() {
+    	return index;
+    }
+
+    /**
+     * @return
+     */
+    public List getPrimaryKeyValues() {
+    	// the primary key is kept in the table registry
+    	// so return a copy to prevent deletion
+    	List primaryKeyCopy = new ArrayList(primaryKey.size());
+    	primaryKeyCopy.addAll(primaryKey);
+        return primaryKeyCopy;
+    }
+
+    public boolean hasValidPrimaryKey() {
+        return hasValidPrimaryKey;
+    }
+    
+    public void setValidPrimaryKey(boolean hasValidPK){
+    	this.hasValidPrimaryKey = hasValidPK;
+    }
+    
+    public boolean isTableEmpty(){
+    	return columnData.keySet().isEmpty();
+    }
+    
+    public boolean hasNullPrimaryKey(){
+    	return this.hasNullPrimaryKey;
+    }    
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java
new file mode 100644
index 0000000000..7a433fe240
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java
@@ -0,0 +1,47 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.graphbuilder.impl;
+
+import java.util.List;
+
+import commonj.sdo.DataObject;
+
+public interface TableRegistry {
+    /**
+     * Get the table with the specified name and primary key
+     * 
+     * @param tableName
+     * @param primaryKey
+     * @return DataObject
+     */
+    DataObject get(String tableName, List primaryKey);
+
+    /**
+     * Add the table with the specified name and primary key
+     * 
+     * @param tableName
+     * @param primaryKey
+     * @param value
+     */
+    void put(String tableName, List primaryKey, DataObject value);
+
+    boolean contains(String name, List list);
+    
+    void remove(String tableName, List primaryKey);
+}
+\ No newline at end of file
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
new file mode 100644
index 0000000000..35701f88d0
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
@@ -0,0 +1,137 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.graphbuilder.schema;
+
+import java.sql.Types;
+
+import org.apache.tuscany.sdo.SDOPackage;
+
+import commonj.sdo.Type;
+import commonj.sdo.helper.TypeHelper;
+
+/**
+ */
+public class ResultSetTypeMap {
+
+    public static final ResultSetTypeMap INSTANCE = new ResultSetTypeMap();
+
+    /**
+     * Constructor for ResultSetTypeMap.
+     */
+    protected ResultSetTypeMap() {
+        // Empty Constructor
+    }
+
+    /**
+     *
+     * @param type
+     * @param isNullable
+     * @return
+     */
+    public Type getEDataType(int type, boolean isNullable) {
+
+        TypeHelper helper = TypeHelper.INSTANCE;
+        SDOPackage.eINSTANCE.eClass();
+        switch (type) {
+
+            case Types.CHAR:
+            case Types.VARCHAR:
+            case Types.LONGVARCHAR:
+                return helper.getType("commonj.sdo", "String");
+
+            case Types.NUMERIC:
+            case Types.DECIMAL:
+                return helper.getType("commonj.sdo", "Decimal");
+
+            case Types.BIT:
+            case Types.BOOLEAN:
+                if (isNullable) {
+                    return helper.getType("commonj.sdo", "Boolean");
+                }
+                return helper.getType("commonj.sdo", "boolean");
+
+
+            case Types.TINYINT:
+            case Types.SMALLINT:
+            case Types.INTEGER:
+                if (isNullable) {
+                    return helper.getType("commonj.sdo", "IntObject");
+                }
+
+                return helper.getType("commonj.sdo", "Int");
+
+
+            case Types.BIGINT:
+                if (isNullable) {
+                    return helper.getType("commonj.sdo", "Long");
+                }
+                return helper.getType("commonj.sdo", "long");
+
+            case Types.REAL:
+                if (isNullable) {
+                    return helper.getType("commonj.sdo", "Float");
+                }
+                return helper.getType("commonj.sdo", "float");
+
+
+            case Types.FLOAT:
+            case Types.DOUBLE:
+                if (isNullable) {
+                    return helper.getType("commonj.sdo", "Double");
+                }
+                return helper.getType("commonj.sdo", "double");
+
+
+            case Types.BINARY:
+            case Types.VARBINARY:
+            case Types.LONGVARBINARY:
+                return helper.getType("commonj.sdo", "Bytes");
+
+            case Types.DATE:
+            case Types.TIME:
+            case Types.TIMESTAMP:
+                return helper.getType("commonj.sdo", "Date");
+
+            case Types.CLOB:
+                return helper.getType("commonj.sdo", "Object");
+
+            case Types.BLOB:
+                return helper.getType("commonj.sdo", "Bytes");
+
+            case Types.ARRAY:
+                return helper.getType("commonj.sdo", "Object");
+
+            case Types.DISTINCT:
+            case Types.STRUCT:
+            case Types.REF:
+            case Types.DATALINK:
+            case Types.JAVA_OBJECT:
+                return helper.getType("commonj.sdo", "Object");
+
+            default:
+                return helper.getType("commonj.sdo", "Object");
+        }
+
+    }
+
+    public Type getType(int columnType, boolean b) {
+        return getEDataType(columnType, b);
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
new file mode 100644
index 0000000000..b19aab85e8
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.sql.Connection;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+
+import commonj.sdo.DataObject;
+
+/**
+ * 
+ */
+public class ApplyChangesCommandImpl extends BaseCommandImpl {
+
+    private final Logger logger = Logger.getLogger(ApplyChangesCommandImpl.class);
+
+    private ChangeSummarizer summarizer = new ChangeSummarizer();
+
+    public ApplyChangesCommandImpl(MappingWrapper config, Connection connection) {
+        this.configWrapper = config;
+        if (connection != null) {
+            setConnection(connection, config.getConfig());
+        }
+
+    }
+
+    public void setConnection(ConnectionImpl connection) {
+        summarizer.setConnection(connection);
+    }
+
+    public void execute(DataObject root) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Executing ApplyChangesCmd");
+        }
+
+        if (summarizer.getConnection() == null) {
+            throw new RuntimeException("A connection must be provided");
+        }
+
+        if (!root.equals(root.getDataGraph().getRootObject())) {
+            throw new RuntimeException("'root' argument must be the root of the datagraph");
+        }
+
+        summarizer.setMapping(configWrapper);
+
+        Changes changes = summarizer.loadChanges(root);
+
+        boolean success = false;
+        try {
+            changes.execute();
+            success = true;
+        } finally {
+            if (success) {
+                summarizer.getConnection().cleanUp();
+            } else {
+                summarizer.getConnection().errorCleanUp();
+            }
+        }
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java
new file mode 100644
index 0000000000..e6611e0a7f
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java
@@ -0,0 +1,62 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+
+public abstract class BaseCommandImpl {
+    protected MappingWrapper configWrapper = new MappingWrapper();
+
+    //when no config in method params, useGetGeneratedKeys will default to True
+    //as DBMS metadata method is not reliable in all cases
+    public void setConnection(Connection connection) {
+        setConnection(new ConnectionImpl(connection));
+    }
+
+    public void setConnection(Connection connection, Config config) {
+        boolean managed = true;
+        String generatedKeysSupported = null;
+        
+        if (config != null){
+        	if(config.getConnectionInfo() != null) {
+        		managed = config.getConnectionInfo().isManagedtx();
+        	}
+        
+            generatedKeysSupported = config.getGeneratedKeysSupported();
+        	
+        	setConnection(connection, managed, generatedKeysSupported);
+        }
+        else{
+        	setConnection(connection);
+        }
+    }
+
+    public void setConnection(Connection connection, boolean manageTransaction, String generatedKeysSupported) {
+        ConnectionImpl c = new ConnectionImpl(connection);
+        c.setManageTransactions(manageTransaction);
+        c.setGeneratedKeysSupported(generatedKeysSupported);
+        setConnection(c);
+    }
+    
+    public abstract void setConnection(ConnectionImpl c);
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
new file mode 100644
index 0000000000..f8c669ed43
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
@@ -0,0 +1,189 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.config.Create;
+import org.apache.tuscany.das.rdb.config.Delete;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.config.Update;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
+import org.apache.tuscany.das.rdb.generator.impl.DeleteGenerator;
+import org.apache.tuscany.das.rdb.generator.impl.InsertGenerator;
+import org.apache.tuscany.das.rdb.generator.impl.UpdateGenerator;
+
+import commonj.sdo.DataObject;
+
+public class ChangeFactory {
+    private final Logger logger = Logger.getLogger(ChangeFactory.class);
+
+    private InsertCommandImpl createCommand;
+
+    private UpdateCommandImpl updateCommand;
+
+    private DeleteCommandImpl deleteCommand;
+
+    private final MappingWrapper mapping;
+
+    private final ConnectionImpl connection;
+
+    public ChangeFactory(MappingWrapper mapping, ConnectionImpl connection) {
+        this.mapping = mapping;
+        this.connection = connection;
+    }
+
+    public void setCreateCommand(InsertCommandImpl cmd) {
+        createCommand = cmd;
+    }
+
+    public void setUpdateCommand(UpdateCommandImpl cmd) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Setting Update Command to " + cmd);
+        }
+
+        updateCommand = cmd;
+    }
+
+    public void setDeleteCommand(DeleteCommandImpl cmd) {
+        deleteCommand = cmd;
+    }
+
+    ChangeOperation createUpdateOperation(DataObject changedObject,	String propagatedID) {
+		UpdateCommandImpl cmd = getUpdateCommand(changedObject);
+		if (cmd == null) {
+			return null;
+		} else {
+			return new UpdateOperation(cmd, changedObject, propagatedID);
+		}
+	}
+
+    ChangeOperation createUpdateOperation(DataObject changedObject) {
+        return createUpdateOperation(changedObject, null);
+    }
+
+    ChangeOperation createDeleteOperation(DataObject changedObject) {
+        return new DeleteOperation(getDeleteCommand(changedObject), changedObject);
+    }
+
+    ChangeOperation createInsertOperation(DataObject changedObject, String propagatedID) {
+        return new CreateOperation(getCreateCommand(changedObject), changedObject, propagatedID);
+    }
+
+    private InsertCommandImpl getCreateCommand(DataObject changedObject) {
+
+        if (createCommand == null) {
+            Table table = mapping.getTableByTypeName(changedObject.getType().getName());
+            if (table == null) {
+                if (changedObject.getType().getProperty("ID") != null) {
+                    // If the table is not defined in the config, assume it has a primary key of "ID"
+                    mapping.addPrimaryKey(changedObject.getType().getName() + ".ID");
+                    table = mapping.getTableByTypeName(changedObject.getType().getName());
+                } else {
+                    throw new RuntimeException("Table " + changedObject.getType().getName()
+                            + " was changed in the DataGraph but is not present in the Config");
+                }
+            }
+
+            Create create = table.getCreate();
+
+            if (create == null) {
+                createCommand = InsertGenerator.INSTANCE.getInsertCommand(mapping, changedObject, table);
+            } else {
+                createCommand = new InsertCommandImpl(create);
+            }
+            createCommand.setConnection(connection);
+            createCommand.configWrapper = mapping;
+        }
+        return createCommand;
+    }
+
+    private DeleteCommandImpl getDeleteCommand(DataObject changedObject) {
+
+        if (deleteCommand == null) {
+            Table table = mapping.getTableByTypeName(changedObject.getType().getName());
+            if (table == null) {
+                if (changedObject.getType().getProperty("ID") != null) {
+                    // If the table is not defined in the config, assume it has a primary key of "ID"
+                    mapping.addPrimaryKey(changedObject.getType().getName() + ".ID");
+                    table = mapping.getTableByTypeName(changedObject.getType().getName());
+                } else {
+                    throw new RuntimeException("Table " + changedObject.getType().getName()
+                            + " was changed in the DataGraph but is not present in the Config");
+                }
+            }
+
+            Delete delete = table.getDelete();
+
+            if (delete == null) {
+                deleteCommand = DeleteGenerator.INSTANCE.getDeleteCommand(mapping, table);//JIRA-952
+            } else {
+                deleteCommand = new DeleteCommandImpl(delete);
+            }
+            deleteCommand.setConnection(connection);
+            deleteCommand.configWrapper = mapping;
+        }
+        return deleteCommand;
+    }
+
+    private UpdateCommandImpl getUpdateCommand(DataObject changedObject) {
+
+        Table table = mapping.getTableByTypeName(changedObject.getType().getName());
+        if (table == null) {
+            if (changedObject.getType().getProperty("ID") != null) {
+                mapping.addPrimaryKey(changedObject.getType().getName() + ".ID");
+                table = mapping.getTableByTypeName(changedObject.getType().getName());
+            } else {
+                throw new RuntimeException("Table " + changedObject.getType().getName()
+                        + " was changed in the DataGraph but is not present in the Config");
+            }
+        }
+        Update update = table.getUpdate();
+        if (update == null) {
+            updateCommand = UpdateGenerator.INSTANCE.getUpdateCommand(mapping, changedObject, table);
+        } else {
+            TableWrapper t = new TableWrapper(table);
+            if (t.getCollisionColumn() != null) {
+                updateCommand = new OptimisticWriteCommandImpl(update);
+            } else {
+                updateCommand = new UpdateCommandImpl(update);
+            }
+        }
+
+        if (updateCommand != null) {
+	        updateCommand.setConnection(connection);
+	        updateCommand.configWrapper = mapping;
+        } else {
+        	if(this.logger.isDebugEnabled()) {
+        		this.logger.debug("Update command is NULL");
+        	}
+        }
+        
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Returning updateCommand: " + updateCommand);
+        }
+
+        return updateCommand;
+    }
+
+    public MappingWrapper getConfig() {
+        return this.mapping;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
new file mode 100644
index 0000000000..b222c18177
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.util.Iterator;
+
+import org.apache.log4j.Logger;
+
+import commonj.sdo.DataObject;
+
+/**
+ */
+public abstract class ChangeOperation {
+    protected DatabaseObject dObject;
+
+    protected String propagatedID;
+    
+    private final Logger logger = Logger.getLogger(ChangeOperation.class);
+
+    private final WriteCommandImpl writeCommand;
+
+    private boolean isInsert;
+    
+
+    public ChangeOperation(DeleteCommandImpl command) {
+        writeCommand = command;
+    }
+
+    public ChangeOperation(InsertCommandImpl command, DataObject changedObject) {
+        writeCommand = command;
+        dObject = new DatabaseObject(command.getMappingModel(), changedObject);
+        this.isInsert = true;
+    }
+
+    public ChangeOperation(UpdateCommandImpl command, DataObject changedObject) {
+        writeCommand = command;
+        dObject = new DatabaseObject(command.getMappingModel(), changedObject);
+    }
+
+    public void execute() {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Executing change operation");
+        }
+
+        Iterator i = writeCommand.getParameters().iterator();
+        while (i.hasNext()) {
+        	ParameterExtendedImpl parm = (ParameterExtendedImpl) i.next();
+            
+            if (this.logger.isDebugEnabled()) {
+                this.logger.debug("setting " + parm.getName() + " to " + dObject.get(parm.getName()));
+            }
+
+            parm.setValue(dObject.get(parm.getName()));
+        }
+
+        writeCommand.basicExecute();
+
+        if (isInsert && (propagatedID != null)) {
+            if (this.logger.isDebugEnabled()) {
+                this.logger.debug("Propagating key " + propagatedID);
+            }
+            int id = writeCommand.getGeneratedKey();
+            dObject.setPropagatedID(propagatedID, id);
+        }
+    }
+
+    public String getTableName() {
+        return dObject.getTableName();
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
new file mode 100644
index 0000000000..0f83dcd939
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
@@ -0,0 +1,268 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.config.Column;
+import org.apache.tuscany.das.rdb.config.Relationship;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.config.wrapper.RelationshipWrapper;
+import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
+import org.apache.tuscany.das.rdb.util.CollectionsUtil;
+import org.apache.tuscany.sdo.impl.ChangeSummaryImpl;
+
+import commonj.sdo.ChangeSummary;
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+import commonj.sdo.Type;
+
+public class ChangeSummarizer {
+
+    private final Logger logger = Logger.getLogger(ChangeSummarizer.class);
+
+    private Changes changes = new Changes();
+
+    private FactoryRegistry registry;
+
+    private MappingWrapper mapping = new MappingWrapper();
+
+    private ConnectionImpl connection;
+
+    private Map generatedKeys = new HashMap();
+
+    public ChangeSummarizer() {
+        // Empty Constructor
+    }
+
+    public Changes loadChanges(DataObject root) {
+        ChangeSummary changeSummary = root.getDataGraph().getChangeSummary();
+        if (changeSummary.isLogging()) {
+            ((ChangeSummaryImpl) changeSummary).summarize();
+        }
+
+        List changedObjects = changeSummary.getChangedDataObjects();
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("List of changed objects contains " + changedObjects.size() + " object(s)");
+        }
+
+        changes.setInsertOrder(mapping.getInsertOrder());
+        changes.setDeleteOrder(mapping.getDeleteOrder());
+
+        Iterator i = changedObjects.iterator();
+        while (i.hasNext()) {
+            DataObject o = (DataObject) i.next();
+
+            if (!(o.equals(root))) {
+                createChange(changeSummary, o);
+            }
+        }
+
+        return changes;
+    }
+
+    public void createChange(ChangeSummary changeSummary, DataObject changedObject) {
+
+        if (changeSummary.isCreated(changedObject)) {
+            if (this.logger.isDebugEnabled()) {
+                this.logger.debug("Change is a create");
+            }
+            if (!changeSummary.isDeleted(changedObject)) {
+                ChangeFactory factory = getRegistry().getFactory(changedObject.getType());
+                String propagatedID = (String) generatedKeys.get(changedObject.getType().getName());
+                changes.addInsert(factory.createInsertOperation(changedObject, propagatedID));
+            }
+        } else if (changeSummary.isDeleted(changedObject)) {
+            ChangeFactory factory = getRegistry().getFactory(changedObject.getType());
+            if (this.logger.isDebugEnabled()) {
+                this.logger.debug("Change is a delete");
+            }
+            changes.addDelete(factory.createDeleteOperation(changedObject));
+        } else {
+            if (this.logger.isDebugEnabled()) {
+                this.logger.debug("Change is a modify");
+            }
+            List attrList = changeSummary.getOldValues(changedObject);
+            if (hasAttributeChange(attrList)) {
+                ChangeFactory factory = getRegistry().getFactory(changedObject.getType());
+                if (this.logger.isDebugEnabled()) {
+                    this.logger.debug("Attribute Change for " + changedObject.getType().getName());
+                }
+                String propagatedID = (String) generatedKeys.get(changedObject.getType().getName());
+                ChangeOperation op = factory.createUpdateOperation(changedObject, propagatedID);
+                if (op != null) {
+                	changes.addUpdate(op);
+                } else {
+                	if(this.logger.isDebugEnabled()) {
+                		this.logger.debug("Update Operation is NULL");
+                	}
+                }
+
+            } else {
+                List values = changeSummary.getOldValues(changedObject);
+                Iterator i = values.iterator();
+                while (i.hasNext()) {
+                    ChangeSummary.Setting setting = (ChangeSummary.Setting) i.next();
+                    if (!setting.getProperty().getType().isDataType()) {
+                        if (this.logger.isDebugEnabled()) {
+                            this.logger.debug("Reference change for " + changedObject.getType().getName());
+                        }
+                        Property ref = setting.getProperty();
+                        if (this.logger.isDebugEnabled()) {
+                            this.logger.debug(ref.getName());
+                        }
+                        if (hasState(ref, changedObject)) {
+                            ChangeFactory factory = getRegistry().getFactory(changedObject.getType());
+                            ChangeOperation op = factory.createUpdateOperation(changedObject);
+                            if (op != null) {
+                            	changes.addUpdate(op);
+                            } else {
+                            	if(this.logger.isDebugEnabled()) {
+                            		this.logger.debug("Update Operation is NULL");
+                            	}                            	
+                            }
+
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+
+    private boolean hasState(Property ref, DataObject changedObject) {
+        if (ref.getOpposite().isMany()) {
+            return true;
+        } 
+
+        MappingWrapper mw = this.mapping;
+        if (mw.getConfig() == null) {
+            mw = registry.getFactory(changedObject.getType()).getConfig();
+        }
+        if (mw.getConfig() == null) {
+            return false;
+        }
+
+        Relationship rel = mw.getRelationshipByReference(ref);
+
+        if (!rel.isMany()) {
+            if (rel.isKeyRestricted()) {
+                throw new RuntimeException("Can not modify a one to one relationship that is key restricted");
+            }
+            // This is a one-one relationship
+            Table t = mapping.getTableByTypeName(changedObject.getType().getName());
+            TableWrapper tw = new TableWrapper(t);
+            RelationshipWrapper rw = new RelationshipWrapper(rel);
+            if ((rel.getForeignKeyTable().equals(t.getTableName())) 
+                    && (CollectionsUtil.disjoint(tw.getPrimaryKeyProperties(), rw.getForeignKeys()))) {
+                return true;
+            }
+
+        }
+
+        return false;
+    }
+
+    private boolean hasAttributeChange(List theChanges) {
+        Iterator i = theChanges.iterator();
+        while (i.hasNext()) {
+            ChangeSummary.Setting setting = (ChangeSummary.Setting) i.next();
+            if (setting.getProperty().getType().isDataType()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void addCreateCommand(Type type, Command cmd) {
+        ChangeFactory cf = getRegistry().getFactory(type);
+        cf.setCreateCommand((InsertCommandImpl) cmd);
+        ((CommandImpl) cmd).setConnection(connection);
+    }
+
+    public void addUpdateCommand(Type type, Command cmd) {
+        ChangeFactory cf = getRegistry().getFactory(type);
+        cf.setUpdateCommand((UpdateCommandImpl) cmd);
+        ((CommandImpl) cmd).setConnection(connection);
+    }
+
+    public void addDeleteCommand(Type type, Command cmd) {
+        ChangeFactory cf = getRegistry().getFactory(type);
+        cf.setDeleteCommand((DeleteCommandImpl) cmd);
+        ((CommandImpl) cmd).setConnection(connection);
+
+    }
+
+    private FactoryRegistry getRegistry() {
+        if (this.registry == null) {
+            this.registry = new FactoryRegistry(mapping, connection);
+        }
+        return this.registry;
+    }
+
+    public void setConnection(ConnectionImpl connection) {
+        this.connection = connection;
+    }
+
+    public void setMapping(MappingWrapper map) {
+        this.mapping = map;
+
+        if (mapping.getConfig() == null) {
+            return;
+        }
+
+        Iterator i = mapping.getConfig().getTable().iterator();
+        while (i.hasNext()) {
+            Table t = (Table) i.next();
+            Iterator columns = t.getColumn().iterator();
+            while (columns.hasNext()) {
+                Column c = (Column) columns.next();
+                if (c.isPrimaryKey() && c.isGenerated()) {
+                	//if SDO type, property is defined use it , else use dbms metadata
+                	//with this static DOs will work correct for generated keys
+                	if(t.getTypeName() != null && c.getPropertyName() != null) {
+                        if (this.logger.isDebugEnabled()) {
+                        	this.logger.debug("adding generated key " + t.getTypeName() + "." + c.getPropertyName());
+                        }
+
+                        generatedKeys.put(t.getTypeName(), c.getPropertyName());                		
+                	} else {
+                        if (this.logger.isDebugEnabled()) {
+                            this.logger.debug("adding generated key " + t.getTableName() + "." + c.getColumnName());
+                        }
+
+                        generatedKeys.put(t.getTableName(), c.getColumnName());                		
+                	}
+
+                }
+            }
+        }
+    }
+
+    public ConnectionImpl getConnection() {
+        return this.connection;
+    }
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
new file mode 100644
index 0000000000..45f0a55719
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
@@ -0,0 +1,82 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Manages a set of graph-change operations. This simple implementaiton can be 
+ * replaced with a version that provides R/I sorting
+ * 
+ */
+public class Changes {
+
+    private InsertList inserts = new InsertList();
+
+    private UpdateList updates = new UpdateList();
+
+    private DeleteList deletes = new DeleteList();
+
+    public void addInsert(ChangeOperation c) {
+        inserts.add(c);
+    }
+
+    public void addUpdate(ChangeOperation c) {
+        updates.add(c);
+    }
+
+    public void addDelete(ChangeOperation c) {
+        deletes.add(c);
+    }
+
+    /**
+     * Execute all my change
+     */
+    public void execute() {
+
+        Iterator i = deletes.getSortedList().iterator();
+        while (i.hasNext()) {
+            ChangeOperation c = (ChangeOperation) i.next();
+            c.execute();
+        }
+
+        i = inserts.getSortedList().iterator();
+        while (i.hasNext()) {
+            ChangeOperation c = (ChangeOperation) i.next();
+            c.execute();
+        }
+
+        i = updates.getSortedList().iterator();
+        while (i.hasNext()) {
+            ChangeOperation c = (ChangeOperation) i.next();
+            c.execute();
+        }
+
+    }
+
+    public void setInsertOrder(List insertOrder) {
+        inserts.setOrder(insertOrder);
+    }
+
+    public void setDeleteOrder(List deleteOrder) {
+        deletes.setOrder(deleteOrder);
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CollisionParameter.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CollisionParameter.java
new file mode 100644
index 0000000000..48ff2ab57a
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CollisionParameter.java
@@ -0,0 +1,31 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+public class CollisionParameter extends ParameterExtendedImpl {
+
+    private boolean isSet;
+
+    public void setValue(Object value) {
+        if (!isSet) {
+            this.value = value;
+            isSet = true;
+        }
+    }
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
new file mode 100644
index 0000000000..6b1a2ad179
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
@@ -0,0 +1,160 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.Command;
+
+import commonj.sdo.DataObject;
+
+public abstract class CommandImpl extends BaseCommandImpl implements Command {
+    
+    protected Statement statement;
+
+    protected ParametersExtendedImpl parameters = new ParametersExtendedImpl();
+
+    protected ResultSetShape resultSetShape;
+    
+    public CommandImpl(String sqlString) {
+        statement = new Statement(sqlString);
+    }
+
+    public CommandImpl(org.apache.tuscany.das.rdb.config.Command command) {
+        this(command.getSQL());
+        
+        if(command.getParameter() != null && command.getParameter().size() > 0) {
+    		Iterator itr = command.getParameter().iterator();
+    		int index = 1;
+    		while(itr.hasNext()){
+    			org.apache.tuscany.das.rdb.config.impl.ParameterImpl param = (org.apache.tuscany.das.rdb.config.impl.ParameterImpl)itr.next();
+    			if(param.getIndex() <= 0){
+    				param.setIndex(index);
+    				index++;
+    			}
+    			ParameterExtendedImpl paramExt = new ParameterExtendedImpl(param);
+    			addToParameters(paramExt);
+    		}
+    	}
+    }
+
+    private void addToParameters(ParameterExtendedImpl paramExt) {
+		this.parameters.getParameter().add(paramExt);
+		if(paramExt.getDirection().equals(ParameterExtendedImpl.IN)){
+			parameters.getInParameters().add(paramExt);
+		}
+		else{
+			parameters.getOutParameters().add(paramExt);
+		}
+    }
+    
+    public abstract void execute();
+
+    public abstract DataObject executeQuery();
+
+    public void setParameter(int index, Object value) {
+    	ParameterExtendedImpl param = parameters.getParameter(index);
+    	if(param != null){
+    		param.setValue(value);
+    		return;
+    	}
+    		
+    	param = new ParameterExtendedImpl();
+    	param.setIndex(index);
+    	param.setValue(value);
+    	param.setDirection(ParameterExtendedImpl.IN);
+    	parameters.getParameter().add(param);
+    	parameters.getInParameters().add(param);    	    		
+    }
+
+    public void addParameter(ParameterExtendedImpl param) {
+    	//eliminate/replace duplicate params, index is filled, so can check it for duplicate
+    	ParameterExtendedImpl paramExt = parameters.getParameter(param.getIndex());
+    	if(paramExt != null)
+    		paramExt = new ParameterExtendedImpl(param);
+    	
+    	paramExt = parameters.getParameter(param.getIndex(), param.getDirection());
+    	if(paramExt != null){
+    		paramExt = new ParameterExtendedImpl(param);
+    		return;
+    	}
+    	
+    	addToParameters(param);
+    }
+
+    public List getParameters() {
+    	return parameters.getParameter();
+    }
+
+    public Object getParameter(int index) {
+    	return parameters.getParameter(index).getValue();
+    }
+
+    public void setConnection(ConnectionImpl connection) {
+        statement.setConnection(connection);
+    }
+
+    protected ConnectionImpl getConnection() {
+        return statement.getConnection();
+    }
+
+    /*
+     * The default impl is to throw an exception. This is overridden by InsertCommandImpl
+     */
+    public int getGeneratedKey() {
+
+        throw new RuntimeException("This method is only valid for insert commands");
+    }
+
+    public void close() {
+        statement.close();
+    }
+
+    //default direction IN assumed
+    public void setParameter(String name, Object value) {
+    	ParameterExtendedImpl param = parameters.getParameter(name);
+    	if(param != null){
+			param.setValue(value);
+			return;
+    	}
+    		
+    	param = new ParameterExtendedImpl();
+    	param.setIndex(parameters.getParameter().size()+1);
+    	param.setName(name);
+    	param.setValue(value);
+    	param.setDirection(ParameterExtendedImpl.IN);
+    	parameters.getParameter().add(param);
+    	parameters.getInParameters().add(param);
+	}
+
+    //default direction IN assumed
+    public Object getParameter(String name) {
+		Iterator itr = this.parameters.getInParameters().iterator();
+		while(itr.hasNext()){
+			ParameterExtendedImpl param = ((ParameterExtendedImpl)itr.next());
+			
+			if(param.getName() != null && param.getName().equalsIgnoreCase(name)){				
+				return param.value;
+			}
+		}
+		return null;
+	}
+    
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
new file mode 100644
index 0000000000..5ee465027d
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
@@ -0,0 +1,154 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.apache.log4j.Logger;
+
+public class ConnectionImpl {
+
+    private final Logger logger = Logger.getLogger(ConnectionImpl.class);
+
+    private Connection connection;
+
+    private boolean managingTransaction = true;
+
+    private String generatedKeysSupported = null;
+    
+    public ConnectionImpl(Connection connection) {
+        this.connection = connection;
+
+        try {
+            if (connection.getAutoCommit()) {
+                throw new RuntimeException("AutoCommit must be off");
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    public Connection getJDBCConnection() {
+        return connection;
+    }
+
+    public String getGeneratedKeysSupported() {
+        return this.generatedKeysSupported;
+    }
+    
+    public void setGeneratedKeysSupported(String useGetGeneratedKeys){
+        this.generatedKeysSupported = useGetGeneratedKeys;
+    }    
+    
+    public boolean isGeneratedKeysSupported() {
+        try{
+            if(this.generatedKeysSupported == null){
+                DatabaseMetaData dbmsMetadata = this.connection.getMetaData();
+                boolean supportsGetGeneratedKeys = dbmsMetadata.supportsGetGeneratedKeys();
+                if(supportsGetGeneratedKeys){
+                    this.generatedKeysSupported = "true";
+                }
+                //currently DERBY partially supports this feature and thus returns FALSE,
+                //this hardcoding is needed as the partial support is enough for DAS
+                //we can remove this later, when DERBY change the behaviour of it's "supportsGetGeneratedKeys"
+                else if(dbmsMetadata.getDatabaseProductName().indexOf("Derby") > 0){                    
+                    this.generatedKeysSupported = "true";
+                }
+                else{
+                    this.generatedKeysSupported = "false";
+                }
+            }           
+        }catch(Exception e){//can be from supportsGetGeneratedKeys or due to absense of supportsGetGeneratedKeys
+            if (this.logger.isDebugEnabled()) {
+                this.logger.debug("exception setiing useGetGeneratedKeys false");
+            }
+            this.generatedKeysSupported = "false";
+        }
+        
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("returning useGetGeneratedKeys():"+ this.generatedKeysSupported);
+        }
+        return Boolean.valueOf(this.generatedKeysSupported).booleanValue();
+    }
+    
+    public void cleanUp() {
+        try {
+            if (managingTransaction) {
+                if (this.logger.isDebugEnabled()) {
+                    this.logger.debug("Committing Transaction");
+                }
+                connection.commit();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void errorCleanUp() {
+        try {
+            if (managingTransaction) {
+                if (this.logger.isDebugEnabled()) {
+                    this.logger.debug("Rolling back Transaction");
+                }
+                connection.rollback();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public PreparedStatement prepareStatement(String queryString, String[] returnKeys) throws SQLException {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Preparing Statement: " + queryString);
+            this.logger.debug("Boolean value for use gen key: " + this.generatedKeysSupported);
+        }
+
+        if (isGeneratedKeysSupported()) {
+            return connection.prepareStatement(queryString, Statement.RETURN_GENERATED_KEYS);
+        } else if (returnKeys.length > 0) {
+            return connection.prepareStatement(queryString, returnKeys);
+        }
+
+        return connection.prepareStatement(queryString);
+    }
+    
+    public PreparedStatement preparePagedStatement(String queryString) throws SQLException {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Preparing Statement: " + queryString);
+        }
+
+        return connection.prepareStatement(queryString, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
+    }
+
+    public void setManageTransactions(boolean manageTransactions) {
+        managingTransaction = manageTransactions;
+
+    }
+
+    public CallableStatement prepareCall(String queryString) throws SQLException {
+        return connection.prepareCall(queryString);
+    }
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
new file mode 100644
index 0000000000..0163f96686
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
@@ -0,0 +1,30 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import commonj.sdo.DataObject;
+
+public class CreateOperation extends ChangeOperation {
+
+    public CreateOperation(InsertCommandImpl command, DataObject changedObject, String id) {
+        super(command, changedObject);
+        this.propagatedID = id;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java
new file mode 100644
index 0000000000..ba80b3bcb5
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java
@@ -0,0 +1,50 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.io.InputStream;
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.DASFactory;
+import org.apache.tuscany.das.rdb.config.Config;
+
+public class DASFactoryImpl implements DASFactory {
+
+    public DAS createDAS(InputStream configStream) {
+        return new DASImpl(configStream);
+    }
+
+    public DAS createDAS(Config config) {
+        return new DASImpl(config);
+    }
+
+    public DAS createDAS(InputStream configStream, Connection connection) {
+        return new DASImpl(configStream, connection);
+    }
+
+    public DAS createDAS(Config config, Connection connection) {
+        return new DASImpl(config, connection);
+    }
+
+    public DAS createDAS(Connection connection) {
+        return new DASImpl(connection);
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
new file mode 100644
index 0000000000..e456d65ef1
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
@@ -0,0 +1,327 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.ConfigFactory;
+import org.apache.tuscany.das.rdb.config.ConnectionInfo;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.exception.DataSourceInitializationException;
+import org.apache.tuscany.das.rdb.util.ConfigUtil;
+
+import commonj.sdo.DataObject;
+
+/**
+ * An ConfiguredCommandFactory produces instances of Command and ApplyChangesCommand. This
+ * factory is initialized with a configuration that defines
+ * the commands it produces.
+ *
+ */
+public class DASImpl implements DAS {
+
+    private MappingWrapper configWrapper;
+
+    private Connection connection;
+
+    private Map commands = new HashMap();
+
+    public DASImpl(InputStream stream) {
+        this(ConfigUtil.loadConfig(stream));
+
+    }
+
+    public DASImpl(Config inConfig) {
+        Config cfg = inConfig;
+        if (cfg == null) {
+            cfg = ConfigFactory.INSTANCE.createConfig();
+        }
+        this.configWrapper = new MappingWrapper(cfg);
+
+        Iterator i = configWrapper.getConfig().getCommand().iterator();
+        while (i.hasNext()) {
+            org.apache.tuscany.das.rdb.config.Command commandConfig =
+                (org.apache.tuscany.das.rdb.config.Command) i.next();
+            String kind = commandConfig.getKind();
+            if (kind.equalsIgnoreCase("select")) {
+                commands.put(commandConfig.getName(), new ReadCommandImpl(commandConfig, configWrapper, commandConfig.getResultDescriptor()));
+            } else if (kind.equalsIgnoreCase("update")) {
+                commands.put(commandConfig.getName(), new UpdateCommandImpl(commandConfig));
+            } else if (kind.equalsIgnoreCase("insert")) {
+                commands.put(commandConfig.getName(), new InsertCommandImpl(commandConfig, new String[0]));
+            } else if (kind.equalsIgnoreCase("delete")) {
+                commands.put(commandConfig.getName(), new DeleteCommandImpl(commandConfig));
+            } else if (kind.equalsIgnoreCase("procedure")) {
+                commands.put(commandConfig.getName(), new SPCommandImpl(commandConfig.getSQL(), configWrapper, commandConfig.getParameter()));
+            } else {
+                throw new RuntimeException("Invalid kind of command: " + kind);
+            }
+
+        }
+
+    }
+
+    public DASImpl(Config inConfig, Connection inConnection) {
+        this(inConfig);
+        setConnection(inConnection);
+    }
+
+    public DASImpl(InputStream configStream, Connection inConnection) {
+        this(ConfigUtil.loadConfig(configStream), inConnection);
+    }
+
+    public DASImpl(Connection inConnection) {
+        this(ConfigFactory.INSTANCE.createConfig());
+        setConnection(inConnection);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.apache.tuscany.das.rdb.CommandGroup#getApplyChangesCommand()
+     */
+    public ApplyChangesCommandImpl getApplyChangesCommand() {
+        ApplyChangesCommandImpl cmd = new ApplyChangesCommandImpl(configWrapper, getConnection());
+        return cmd;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.apache.tuscany.das.rdb.CommandGroup#getCommand(java.lang.String)
+     */
+    public Command getCommand(String name) {
+        if (!commands.containsKey(name)) {
+            throw new RuntimeException("CommandGroup has no command named: " + name);
+        }
+        CommandImpl cmd = (CommandImpl) commands.get(name);
+        cmd.setConnection(getConnection(), configWrapper.getConfig());
+        return cmd;
+    }
+
+    public void setConnection(Connection connection) {
+        this.connection = connection;
+    }
+
+    public Connection getConnection() {
+        if (connection == null) {
+            initializeConnection();
+        }
+        return connection;
+    }
+
+    private void initializeConnection() {
+        Config config = configWrapper.getConfig();
+        if (config == null || config.getConnectionInfo() == null ||
+            (config.getConnectionInfo().getDataSource() == null &&
+            		(config.getConnectionInfo().getConnectionProperties() == null || config.getConnectionInfo().getConnectionProperties().getDatabaseURL() == null
+            		|| config.getConnectionInfo().getConnectionProperties().getDriverClass() == null)) ) {
+            throw new RuntimeException("No connection has been provided and no data source has been specified");
+        }
+
+        if(config.getConnectionInfo().getDataSource() != null &&
+        		(config.getConnectionInfo().getConnectionProperties() != null && config.getConnectionInfo().getConnectionProperties().getDatabaseURL() != null) ){
+            throw new RuntimeException("Use either dataSource or databaseURL. Can't use both !");
+        }
+
+        ConnectionInfo connectionInfo = configWrapper.getConfig().getConnectionInfo();
+        if(config.getConnectionInfo().getDataSource() != null){
+        	initializeDatasourceConnection(connectionInfo);
+        }else{
+        	initializeDriverManagerConnection(connectionInfo);
+        }
+
+    }
+
+    /**
+     * Initializes a DB connection on a managed environmet (e.g inside Tomcat)
+     */
+    private void initializeDatasourceConnection(ConnectionInfo connectionInfo){
+        Connection connection = null;
+
+        InitialContext ctx;
+        try {
+            ctx = new InitialContext();
+        } catch (NamingException e) {
+            throw new RuntimeException(e);
+        }
+        try {
+            DataSource ds = (DataSource) ctx.lookup(connectionInfo.getDataSource());
+            try {
+            	try {
+	            	if(connectionInfo.getConnectionProperties() != null &&
+	            	   connectionInfo.getConnectionProperties().getUserName() != null &&
+	            	   connectionInfo.getConnectionProperties().getPassword() != null ) {
+	            		connection = ds.getConnection(connectionInfo.getConnectionProperties().getUserName(), connectionInfo.getConnectionProperties().getPassword());
+	            	} else {
+	            		connection = ds.getConnection();
+	            	}
+            	}catch(Exception e) {
+            		connection = ds.getConnection();
+            	}
+
+                if (connection == null) {
+                    throw new RuntimeException("Could not obtain a Connection from DataSource");
+                }
+                connection.setAutoCommit(false);
+                setConnection(connection);
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+        } catch (NamingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Initialize a DB connection on a J2SE environment
+     * For more info, see http://java.sun.com/j2se/1.3/docs/guide/jdbc/getstart/drivermanager.html
+     */
+    private void initializeDriverManagerConnection(ConnectionInfo connectionInfo) {
+
+        Connection connection = null;
+
+        if (connectionInfo.getConnectionProperties() == null) {
+            throw new DataSourceInitializationException("No existing context and no connection properties");
+        }
+
+        if (connectionInfo.getConnectionProperties().getDriverClass() == null) {
+            throw new DataSourceInitializationException("No jdbc driver class specified!");
+        }
+
+        try {
+            //initialize driver and register it with DriverManager
+            Class.forName(connectionInfo.getConnectionProperties().getDriverClass());
+
+            //prepare to initialize connection
+            String databaseUrl = connectionInfo.getConnectionProperties().getDatabaseURL();
+            String userName = connectionInfo.getConnectionProperties().getUserName();
+            String userPassword = connectionInfo.getConnectionProperties().getPassword();
+            int loginTimeout = connectionInfo.getConnectionProperties().getLoginTimeout();
+
+            DriverManager.setLoginTimeout(loginTimeout);
+            if( (userName == null || userName.length() ==0) && (userPassword == null || userPassword.length()==0) ){
+                //no username or password suplied
+                connection = DriverManager.getConnection(databaseUrl);
+            }else{
+                connection = DriverManager.getConnection(databaseUrl, userName, userPassword);
+            }
+
+            if(connection == null){
+                throw new DataSourceInitializationException("Error initializing connection : null");
+            }
+
+            connection.setAutoCommit(false);
+            setConnection(connection);
+
+
+        }catch(ClassNotFoundException cnf){
+            throw new DataSourceInitializationException("JDBC Driver '" + connectionInfo.getConnectionProperties().getDriverClass() + "' not found", cnf);
+        }catch(SQLException sqle){
+            throw new DataSourceInitializationException(sqle.getMessage(), sqle);
+        }
+
+    }
+
+    public void releaseResources() {
+
+        if (managingConnections()) {
+            closeConnection();
+        }
+    }
+
+    private void closeConnection() {
+        if (connection != null) {
+            try {
+                connection.close();
+                connection = null;
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    /**
+     * If the config has connection properties then we are "managing" the connection via DataSource
+     */
+    private boolean managingConnections() {
+
+        if (configWrapper.getConfig().getConnectionInfo().getDataSource() == null) {
+            return false;
+        }
+
+        return true;
+
+    }
+
+    public Command createCommand(String sql) {
+        return baseCreateCommand(sql, this.configWrapper);
+    }
+
+    public Command createCommand(String sql, Config config) {
+        return baseCreateCommand(sql, new MappingWrapper(config));
+    }
+
+    private Command baseCreateCommand(String inSql, MappingWrapper config) {
+        CommandImpl returnCmd = null;
+        String sql = inSql.trim(); // Remove leading white space
+        char firstChar = Character.toUpperCase(sql.charAt(0));
+        switch (firstChar) {
+            case 'S':
+                returnCmd = new ReadCommandImpl(sql, config, null);
+                break;
+            case 'I':
+                returnCmd = new InsertCommandImpl(sql, new String[0]);
+                break;
+            case 'U':
+                returnCmd = new UpdateCommandImpl(sql);
+                break;
+            case 'D':
+                returnCmd = new DeleteCommandImpl(sql);
+                break;
+            case '{':
+                returnCmd = new SPCommandImpl(sql, config, Collections.EMPTY_LIST);
+                break;
+            default:
+                throw new RuntimeException("SQL => " + sql + " is not valid");
+        }
+
+        returnCmd.setConnection(getConnection(), config.getConfig());
+        return returnCmd;
+    }
+
+    public void applyChanges(DataObject root) {
+        getApplyChangesCommand().execute(root);
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
new file mode 100644
index 0000000000..18a6d8d193
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
@@ -0,0 +1,229 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.config.Column;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.KeyPair;
+import org.apache.tuscany.das.rdb.config.Relationship;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+
+/**
+ * DatabaseObject wraps DataObject. If a field is an FK field, it will return the value from the parent.
+ * 
+ * 
+ */
+public class DatabaseObject {
+
+    private final Logger logger = Logger.getLogger(DatabaseObject.class);
+
+    private final MappingWrapper mappingWrapper;
+
+    private final DataObject dataObject;
+
+    private Property parentReference;
+
+    private Map keyMappings = new HashMap();
+
+    public DatabaseObject(Config model, DataObject changedObject) {
+        this.mappingWrapper = new MappingWrapper(model);
+        this.dataObject = changedObject;
+        initialize();
+    }
+
+    // Initialize Key Mappings
+    private void initialize() {
+        if (mappingWrapper.getConfig() != null) {
+            List relationships = mappingWrapper.getConfig().getRelationship();
+            Iterator i = relationships.iterator();
+            while (i.hasNext()) {
+                Relationship r = (Relationship) i.next();
+                if (this.logger.isDebugEnabled()) {
+                    this.logger.debug("Initializing relationship: " + r.getName());
+                    this.logger.debug("r.getForeignKeyTable():"+r.getForeignKeyTable());
+                    this.logger.debug("getTypeName():"+getTypeName());
+                }
+                
+                Table fkTable = mappingWrapper.getTableByTypeName(getTypeName());
+                String fkTableName = null;
+                if(fkTable != null) {                    
+                    if(mappingWrapper.getConfig().isDatabaseSchemaNameSupported()) {
+                    	fkTableName = fkTable.getSchemaName()+"."+fkTable.getTableName();
+                    } else {
+                    	fkTableName = fkTable.getTableName();
+                    }                	
+                } else {//this can happen when no <Table> in Config and Query based Dynamic Types are used during query
+                	fkTableName = getTypeName(); 
+                }
+                
+                if (r.getForeignKeyTable().equals(fkTableName)) {
+                    List pairs = r.getKeyPair();
+                    Iterator iter = pairs.iterator();
+                    while (iter.hasNext()) {
+                        KeyPair pair = (KeyPair) iter.next();
+                        keyMappings.put(pair.getForeignKeyColumn(), r);
+                    	if (this.logger.isDebugEnabled()) {
+                            this.logger.debug("Putting key pair: " + pair.getPrimaryKeyColumn()+","+pair.getForeignKeyColumn());
+                    	}                        
+                    }
+                }
+            }
+        }
+    }
+
+    public Object get(String parameter) {
+        if (isPartOfPrimaryKey(parameter)) {
+            return dataObject.get(parameter);
+        }
+
+        Relationship r = (Relationship) keyMappings.get(parameter);
+        if (r == null) {
+            return dataObject.get(parameter);
+        }
+
+        //JIRA-952
+        Table tbl = this.mappingWrapper.getTable(r.getPrimaryKeyTable());
+        Property parentRef = null;
+        if(tbl == null){
+        	//this is case when config file is not present and 
+        	//ConfigHelper helper = new ConfigHelper(); is used
+        	parentRef = getParentReference(r.getPrimaryKeyTable());	
+        }
+        else{
+        	//other cases, its better to use typeName as r.getPrimaryKeyTable()
+        	//gives tableName and tableName and typeName can be different
+        	//and SDO looks for typeName and not tableName.
+        	parentRef = getParentReference((new TableWrapper(tbl)).getTypeName());
+        }
+        
+        DataObject parent = dataObject.getDataObject(parentRef);
+        
+        if (parent == null) {
+            return null;
+        }
+        String parentKey = getParentKey(r, parameter);//parentKey is db column name
+        
+        String parentTableName = null;
+        //as parentKey is qualified column name and not SDO property name, do conversion, when possible, thru <Config><Table>
+        tbl = mappingWrapper.getTableByTypeName(parent.getType().getName());        
+        if(tbl != null) {
+	        if(mappingWrapper.getConfig().isDatabaseSchemaNameSupported()) {
+	        	parentTableName = tbl.getSchemaName()+"."+tbl.getTableName();
+	        } else {
+	        	parentTableName = tbl.getTableName();
+	        }
+	        String parentKeyProp = mappingWrapper.getColumnPropertyName(parentTableName, parentKey);
+	        
+	        return parent.get(parentKeyProp);	        
+        } else {
+        	return parent.get(parentKey);
+        }        
+    }
+
+    /*This returns table column name*/
+    private String getParentKey(Relationship r, String parameter) {
+        List keyPairs = r.getKeyPair();
+        Iterator i = keyPairs.iterator();
+        while (i.hasNext()) {
+            KeyPair pair = (KeyPair) i.next();
+            if (pair.getForeignKeyColumn().equals(parameter)) {
+                return pair.getPrimaryKeyColumn();
+            }
+        }
+        return null;
+    }
+
+    public Property getParentReference(String parentName) {
+        if (this.parentReference == null) {
+            Iterator i = dataObject.getType().getProperties().iterator();
+            while (i.hasNext()) {
+                Property ref = (Property) i.next();
+                if ((!ref.getType().isDataType()) && (ref.getType().getName().equals(parentName))) {
+                    this.parentReference = ref;
+                }
+            }
+        }
+        return this.parentReference;
+    }
+
+    //JIRA-952
+    public String getTableName() {
+        if (mappingWrapper.getConfig() != null) {
+        	
+        	if(mappingWrapper.getConfig().isDatabaseSchemaNameSupported()){
+	        	if (this.logger.isDebugEnabled()) {
+	                this.logger.debug("DatabaseObject.getTableName:(schemaName.tableName) " +
+	                		mappingWrapper.getTableByTypeName(getTypeName()).getSchemaName()+"."+
+	                		mappingWrapper.getTableByTypeName(getTypeName()).getTableName());
+	        	} 
+	        	
+	            return (mappingWrapper.getTableByTypeName(getTypeName()).getSchemaName()+"."+
+        		mappingWrapper.getTableByTypeName(getTypeName()).getTableName());    		
+        	}
+        	else{
+	        	if (this.logger.isDebugEnabled()) {
+	                this.logger.debug("DatabaseObject.getTableName: " + mappingWrapper.getTableByTypeName(getTypeName()).getTableName());
+	        	} 
+	        	
+	            return mappingWrapper.getTableByTypeName(getTypeName()).getTableName();
+        	}
+        } 
+        return null;       
+    }
+
+    public String getTypeName() {
+    	if (this.logger.isDebugEnabled()) {
+            this.logger.debug("DatabaseObject.getTypeName: " + dataObject.getType().getName());
+    	}    	
+        return dataObject.getType().getName();
+    }
+
+    public void setPropagatedID(String propagatedID, int id) {
+        dataObject.setInt(propagatedID, id);
+    }
+
+    private boolean isPartOfPrimaryKey(String parameter) {
+        if (mappingWrapper.getConfig() == null) {
+            return false;
+        }
+        
+        Table t = mappingWrapper.getTable(getTableName());
+        if (t == null) {
+            return false;
+        }
+        Column c = mappingWrapper.getColumnByPropertyName(t, parameter);
+        if (c == null) {
+            return false;
+        }
+        
+        return c.isPrimaryKey();
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
new file mode 100644
index 0000000000..ca85569272
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
@@ -0,0 +1,37 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import org.apache.tuscany.das.rdb.config.Delete;
+
+public class DeleteCommandImpl extends WriteCommandImpl {
+	public DeleteCommandImpl(org.apache.tuscany.das.rdb.config.Command command) {
+		super(command);
+	}
+	
+    public DeleteCommandImpl(String sqlString) {
+        super(sqlString);
+    }
+
+    public DeleteCommandImpl(Delete delete) {
+        super(delete.getSql());
+        this.addParameters(delete.getParameters());
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
new file mode 100644
index 0000000000..feb7e31411
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
@@ -0,0 +1,77 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * DeleteList will sort delete operations so that child objects are deleted before their parents
+ * 
+ * 
+ */
+public class DeleteList {
+
+    private Map opsByTableName = new HashMap();
+
+    private List order;
+
+    private List deleteOperations = new ArrayList();
+
+    public DeleteList() {
+        super();
+    }
+
+    public void add(ChangeOperation op) {
+        if ((order.size() == 0) || (op.getTableName() == null)) {
+            deleteOperations.add(op);
+        } else {
+            String name = op.getTableName();
+            List ops = (List) opsByTableName.get(name);
+            if (ops == null) {
+                ops = new ArrayList();
+            }
+            ops.add(op);
+            opsByTableName.put(name, ops);
+        }
+    }
+
+    public Collection getSortedList() {
+        if ((order.size() > 0) && (opsByTableName.keySet().size() > 0)) {
+            Iterator i = this.order.iterator();
+            while (i.hasNext()) {
+                String name = (String) i.next();
+                if (opsByTableName.get(name) != null) {
+                    deleteOperations.addAll((Collection) opsByTableName.get(name));
+                }
+            }
+        }
+
+        return deleteOperations;
+    }
+
+    public void setOrder(List deleteOrder) {
+        this.order = deleteOrder;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
new file mode 100644
index 0000000000..52935599c1
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
@@ -0,0 +1,38 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import org.apache.tuscany.das.rdb.util.DataObjectUtil;
+
+import commonj.sdo.DataObject;
+
+public class DeleteOperation extends ChangeOperation {
+
+    /**
+     * @param command
+     * @param changedObject
+     *            Objects deleted from the graph have lost their "settings" and must be restored
+     */
+    public DeleteOperation(DeleteCommandImpl command, DataObject changedObject) {
+        super(command);
+        this.dObject = new DatabaseObject(command.getMappingModel(), DataObjectUtil.getRestoredCopy(changedObject));
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
new file mode 100644
index 0000000000..bb148635c8
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+
+import commonj.sdo.Type;
+
+public class FactoryRegistry {
+
+    private final Logger logger = Logger.getLogger(FactoryRegistry.class);
+
+    private Map registry = new HashMap();
+
+    private final MappingWrapper mapping;
+
+    private final ConnectionImpl connection;
+
+    public FactoryRegistry(MappingWrapper mapping, ConnectionImpl connection) {
+        this.mapping = mapping;
+        this.connection = connection;
+    }
+
+    public ChangeFactory getFactory(Type type) {
+        ChangeFactory factory = (ChangeFactory) registry.get(type);
+        if (factory == null) {
+            if (this.logger.isDebugEnabled()) {
+                this.logger.debug("Creating new ChangeFactory for type " + type.getName());
+            }
+
+            factory = new ChangeFactory(mapping, connection);
+            registry.put(type, factory);
+        }
+        return factory;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
new file mode 100644
index 0000000000..61967475bd
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
@@ -0,0 +1,75 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.sql.SQLException;
+
+import org.apache.tuscany.das.rdb.config.Create;
+
+public class InsertCommandImpl extends WriteCommandImpl {
+
+    private String[] keys;
+
+    public InsertCommandImpl(org.apache.tuscany.das.rdb.config.Command command, String[] generatedKeys) {
+    	super(command);
+    	keys = generatedKeys;
+    }
+    
+    public InsertCommandImpl(String sqlString, String[] generatedKeys) {
+        super(sqlString);
+        keys = generatedKeys;
+    }
+
+    public InsertCommandImpl(Create create) {
+        super(create.getSql());
+        this.addParameters(create.getParameters());
+        this.keys = new String[0];
+    }
+
+    public void execute() {
+
+        boolean success = false;
+        try {
+            statement.executeUpdate(parameters, keys);
+            success = true;
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        } finally {
+            if (success) {
+                statement.getConnection().cleanUp();
+            } else {
+                statement.getConnection().errorCleanUp();
+            }
+        }
+
+    }
+
+    public int getGeneratedKey() {
+        try {
+        	Integer key = statement.getGeneratedKey();
+        	if(key != null)
+        		return key.intValue();
+        	else
+        		throw new RuntimeException("Could not obtain generated key!");
+        } catch (SQLException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
new file mode 100644
index 0000000000..e61ccfe21e
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
+/**
+ * InsertList will sort ChangeOperation objects so that parents are inserted before children
+ * 
+ * 
+ */
+public class InsertList {
+    private final Logger logger = Logger.getLogger(InsertList.class);
+
+    private Map opsByTableName = new HashMap();
+
+    private List insertOperations = new ArrayList();
+
+    private List order;
+
+    public void add(ChangeOperation op) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Adding insert operation ");
+        }
+
+        // If nothing has been added yet, or this is no ordering, simply
+        // add the operation to the list
+        if ((order.size() == 0) || (op.getTableName() == null)) {
+            insertOperations.add(op);
+        } else {
+            String name = op.getTableName();
+            List ops = (List) opsByTableName.get(name);
+            if (ops == null) {
+                ops = new ArrayList();
+            }
+
+            ops.add(op);
+            opsByTableName.put(name, ops);
+        }
+    }
+
+    public Collection getSortedList() {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Getting sorted insert list");
+        }
+
+        if ((order.size() > 0) && opsByTableName.keySet().size() > 0) {
+            Iterator i = this.order.iterator();
+            while (i.hasNext()) {
+                String name = (String) i.next();
+                if (this.logger.isDebugEnabled()) {
+                    this.logger.debug("Adding operations for table " + name);
+                }
+
+                // A null here means a table is in the config but hasn't been changed here
+                if (opsByTableName.get(name) != null) {
+                    insertOperations.addAll((Collection) opsByTableName.get(name));
+                }
+            }
+        }
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Returning " + insertOperations.size() + " insert operations");
+        }
+
+        return insertOperations;
+    }
+
+    public void setOrder(List insertOrder) {
+        this.order = insertOrder;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java
new file mode 100644
index 0000000000..f2f3ccdd79
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java
@@ -0,0 +1,39 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.math.BigDecimal;
+
+public class ManagedParameterImpl extends ParameterExtendedImpl {
+
+    public void setValue(Object oldValue) {
+        this.value = updateValue(oldValue);
+    }
+
+    private Object updateValue(Object oldValue) {
+        if (oldValue instanceof Integer) {
+            return new Integer(((Integer) oldValue).intValue() + 1);
+        } else if (oldValue instanceof BigDecimal) {
+            return ((BigDecimal) oldValue).add(new BigDecimal(1));
+        } else {
+            throw new RuntimeException("Unsupported type for managed column: " + oldValue.getClass().getName());
+        }
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
new file mode 100644
index 0000000000..0a5f6951e9
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
@@ -0,0 +1,48 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.sql.SQLException;
+
+import org.apache.tuscany.das.rdb.config.Update;
+import org.apache.tuscany.das.rdb.exception.OptimisticConcurrencyException;
+
+public class OptimisticWriteCommandImpl extends UpdateCommandImpl {
+
+    public OptimisticWriteCommandImpl(String sqlString) {
+        super(sqlString);
+    }
+
+    public OptimisticWriteCommandImpl(Update update) {
+        super(update);
+        addParameters(update.getParameters());
+    }
+
+    public void basicExecute() {
+        try {
+            int rowsAffected = statement.executeUpdate(parameters);
+            if (rowsAffected == 0) {
+                throw new OptimisticConcurrencyException("An update collision occurred");
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
new file mode 100644
index 0000000000..27b653763b
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
@@ -0,0 +1,69 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.Pager;
+
+import commonj.sdo.DataObject;
+
+public class PagerImpl implements Pager {
+
+    private final ReadCommandImpl command;
+
+    private final int size;
+
+    private int idx = 1;
+
+    public PagerImpl(Command command, int size) {
+        this.command = (ReadCommandImpl) command;
+        this.command.enablePaging();
+        this.size = size;
+    }
+
+    public DataObject next() {
+        int start = idx;
+        int end = idx + size;
+        idx += size;
+        command.setStartRow(start);
+        command.setEndRow(end);
+        return command.executeQuery();
+    }
+
+    public DataObject getPage(int page) {
+        int end = (page * size) + 1;
+        int start = end - size;
+        idx = end;
+        command.setStartRow(start);
+        command.setEndRow(end);
+        return command.executeQuery();
+    }
+
+    public DataObject previous() {
+        int start = idx - (2 * size);
+        if (start < 1) {
+            start = 1;
+        }
+        int end = start + size;
+        idx = end;
+        command.setStartRow(start);
+        command.setEndRow(end);
+        return command.executeQuery();
+    }
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterExtendedImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterExtendedImpl.java
new file mode 100644
index 0000000000..db98b130ba
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterExtendedImpl.java
@@ -0,0 +1,99 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import org.apache.tuscany.das.rdb.Converter;
+import org.apache.tuscany.das.rdb.config.impl.ParameterImpl;
+
+import commonj.sdo.Type;
+
+public class ParameterExtendedImpl extends ParameterImpl{
+    /**
+     * Value for "Direction" that indicates that a parameter is soley for input.
+     */
+    static final String IN = "IN";
+
+    /**
+     * Value for "Direction" that indicates that a parameter is soley for output. 
+     * Out parameters only apply to Stored Procedures
+     */
+    static final String OUT = "OUT";
+
+    /**
+     * Value for "Direction" that indicates that a parameter is for both input and output. 
+     * In-out parameters only apply to stored procedures
+     */
+    static final String IN_OUT = "IN_OUT";
+
+    private Type type;
+    
+    protected Object value;
+
+    private Converter converter;
+    
+    public ParameterExtendedImpl() {
+    	super();
+    	this.direction = IN;
+    }
+    
+    public ParameterExtendedImpl(org.apache.tuscany.das.rdb.config.impl.ParameterImpl parameterImpl) {
+    	this.columnType = parameterImpl.getColumnType();
+    	this.direction = parameterImpl.getDirection();
+    	this.index = parameterImpl.getIndex();
+    	this.name = parameterImpl.getName();
+    }
+    
+    public void setType(Type type) {
+        this.type = type;
+    }
+    
+    public Type getType() {
+        return this.type;
+    }
+    
+    public void setColumnType(String newColumnType) {
+    	super.setColumnType(newColumnType);
+    	if(newColumnType != null){
+        	String arg0 = newColumnType.substring(0, newColumnType.lastIndexOf("."));
+        	String arg1 = newColumnType.substring(newColumnType.lastIndexOf(".")+1);
+        	this.type = SDODataTypes.TYPE_HELPER.getType(arg0, arg1);    		
+    	}
+    }
+    
+    public void setValue(Object value) {
+        this.value = value;
+    }
+    
+    public Object getValue() {
+        if (getConverter() != null) {
+            return getConverter().getColumnValue(this.value);
+        } 
+      
+        return this.value;        
+    }
+    
+    public void setConverter(Converter converter) {
+        this.converter = converter;
+    }
+
+    public Converter getConverter() {
+        return this.converter;
+    }
+    
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
new file mode 100644
index 0000000000..3e23faf069
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
@@ -0,0 +1,120 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import org.apache.tuscany.das.rdb.Converter;
+
+import commonj.sdo.Type;
+
+public class ParameterImpl {
+
+    /**
+     * Value for "Direction" that indicates that a parameter is soley for input.
+     */
+    static final int IN = 1;
+
+    /**
+     * Value for "Direction" that indicates that a parameter is soley for output. 
+     * Out parameters only apply to Stored Procedures
+     */
+    static final int OUT = 2;
+
+    /**
+     * Value for "Direction" that indicates that a parameter is for both input and output. 
+     * In-out parameters only apply to stored procedures
+     */
+    static final int IN_OUT = 3;
+
+    protected Object value;
+
+    private int index;
+
+    private Type type;
+
+    private String name;
+
+    private int direction = IN;
+
+    private Converter converter;
+
+    
+    public ParameterImpl() {
+        super();
+    }
+
+    public ParameterImpl(int index) {
+        this.index = index;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public void setIndex(int index) {
+        if (index == 0) {
+            throw new RuntimeException("Index of zero not allowed");
+        }
+        this.index = index;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    public void setDirection(int direction) {
+        this.direction = direction;
+    }
+
+    public Type getType() {
+        return this.type;
+    }
+
+    public int getIndex() {
+        return this.index;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public Object getValue() {
+        if (getConverter() != null) {
+            return getConverter().getColumnValue(this.value);
+        } 
+      
+        return this.value;        
+    }
+
+    public int getDirection() {
+        return this.direction;
+    }
+
+    public void setConverter(Converter converter) {
+        this.converter = converter;
+    }
+
+    public Converter getConverter() {
+        return this.converter;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
new file mode 100644
index 0000000000..bebfba9ce9
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
@@ -0,0 +1,113 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+import commonj.sdo.Type;
+
+public class Parameters {
+    private final Logger logger = Logger.getLogger(Parameters.class);
+
+    private List parameters = new ArrayList();
+
+    private List inParams = new ArrayList();
+
+    private List outParams = new ArrayList();
+
+    public Parameters() {
+        super();
+    }
+
+    public ParameterImpl get(int index) {
+        return (ParameterImpl) parameters.get(index);
+    }
+
+    public List outParams() {
+        return outParams;
+    }
+
+    public List inParams() {
+        return inParams;
+    }
+
+    private void addParameter(ParameterImpl param) {
+        if (param.getDirection() == ParameterImpl.IN) {
+            inParams.add(param);
+        } else if ((param.getDirection() == ParameterImpl.OUT) || (param.getDirection() == ParameterImpl.IN_OUT)) {
+            outParams.add(param);
+        }
+
+        this.parameters.add(param);
+    }
+
+    public void add(ParameterImpl param) {
+        addParameter(param);
+    }
+
+    public ParameterImpl findOrCreateParameterWithIndex(int index, int direction, Type sdoType) {
+        Iterator i = parameters.iterator();
+        while (i.hasNext()) {
+            ParameterImpl param = (ParameterImpl) i.next();
+
+            if (param.getIndex() == index) {
+                return param;
+            }
+        }
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Creating new parameter with index " + index);
+        }
+
+        ParameterImpl newParam = new ParameterImpl(index);
+        newParam.setDirection(direction);
+        newParam.setType(sdoType);
+        addParameter(newParam);
+        return newParam;
+    }
+
+    public List parameterList() {
+        return parameters;
+    }
+
+    public ParameterImpl findOrCreateParameterWithIndex(int index) {
+        return findOrCreateParameterWithIndex(index, ParameterImpl.IN, null);
+    }
+
+    public void setParameter(int index, Object value) {
+        ParameterImpl param = findOrCreateParameterWithIndex(index);
+        param.setValue(value);
+    }
+
+    public ParameterImpl parameterWithIndex(int index) {
+        Iterator i = parameters.iterator();
+        while (i.hasNext()) {
+            ParameterImpl param = (ParameterImpl) i.next();
+
+            if (param.getIndex() == index) {
+                return param;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParametersExtendedImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParametersExtendedImpl.java
new file mode 100644
index 0000000000..190695ae14
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParametersExtendedImpl.java
@@ -0,0 +1,189 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.config.Parameters;
+import org.apache.tuscany.das.rdb.config.impl.ParameterImpl;
+import org.apache.tuscany.das.rdb.config.impl.ParametersImpl;
+
+import commonj.sdo.Type;
+
+public class ParametersExtendedImpl extends ParametersImpl{
+	private final Logger logger = Logger.getLogger(ParametersExtendedImpl.class);
+    private List inParams = new ArrayList();
+
+    private List outParams = new ArrayList();
+
+    public ParametersExtendedImpl(){
+
+    }
+
+    public ParametersExtendedImpl(List paramsList) {
+    	if(this.parameter == null){
+    		this.parameter = new ArrayList();
+    	}
+    	if(paramsList != null){
+	    	for(int i=0; i<paramsList.size(); i++){
+				ParameterImpl paramImpl = (ParameterImpl)paramsList.get(i);
+				ParameterExtendedImpl paramExtImpl = new ParameterExtendedImpl();
+				paramExtImpl.setColumnType(paramImpl.getColumnType());
+				paramExtImpl.setIndex(paramImpl.getIndex());
+				paramExtImpl.setName(paramImpl.getName());
+				paramExtImpl.setDirection(paramImpl.getDirection());
+				this.parameter.add(paramExtImpl);
+			}
+    	}
+    }
+
+    public ParametersExtendedImpl(Parameters params) {
+    	this(params.getParameter());
+    }
+
+    public List getOutParameters() {
+        return outParams;
+    }
+
+    public List getInParameters() {
+        return inParams;
+    }
+
+    public ParameterExtendedImpl getParameter(int index) {
+    	if(this.getParameter() == null || this.getParameter().isEmpty())
+    		return null;
+
+		Iterator itr = this.getParameter().iterator();
+		while(itr.hasNext()){
+			ParameterExtendedImpl curParam = (ParameterExtendedImpl)itr.next();
+			if(curParam.getIndex() == index){
+				return curParam;
+			}
+		}
+		return null;
+    }
+
+    public ParameterExtendedImpl getParameter(int index, String direction) {
+    	if(direction.equals(ParameterExtendedImpl.IN)) {
+    		Iterator itr = this.inParams.iterator();
+    		while(itr.hasNext()){
+    			ParameterExtendedImpl curParam = (ParameterExtendedImpl)itr.next();
+    			if(curParam.getIndex() == index){
+    				return curParam;
+    			}
+    		}
+    	}
+    	else {
+    		Iterator itr = this.outParams.iterator();
+    		while(itr.hasNext()){
+    			ParameterExtendedImpl curParam = (ParameterExtendedImpl)itr.next();
+    			if(curParam.getIndex() == index){
+    				return curParam;
+    			}
+    		}
+    	}
+    	return null;
+    }
+
+    private ParameterExtendedImpl getNamedParameter(List params, String name){
+    	if(params == null)
+    		return null;
+    	for(int i=0; i<params.size(); i++){
+    		if( ((ParameterExtendedImpl)params.get(i)).getName().equals(name)){
+    			return (ParameterExtendedImpl)params.get(i);
+    		}
+    	}
+    	return null;
+    }
+
+    public ParameterExtendedImpl getParameter(String name) {
+    	return getNamedParameter(this.getParameter(), name);
+    }
+
+    public ParameterExtendedImpl getParameter(String name, String direction) {
+    	if(direction.equals(ParameterExtendedImpl.IN))
+    		return getNamedParameter(this.inParams, name);
+    	else
+    		return getNamedParameter(this.outParams, name);
+    }
+
+    public ParameterExtendedImpl findOrCreateParameterWithIndex(int index, String direction, Type sdoType) {
+    	if(this.parameter == null){
+    		this.parameter = new ArrayList();
+    	}
+    	Iterator i = this.parameter.iterator();
+        while (i.hasNext()) {
+            ParameterExtendedImpl param = (ParameterExtendedImpl) i.next();
+
+            if (param.getIndex() == index) {
+                return param;
+            }
+        }
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Creating new parameter with index " + index);
+        }
+
+        ParameterExtendedImpl newParam = new ParameterExtendedImpl();
+        newParam.setIndex(index);
+        newParam.setDirection(direction);
+        newParam.setType(sdoType);
+        newParam.setColumnType(SDODataTypeHelper.columnTypeForSDOType(sdoType));
+        this.getParameter().add(newParam);
+        if(!direction.equals(ParameterExtendedImpl.IN)){
+        	this.getOutParameters().add(newParam);
+        }
+        else{
+        	this.getInParameters().add(newParam);
+        }
+        return newParam;
+    }
+
+    /**maintain compatibility with parameters="name1 name2 " from config
+     *
+     * @param parameters
+     */
+    public static ArrayList getParameters(String parameters) {
+        StringTokenizer tokenizer = new StringTokenizer(parameters);
+        ArrayList paramExtList = new ArrayList();
+        for (int idx = 1; tokenizer.hasMoreTokens(); idx++) {
+            ParameterExtendedImpl p = new ParameterExtendedImpl();
+            p.setName(tokenizer.nextToken());
+            p.setIndex(idx);
+            p.setDirection(ParameterExtendedImpl.IN);
+            paramExtList.add(p);
+        }
+        return paramExtList;
+    }
+
+    public void addParameters(List paramExtList){
+    	for(int i=0; i<paramExtList.size(); i++){
+    		ParameterExtendedImpl curParam = (ParameterExtendedImpl)paramExtList.get(i);
+            this.getParameter().add(curParam);
+            if(curParam.getDirection().equals(ParameterExtendedImpl.IN))
+            	this.getInParameters().add(paramExtList.get(i));
+            else
+            	this.getOutParameters().add(paramExtList.get(i));
+    	}
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
new file mode 100644
index 0000000000..c78d91e219
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
@@ -0,0 +1,338 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.config.ResultDescriptor;
+import org.apache.tuscany.das.rdb.config.impl.ResultDescriptorImpl;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.graphbuilder.impl.GraphBuilderMetadata;
+import org.apache.tuscany.das.rdb.graphbuilder.impl.ResultSetProcessor;
+import org.apache.tuscany.sdo.api.SDOUtil;
+
+import commonj.sdo.ChangeSummary;
+import commonj.sdo.DataGraph;
+import commonj.sdo.DataObject;
+
+public class ReadCommandImpl extends CommandImpl {
+
+    private int startRow = 1;
+
+    private int endRow = Integer.MAX_VALUE;   
+
+    private List resultDescriptors = null;
+    
+    public ReadCommandImpl(org.apache.tuscany.das.rdb.config.Command command, MappingWrapper mapping, List resultDescriptor) {
+        super(command);
+        this.configWrapper = mapping;
+        
+        if (resultDescriptor != null && !resultDescriptor.isEmpty()) {
+            this.resultSetShape = new ResultSetShape(resultDescriptor, configWrapper.getConfig());//JIRA-952
+        }
+    }
+    
+    public ReadCommandImpl(String sqlString, MappingWrapper mapping, List resultDescriptor) {
+        super(sqlString);
+        this.configWrapper = mapping;
+        
+        if (resultDescriptor != null && !resultDescriptor.isEmpty()) {
+            this.resultSetShape = new ResultSetShape(resultDescriptor, configWrapper.getConfig());//JIRA-952
+        }
+    }
+
+    private void refreshResultSetShape(){
+		//sort descriptor and use in ResultSetShape
+        sortResultDescriptors();    		
+		this.resultSetShape = new ResultSetShape(this.resultDescriptors, configWrapper.getConfig());	
+    }
+    
+	private void sortResultDescriptors(){
+		if(this.resultDescriptors == null) {
+			return;
+		}
+		
+		if( this.resultDescriptors.size()==0) {
+			return;
+		}
+		
+		//when any index is found not set, do not sort	
+		for(Iterator it =  this.resultDescriptors.iterator() ; it.hasNext();){
+			ResultDescriptor resultDescriptor = (ResultDescriptor) it.next();
+			if(resultDescriptor.getColumnIndex() <= -1){
+				return;
+			}
+		}
+
+		//now is time to sort
+		Object[] resultDescAry = this.resultDescriptors.toArray();
+		for(int i=0; i<resultDescAry.length; i++){
+			for(int j=i+1; j<resultDescAry.length; j++){
+				if( ((ResultDescriptor)resultDescAry[j]).getColumnIndex()
+						< ((ResultDescriptor)resultDescAry[i]).getColumnIndex()){
+					ResultDescriptor tmpResDesc = (ResultDescriptor)resultDescAry[i];
+					resultDescAry[i] = resultDescAry[j];
+					resultDescAry[j] = tmpResDesc;
+				}
+				
+				if( ((ResultDescriptor)resultDescAry[j]).getColumnIndex()
+						== ((ResultDescriptor)resultDescAry[i]).getColumnIndex()){
+					throw new RuntimeException("Two columns in Result Descriptor can not have same index");				
+				}
+			}
+		}
+		
+		this.resultDescriptors.clear();
+		for(int i=0; i<resultDescAry.length; i++){
+			this.resultDescriptors.add(resultDescAry[i]);
+		}
+		
+		return;
+	}
+	
+	private ResultDescriptor deepCopyResultDescriptor(ResultDescriptor inObj){
+		ResultDescriptorImpl outObj = new ResultDescriptorImpl();
+		outObj.setColumnIndex(inObj.getColumnIndex());
+		outObj.setColumnName(inObj.getColumnName());
+		outObj.setColumnType(inObj.getColumnType());
+		outObj.setTableName(inObj.getTableName());
+		outObj.setSchemaName(inObj.getSchemaName());	
+		return outObj;
+	}
+	
+	private List deepCopyResultDescriptors(List resultDescriptors){
+		if(resultDescriptors == null || resultDescriptors.size() == 0)
+			return null;
+		
+		ArrayList copyList = new ArrayList();
+		
+		for(Iterator it =  resultDescriptors.iterator() ; it.hasNext();){
+			copyList.add( deepCopyResultDescriptor( (ResultDescriptorImpl) it.next()));
+		}
+		return copyList;
+	}
+	
+    /**
+     * When any columnIndex == -ve, sorting will not happen in ResultShapeSorter (old way)
+     * When null is passed, set this.resultSetShape to null, this will later trigger, dbms metadata
+     * based shaping of result
+     */
+    public void setResultDescriptors(List resultDescriptors){    	
+    	this.resultDescriptors = deepCopyResultDescriptors(resultDescriptors);
+    	if(this.resultDescriptors == null || this.resultDescriptors.size()==0){
+    		this.resultSetShape = null;
+    	}
+    	else{
+    		//below will go away with List<> JDK5
+    		for(Iterator it =  this.resultDescriptors.iterator() ; it.hasNext();){
+
+    			if(!(it.next() instanceof ResultDescriptor)){
+    				throw new RuntimeException("Elements in List not of type ResultDescriptor!");
+    			}
+
+    		}
+    		refreshResultSetShape();
+    	}
+    }
+      
+    public List getResultDescriptors(){
+    	return this.resultDescriptors;
+    }
+    
+    public void addResultDescriptor(ResultDescriptor resultDescriptor){
+    	//if >= 0 columnIndex, add/replace for given index 
+    	//if < 0 columnIndex, add at end of current list
+    	if(resultDescriptor == null) {
+    		return;
+    	}
+    	
+		if(this.resultDescriptors == null){
+			this.resultDescriptors = new ArrayList();
+		}
+		
+    	if(resultDescriptor.getColumnIndex() <0){
+    		this.resultDescriptors.add(deepCopyResultDescriptor(resultDescriptor));//dont care about columnIndex,add at end,  old way
+    	}
+    	else{
+    		ResultDescriptor existing = getResultDescriptor(resultDescriptor.getColumnIndex());
+    		if(existing != null){
+    			removeResultDescriptor(resultDescriptor.getColumnIndex());
+    		}
+    		this.resultDescriptors.add(deepCopyResultDescriptor(resultDescriptor));//add at end, sorting will happen below
+    	}
+    	
+    	refreshResultSetShape();
+    }
+    
+
+    public ResultDescriptor removeResultDescriptor(int columnIndex){
+    	//if < 0 index return null
+    	//if >=0 index and available at given index, remove and return same
+    	//if >=0 index and not available at given index, return null
+    	ResultDescriptor existing = null;
+    	if(columnIndex >=0 && ((existing = getResultDescriptor(columnIndex)) != null) ){
+    		this.resultDescriptors.remove(existing);    	
+    		refreshResultSetShape();			
+    		return existing;
+    	}    	
+    	return null;
+    }
+    
+    public ResultDescriptor removeResultDescriptor(ResultDescriptor resultDescriptor){
+    	//remove and return only if matched for index, name, type, table name, schema name
+    	//else return null
+    	if(resultDescriptor != null){
+    		ResultDescriptor existing = getResultDescriptor(resultDescriptor.getColumnIndex());
+    		if(existing != null &&
+    		   existing.getColumnName().equals(resultDescriptor.getColumnName()) &&
+    		   existing.getColumnType().equals(resultDescriptor.getColumnType()) &&
+    		   existing.getTableName().equals(resultDescriptor.getTableName()) ) {
+    		   if(this.configWrapper.getConfig().isDatabaseSchemaNameSupported()){//multi schema support
+    			   if(resultDescriptor.getSchemaName() != null && existing.getSchemaName() != null
+    				&& resultDescriptor.getSchemaName().equals(existing.getSchemaName())){
+    				   this.resultDescriptors.remove(existing);    				   
+    				   refreshResultSetShape();    					
+    				   return existing;
+    			   }
+    			   return null;
+    		   }
+    		   else{
+    			   this.resultDescriptors.remove(existing);    			   
+    			   refreshResultSetShape();    				
+				   return existing;
+    		   }    			
+    		}    				
+    	}
+    	return null;
+    }
+    
+    public ResultDescriptor getResultDescriptor(int columnIndex){
+    	//if <0 index return null
+    	//if >=0 index and available at given index,  return same
+    	//if >=0 index and not available at given index, return null
+    	if(columnIndex >=0 && this.resultDescriptors != null){
+			
+			for(Iterator it =  this.resultDescriptors.iterator() ; it.hasNext();){
+				ResultDescriptor rs = (ResultDescriptor) it.next();
+
+				if( rs.getColumnIndex() == columnIndex){
+					return rs;
+				}
+
+			}    		
+    	}
+
+    	return null;
+    }
+    
+    //Utility method
+    public void printResultDescriptors(OutputStream ostrm) throws IOException{
+    	if(this.resultDescriptors != null && this.resultDescriptors.size() != 0){
+
+		for(Iterator it =  this.resultDescriptors.iterator() ; it.hasNext();){
+    			ostrm.write( it.next().toString().getBytes() );
+    			ostrm.write('\n');
+
+    		}
+    		ostrm.flush();
+
+    	}
+    }
+    
+    public void execute() {
+        throw new UnsupportedOperationException();
+    }
+
+    public DataObject executeQuery() {
+
+        if (statement.getConnection() == null) {
+            throw new RuntimeException("A DASConnection object must be specified before executing the query.");
+        }
+
+        boolean success = false;
+        try {
+            List results = statement.executeQuery(parameters);
+            success = true;
+            return buildGraph(results);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        } finally {
+            if (success) {
+                statement.getConnection().cleanUp();
+            } else {
+                statement.getConnection().errorCleanUp();
+            }
+        }
+    }
+
+    protected DataObject buildGraph(List results) throws SQLException {      
+
+        // Before we use the mappingModel, do some checking/updating. If
+        // inferrable information
+        // isn't specified, add it in.
+
+        GraphBuilderMetadata gbmd = new GraphBuilderMetadata(results, configWrapper.getConfig(),
+                resultSetShape);
+
+        // Create the DataGraph
+        DataGraph g = SDOUtil.createDataGraph();
+
+        // Create the root object       
+        g.createRootObject(gbmd.getRootType());
+
+        SDOUtil.registerDataGraphTypes(g, gbmd.getDefinedTypes());
+        
+        ChangeSummary summary = g.getChangeSummary();
+
+        ResultSetProcessor rsp = new ResultSetProcessor(g.getRootObject(), gbmd);
+        rsp.processResults(getStartRow(), getEndRow());
+
+        summary.beginLogging();
+
+        return g.getRootObject();
+    }
+
+
+    protected int getStartRow() {
+        return startRow;
+    }
+
+    protected int getEndRow() {
+        return endRow;
+    }
+
+    protected void setStartRow(int startRow) {
+        this.startRow = startRow;
+    }
+
+    protected void setEndRow(int endRow) {
+        this.endRow = endRow;
+    }
+
+
+    protected void enablePaging() {
+        statement.enablePaging();
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java
new file mode 100644
index 0000000000..a9744d42b9
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java
@@ -0,0 +1,161 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.ResultDescriptor;
+import org.apache.tuscany.das.rdb.graphbuilder.schema.ResultSetTypeMap;
+
+import commonj.sdo.Type;
+import commonj.sdo.helper.TypeHelper;
+
+/**
+ * Describes the structure of the result set returned from 
+ * execution of a SELECT statement. This description is typcially 
+ * not required since the shape can be retreived from the JDBC 
+ * ResultSetMetadata. However, some platforms such as Oracle do not 
+ * support fully suport ResultSetMedata.
+ * <p>
+ * There may also be a performance boost when using this interface.
+ * 
+ * 
+ */
+public class ResultSetShape {
+
+    private final String[] columns;
+
+    private final String[] tables;
+
+    private final Type[] types;
+
+    private final String[] schema;//JIRA-952
+    //JIRA-952
+    public ResultSetShape(ResultSetMetaData metadata, Config model) throws SQLException {
+        columns = new String[metadata.getColumnCount()];
+        tables = new String[metadata.getColumnCount()];
+        types = new Type[metadata.getColumnCount()];
+        schema = new String[metadata.getColumnCount()];
+
+        ResultSetTypeMap typeMap = ResultSetTypeMap.INSTANCE;
+        for (int i = 1; i <= metadata.getColumnCount(); i++) {
+        	if(model.isDatabaseSchemaNameSupported()){
+            	if(metadata.getSchemaName(i) != null && !metadata.getSchemaName(i).equals("")){
+            		//tables[i - 1] = metadata.getSchemaName(i)+"."+metadata.getTableName(i);
+            		tables[i - 1] = metadata.getTableName(i);
+            		schema[i - 1] = metadata.getSchemaName(i);
+            	}
+            	else{
+            		tables[i - 1] = metadata.getTableName(i);
+            		schema[i - 1] = "";
+            	}        		
+        	}
+        	else{
+        		tables[i - 1] = metadata.getTableName(i);
+        		schema[i - 1] = "";
+        	}
+            columns[i - 1] = metadata.getColumnName(i);
+            types[i - 1] = typeMap.getType(metadata.getColumnType(i), true);
+        }
+    }
+
+    //JIRA-952
+    protected ResultSetShape(List resultDescriptor, Config model) {
+        TypeHelper helper = TypeHelper.INSTANCE;
+        int size = resultDescriptor.size();
+        columns = new String[size];
+        tables = new String[size];
+        types = new Type[size];
+        schema = new String[size];
+        
+        for (int i = 0; i < size; i++) {
+            ResultDescriptor desc = (ResultDescriptor) resultDescriptor.get(i);
+            if(model.isDatabaseSchemaNameSupported()){
+            	if(desc.getSchemaName() != null && !desc.getSchemaName().equals("")){
+            		tables[i] = desc.getTableName();
+            		schema[i] = desc.getSchemaName();
+            	}else{
+            		tables[i] = desc.getTableName();
+            		schema[i] = "";
+            	}
+            		
+            }else{
+           		tables[i] = desc.getTableName();
+           		schema[i] = "";
+            }
+            columns[i] = desc.getColumnName();
+
+            int idx = desc.getColumnType().lastIndexOf('.');
+            String uri = desc.getColumnType().substring(0, idx);
+            String typeName = desc.getColumnType().substring(idx + 1);
+
+            types[i] = helper.getType(uri, typeName);
+            if (types[i] == null) {
+                throw new RuntimeException("Could not find type " + desc.getColumnType() 
+                        + " for column " + desc.getColumnName());
+            }
+        }
+
+    }
+
+    public int getColumnCount() {
+        return columns.length;
+    }
+
+    public String getTableName(int i) {
+        return tables[i - 1];
+    }
+
+    //JIRA-952
+    public String getSchemaName(int i) {
+        return schema[i - 1];
+    }
+    public String getColumnName(int i) {
+        return columns[i - 1];
+    }
+
+    public Type getColumnType(int i) {
+        return types[i - 1];
+    }
+
+    public String toString() {
+        StringBuffer result = new StringBuffer();
+        result.append(" column/table/schema/type: ");
+        for (int i = 0; i < columns.length; i++) {
+            result.append(columns[i]);
+            result.append('\t');
+            result.append(tables[i]);
+            result.append('\t');
+            result.append(schema[i]);
+            result.append('\t');
+            if (types[i] == null) {
+                result.append("null");
+            } else {
+                result.append(types[i].getName());
+            }
+            result.append('\n');
+        }
+
+        return result.toString();
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java
new file mode 100644
index 0000000000..5f24099743
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java
@@ -0,0 +1,189 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.sql.Types;
+
+import commonj.sdo.Type;
+
+public final class SDODataTypeHelper {
+
+    private SDODataTypeHelper() {
+        
+    }
+    
+    public static String columnTypeForSDOType(Type sdoType){
+    	if(sdoType == null) {
+    		throw new RuntimeException("Null SDO Data Type!");
+    	}
+
+    	if(!sdoType.isDataType()) {
+    		throw new RuntimeException("Invalid SDO Data Type! "+sdoType.getName());
+    	}
+    	
+    	if (sdoType == SDODataTypes.BOOLEAN) {
+            return SDODataTypes.BOOLEAN_STR;
+        } else if (sdoType == SDODataTypes.BOOLEANOBJECT) {
+            return SDODataTypes.BOOLEANOBJECT_STR;
+        } else if (sdoType == SDODataTypes.BYTE) {
+            return SDODataTypes.BYTE_STR;
+        } else if (sdoType == SDODataTypes.BYTEOBJECT) {
+            return SDODataTypes.BYTEOBJECT_STR;
+        } else if (sdoType == SDODataTypes.BYTES) {
+            return SDODataTypes.BYTES_STR;
+        } else if (sdoType == SDODataTypes.CHARACTER) {
+            return SDODataTypes.CHARACTER_STR;
+        } else if (sdoType == SDODataTypes.CHARACTEROBJECT) {
+            return SDODataTypes.CHARACTEROBJECT_STR;
+        } else if (sdoType == SDODataTypes.DATE) {
+            return SDODataTypes.DATE_STR;
+        } else if (sdoType == SDODataTypes.DATETIME) {
+            return SDODataTypes.DATETIME_STR;
+        } else if (sdoType == SDODataTypes.DAY) {
+            return SDODataTypes.DAY_STR;
+        } else if (sdoType == SDODataTypes.DECIMAL) {
+            return SDODataTypes.DECIMAL_STR;
+        }  else if (sdoType == SDODataTypes.STRING) {
+            return SDODataTypes.STRING_STR;
+        } else if (sdoType == SDODataTypes.DOUBLE) {
+            return SDODataTypes.DOUBLE_STR;
+        } else if (sdoType == SDODataTypes.DOUBLEOBJECT) {
+            return SDODataTypes.DOUBLEOBJECT_STR;
+        } else if (sdoType == SDODataTypes.DURATION) {
+            return SDODataTypes.DURATION_STR;
+        } else if (sdoType == SDODataTypes.FLOAT) {
+            return SDODataTypes.FLOAT_STR;
+        } else if (sdoType == SDODataTypes.FLOATOBJECT) {
+            return SDODataTypes.FLOATOBJECT_STR;
+        } else if (sdoType == SDODataTypes.INT) {
+            return SDODataTypes.INT_STR;
+        } else if (sdoType == SDODataTypes.INTEGER) {
+            return SDODataTypes.INTEGER_STR;
+        } else if (sdoType == SDODataTypes.INTOBJECT) {
+            return SDODataTypes.INTOBJECT_STR;
+        } else if (sdoType == SDODataTypes.LONG) {
+            return SDODataTypes.LONG_STR;
+        } else if (sdoType == SDODataTypes.LONGOBJECT) {
+            return SDODataTypes.LONGOBJECT_STR;
+        } else if (sdoType == SDODataTypes.MONTH) {
+            return SDODataTypes.MONTH_STR;
+        } else if (sdoType == SDODataTypes.MONTHDAY) {
+            return SDODataTypes.MONTHDAY_STR;
+        } else if (sdoType == SDODataTypes.OBJECT) {
+            return SDODataTypes.OBJECT_STR;            
+        } else if (sdoType == SDODataTypes.SHORT) {
+            return SDODataTypes.SHORT_STR;
+        } else if (sdoType == SDODataTypes.SHORTOBJECT) {
+            return SDODataTypes.SHORTOBJECT_STR;
+        } else if (sdoType == SDODataTypes.STRING) {
+            return SDODataTypes.STRING_STR;
+        } else if (sdoType == SDODataTypes.STRINGS) {
+            return SDODataTypes.STRINGS_STR;
+        } else if (sdoType == SDODataTypes.TIME) {
+            return SDODataTypes.TIME_STR;
+        } else if (sdoType == SDODataTypes.URI) {
+            return SDODataTypes.URI_STR;
+        } else if (sdoType == SDODataTypes.YEAR) {
+            return SDODataTypes.YEAR_STR;
+        } else if (sdoType == SDODataTypes.YEARMONTH) {
+            return SDODataTypes.YEARMONTH_STR;
+        } else if (sdoType == SDODataTypes.YEARMONTHDAY) {
+            return SDODataTypes.YEARMONTHDAY_STR;
+        } else {
+            throw new RuntimeException("Invalid SDO Data Type " + sdoType.getName());
+        }    	
+    }
+    
+    public static int sqlTypeFor(Type sdoType) {
+        if (sdoType == null) {
+            return Types.OTHER;
+        }
+
+        if (sdoType == SDODataTypes.BOOLEAN) {
+            return Types.BOOLEAN;
+        } else if (sdoType == SDODataTypes.STRING) {
+            return Types.VARCHAR;
+        } else if (sdoType == SDODataTypes.BYTE) {
+            return Types.TINYINT;
+        } else if (sdoType == SDODataTypes.BYTES) {
+            return Types.BINARY;
+        } else if (sdoType == SDODataTypes.CHARACTER) {
+            return Types.CHAR;
+        } else if (sdoType == SDODataTypes.DATE) {
+            return Types.DATE;
+        } else if (sdoType == SDODataTypes.DATETIME) {
+            return Types.DATE;
+        } else if (sdoType == SDODataTypes.DAY) {
+            return java.sql.Types.VARCHAR;
+        } else if (sdoType == SDODataTypes.DECIMAL) {
+            return java.sql.Types.DECIMAL;
+        } else if (sdoType == SDODataTypes.DOUBLE) {
+            return java.sql.Types.DOUBLE;
+        } else if (sdoType == SDODataTypes.DURATION) {
+            return java.sql.Types.VARCHAR;
+        } else if (sdoType == SDODataTypes.FLOAT) {
+            return java.sql.Types.REAL;
+        } else if (sdoType == SDODataTypes.INT) {
+            return java.sql.Types.INTEGER;
+        } else if (sdoType == SDODataTypes.INTEGER) {
+            return java.sql.Types.INTEGER;
+        } else if (sdoType == SDODataTypes.LONG) {
+            return java.sql.Types.BIGINT;
+        } else if (sdoType == SDODataTypes.MONTH) {
+            return java.sql.Types.VARCHAR;
+        } else if (sdoType == SDODataTypes.MONTHDAY) {
+            return java.sql.Types.VARCHAR;
+        } else if (sdoType == SDODataTypes.OBJECT) {
+            return java.sql.Types.JAVA_OBJECT;
+        } else if (sdoType == SDODataTypes.SHORT) {
+            return java.sql.Types.SMALLINT;
+        } else if (sdoType == SDODataTypes.STRINGS) {
+            return java.sql.Types.OTHER;
+        } else if (sdoType == SDODataTypes.TIME) {
+            return java.sql.Types.VARCHAR;
+        } else if (sdoType == SDODataTypes.URI) {
+            return java.sql.Types.VARCHAR;
+        } else if (sdoType == SDODataTypes.YEAR) {
+            return java.sql.Types.VARCHAR;
+        } else if (sdoType == SDODataTypes.YEARMONTH) {
+            return java.sql.Types.VARCHAR;
+        } else if (sdoType == SDODataTypes.YEARMONTHDAY) {
+            return java.sql.Types.VARCHAR;
+        } else if (sdoType == SDODataTypes.BOOLEANOBJECT) {
+            return java.sql.Types.BOOLEAN;
+        } else if (sdoType == SDODataTypes.BYTEOBJECT) {
+            return java.sql.Types.TINYINT;
+        } else if (sdoType == SDODataTypes.CHARACTEROBJECT) {
+            return java.sql.Types.CHAR;
+        } else if (sdoType == SDODataTypes.DOUBLEOBJECT) {
+            return java.sql.Types.DOUBLE;
+        } else if (sdoType == SDODataTypes.FLOATOBJECT) {
+            return java.sql.Types.REAL;
+        } else if (sdoType == SDODataTypes.INTOBJECT) {
+            return java.sql.Types.INTEGER;
+        } else if (sdoType == SDODataTypes.LONGOBJECT) {
+            return java.sql.Types.BIGINT;
+        } else if (sdoType == SDODataTypes.SHORTOBJECT) {
+            return java.sql.Types.SMALLINT;
+        } else {
+            throw new RuntimeException("Invalid SDO Data Type " + sdoType.getName());
+        }
+
+    }
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java
new file mode 100644
index 0000000000..db520b249f
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java
@@ -0,0 +1,130 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import commonj.sdo.Type;
+import commonj.sdo.helper.TypeHelper;
+
+/**
+ * Defines SDO data types. This is used primalirly to type stored procedure OUT parameters.
+ * and due to final consts reduce number of string creation
+ */
+public class SDODataTypes {
+
+    public static final TypeHelper TYPE_HELPER = TypeHelper.INSTANCE;
+
+    public static final Type BOOLEAN = TYPE_HELPER.getType("commonj.sdo", "Boolean");
+    public static final String BOOLEAN_STR = "commonj.sdo.Boolean";
+    
+    public static final Type BOOLEANOBJECT = TYPE_HELPER.getType("commonj.sdo", "BooleanObject");
+    public static final String BOOLEANOBJECT_STR = "commonj.sdo.BooleanObject";
+    
+    public static final Type BYTE = TYPE_HELPER.getType("commonj.sdo", "Byte");
+    public static final String BYTE_STR = "commonj.sdo.Byte";
+    
+    public static final Type BYTEOBJECT = TYPE_HELPER.getType("commonj.sdo", "ByteObject");
+    public static final String BYTEOBJECT_STR = "commonj.sdo.ByteObject";
+
+    public static final Type BYTES = TYPE_HELPER.getType("commonj.sdo", "Bytes");
+    public static final String BYTES_STR = "commonj.sdo.Bytes";
+    
+    public static final Type CHARACTER = TYPE_HELPER.getType("commonj.sdo", "Character");
+    public static final String CHARACTER_STR = "commonj.sdo.Character";
+    
+    public static final Type CHARACTEROBJECT = TYPE_HELPER.getType("commonj.sdo", "CharacterObject");
+    public static final String CHARACTEROBJECT_STR = "commonj.sdo.CharacterObject";
+    
+    public static final Type DATE = TYPE_HELPER.getType("commonj.sdo", "Date");
+    public static final String DATE_STR = "commonj.sdo.Date";
+    
+    public static final Type DATETIME = TYPE_HELPER.getType("commonj.sdo", "DateTime");
+    public static final String DATETIME_STR = "commonj.sdo.DateTime";
+    
+    public static final Type DAY = TYPE_HELPER.getType("commonj.sdo", "Day");
+    public static final String DAY_STR = "commonj.sdo.Day";
+    
+    public static final Type DECIMAL = TYPE_HELPER.getType("commonj.sdo", "Decimal");
+    public static final String DECIMAL_STR = "commonj.sdo.Decimal";
+    
+    public static final Type DOUBLE = TYPE_HELPER.getType("commonj.sdo", "Double");
+    public static final String DOUBLE_STR = "commonj.sdo.Double";
+    
+    public static final Type DOUBLEOBJECT = TYPE_HELPER.getType("commonj.sdo", "DoubleObject");
+    public static final String DOUBLEOBJECT_STR = "commonj.sdo.DoubleObject";
+    
+    public static final Type DURATION = TYPE_HELPER.getType("commonj.sdo", "Duration");
+    public static final String DURATION_STR = "commonj.sdo.Duration";
+    
+    public static final Type FLOAT = TYPE_HELPER.getType("commonj.sdo", "Float");
+    public static final String FLOAT_STR = "commonj.sdo.Float";
+    
+    public static final Type FLOATOBJECT = TYPE_HELPER.getType("commonj.sdo", "FloatObject");
+    public static final String FLOATOBJECT_STR = "commonj.sdo.FloatObject";
+    
+    public static final Type INT = TYPE_HELPER.getType("commonj.sdo", "Int");
+    public static final String INT_STR = "commonj.sdo.Int";
+    
+    public static final Type INTEGER = TYPE_HELPER.getType("commonj.sdo", "Integer");
+    public static final String INTEGER_STR = "commonj.sdo.Integer";
+    
+    public static final Type INTOBJECT = TYPE_HELPER.getType("commonj.sdo", "IntObject");
+    public static final String INTOBJECT_STR = "commonj.sdo.IntObject";
+    
+    public static final Type LONG = TYPE_HELPER.getType("commonj.sdo", "Long");
+    public static final String LONG_STR = "commonj.sdo.Long";
+    
+    public static final Type LONGOBJECT = TYPE_HELPER.getType("commonj.sdo", "LongObject");
+    public static final String LONGOBJECT_STR = "commonj.sdo.LongObject";
+    
+    public static final Type MONTH = TYPE_HELPER.getType("commonj.sdo", "Month");
+    public static final String MONTH_STR = "commonj.sdo.Month";
+    
+    public static final Type MONTHDAY = TYPE_HELPER.getType("commonj.sdo", "MonthDay");
+    public static final String MONTHDAY_STR = "commonj.sdo.MonthDay";
+    
+    public static final Type OBJECT = TYPE_HELPER.getType("commonj.sdo", "Object");
+    public static final String OBJECT_STR = "commonj.sdo.Object";
+    
+    public static final Type SHORT = TYPE_HELPER.getType("commonj.sdo", "Short");
+    public static final String SHORT_STR = "commonj.sdo.Short";
+    
+    public static final Type SHORTOBJECT = TYPE_HELPER.getType("commonj.sdo", "ShortObject");
+    public static final String SHORTOBJECT_STR = "commonj.sdo.ShortObject";
+    
+    public static final Type STRING = TYPE_HELPER.getType("commonj.sdo", "String");
+    public static final String STRING_STR = "commonj.sdo.String";
+    
+    public static final Type STRINGS = TYPE_HELPER.getType("commonj.sdo", "Strings");
+    public static final String STRINGS_STR = "commonj.sdo.Strings";
+    
+    public static final Type TIME = TYPE_HELPER.getType("commonj.sdo", "Time");
+    public static final String TIME_STR = "commonj.sdo.Time";
+    
+    public static final Type URI = TYPE_HELPER.getType("commonj.sdo", "URI");
+    public static final String URI_STR = "commonj.sdo.URI";
+    
+    public static final Type YEAR = TYPE_HELPER.getType("commonj.sdo", "Year");
+    public static final String YEAR_STR = "commonj.sdo.Year";
+    
+    public static final Type YEARMONTH = TYPE_HELPER.getType("commonj.sdo", "YearMonth");
+    public static final String YEARMONTH_STR = "commonj.sdo.YearMonth";
+    
+    public static final Type YEARMONTHDAY = TYPE_HELPER.getType("commonj.sdo", "YearMonthDay");
+    public static final String YEARMONTHDAY_STR = "commonj.sdo.YearMonthDay";       
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
new file mode 100644
index 0000000000..c1822c3e07
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
@@ -0,0 +1,100 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.config.Parameter;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Type;
+import commonj.sdo.helper.TypeHelper;
+
+public class SPCommandImpl extends ReadCommandImpl {
+    private final Logger logger = Logger.getLogger(SPCommandImpl.class);
+   
+    public SPCommandImpl(String sqlString, MappingWrapper config, List params) {
+        super(sqlString, config, null);
+        Iterator i = params.iterator();
+        while (i.hasNext()) {
+            Parameter p = (Parameter) i.next();
+
+            int index = p.getColumnType().lastIndexOf('.');
+            String pkg = p.getColumnType().substring(0, index);
+            String typeName = p.getColumnType().substring(index + 1);
+
+            Type sdoType = TypeHelper.INSTANCE.getType(pkg, typeName);
+
+            String direction = ParameterExtendedImpl.IN;
+            if (ParameterExtendedImpl.OUT.equalsIgnoreCase(p.getDirection())) {
+                direction = ParameterExtendedImpl.OUT;
+            } else if (ParameterExtendedImpl.IN_OUT.equalsIgnoreCase(p.getDirection())) {
+                direction = ParameterExtendedImpl.IN_OUT;
+            }
+            parameters.findOrCreateParameterWithIndex(p.getIndex(), direction, sdoType);
+        }
+
+    }
+
+    public DataObject executeQuery() {
+
+        boolean success = false;
+        try {
+            List results = statement.executeCall(parameters);
+            success = true;
+
+            return buildGraph(results);
+        } catch (SQLException e) {
+            if (this.logger.isDebugEnabled()) {
+                this.logger.debug(e);
+            }
+
+            throw new RuntimeException(e);
+        } finally {
+            if (success) {
+                statement.getConnection().cleanUp();
+            } else {
+                statement.getConnection().errorCleanUp();
+            }
+        }
+    }
+
+    public void execute() {
+
+        boolean success = false;
+        try {
+            statement.executeUpdateCall(parameters);
+            success = true;
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        } finally {
+            if (success) {
+                statement.getConnection().cleanUp();
+            } else {
+                statement.getConnection().errorCleanUp();
+            }
+        }
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
new file mode 100644
index 0000000000..bae802a2bc
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
@@ -0,0 +1,233 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.sql.CallableStatement;
+import java.sql.ParameterMetaData;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+// TODO - Can use some refactoring. Much code is duplicated in "execute" methods
+public class Statement {
+
+    protected final String queryString;
+
+    protected ConnectionImpl jdbcConnection;
+
+    private final Logger logger = Logger.getLogger(Statement.class);
+    
+    private PreparedStatement preparedStatement;
+
+    private boolean isPaging;
+
+    public Statement(String sqlString) {
+        this.queryString = sqlString;
+    }
+
+    public List executeQuery(ParametersExtendedImpl parameters) throws SQLException {
+
+        PreparedStatement ps = getPreparedStatement(new String[0]);
+        ps = setParameters(ps, parameters);
+        ResultSet rs = ps.executeQuery();
+
+        return Collections.singletonList(rs);
+    }
+
+    public List executeCall(ParametersExtendedImpl parameters) throws SQLException {
+
+        CallableStatement cs = jdbcConnection.prepareCall(queryString);
+
+        Iterator inParams = parameters.getInParameters().iterator();
+        while (inParams.hasNext()) {
+        	ParameterExtendedImpl param = (ParameterExtendedImpl) inParams.next();
+            cs.setObject(param.getIndex(), param.getValue());
+        }
+
+        // register out parameters
+        Iterator outParams = parameters.getOutParameters().iterator();
+        while (outParams.hasNext()) {
+        	ParameterExtendedImpl param = (ParameterExtendedImpl) outParams.next();
+            if (this.logger.isDebugEnabled()) {
+                this.logger.debug("Registering parameter " + param.getName());
+            }
+
+            cs.registerOutParameter(param.getIndex(), SDODataTypeHelper.sqlTypeFor(param.getType()));
+        }
+
+        // Using execute because Derby does not currenlty support
+        // executeQuery
+        // for SP
+        cs.execute();
+        List results = new ArrayList();
+        results.add(cs.getResultSet());
+        while (cs.getMoreResults(java.sql.Statement.KEEP_CURRENT_RESULT)) {
+            results.add(cs.getResultSet());
+        }
+
+        Iterator i = parameters.getOutParameters().iterator();
+        while (i.hasNext()) {
+        	ParameterExtendedImpl param = (ParameterExtendedImpl) i.next();
+            param.setValue(cs.getObject(param.getIndex()));
+        }
+
+        return results;
+
+    }
+
+    public void executeUpdateCall(ParametersExtendedImpl parameters) throws SQLException {
+        CallableStatement cs = jdbcConnection.prepareCall(queryString);
+
+        Iterator inParams = parameters.getInParameters().iterator();
+        while (inParams.hasNext()) {
+        	ParameterExtendedImpl param = (ParameterExtendedImpl) inParams.next();
+            cs.setObject(param.getIndex(), param.getValue());
+        }
+
+        // register out parameters
+        Iterator outParams = parameters.getOutParameters().iterator();
+        while (outParams.hasNext()) {
+        	ParameterExtendedImpl param = (ParameterExtendedImpl) outParams.next();
+
+            if (this.logger.isDebugEnabled()) {
+                this.logger.debug("Registering parameter " + param.getName());
+            }
+
+            cs.registerOutParameter(param.getIndex(), SDODataTypeHelper.sqlTypeFor(param.getType()));
+        }
+
+        cs.execute();
+
+        Iterator out = parameters.getOutParameters().iterator();
+        while (out.hasNext()) {
+        	ParameterExtendedImpl param = (ParameterExtendedImpl) out.next();
+            param.setValue(cs.getObject(param.getIndex()));
+        }
+
+    }
+
+    public int executeUpdate(ParametersExtendedImpl parameters, String[] generatedKeys) throws SQLException {
+        return executeUpdate(getPreparedStatement(generatedKeys), parameters);
+    }
+
+    public int executeUpdate(ParametersExtendedImpl parameters) throws SQLException {
+        return executeUpdate(parameters, new String[0]);
+    }
+
+    /**
+     * TODO - We need to look at using specific ps.setXXX methods when a type
+     * has been specified and try setObject otherwise.
+     */
+    private int executeUpdate(PreparedStatement ps, ParametersExtendedImpl parameters) throws SQLException {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug("Executing statement " + queryString);
+        }
+
+        Iterator i = parameters.getInParameters().iterator();
+        while (i.hasNext()) {
+        	ParameterExtendedImpl param = (ParameterExtendedImpl) i.next();
+
+            Object value = param.getValue();
+            if (this.logger.isDebugEnabled()) {
+                this.logger.debug("Setting parameter " + param.getIndex() + " to " + value);
+            }
+
+            if (value == null) {
+                if (param.getType() == null) {
+                    try {
+                        ParameterMetaData pmd = ps.getParameterMetaData();
+                        ps.setNull(param.getIndex(), pmd.getParameterType(param.getIndex()));
+                    } catch (SQLException ex) {
+                        ps.setNull(param.getIndex(), SDODataTypeHelper.sqlTypeFor(null));
+                    }
+                } else {
+                    ps.setNull(param.getIndex(), SDODataTypeHelper.sqlTypeFor(param.getType()));
+                }
+            } else {
+                ps.setObject(param.getIndex(), value);
+            }
+        }
+        return ps.executeUpdate();
+    }
+
+    protected PreparedStatement setParameters(PreparedStatement ps, ParametersExtendedImpl parameters) throws SQLException {
+        Iterator i = parameters.getInParameters().iterator();
+        while (i.hasNext()) {
+        	ParameterExtendedImpl param = (ParameterExtendedImpl) i.next();
+            ps.setObject(param.getIndex(), param.getValue());
+        }
+        return ps;
+    }
+
+    public void setConnection(ConnectionImpl jdbcConnection) {
+        this.jdbcConnection = jdbcConnection;
+    }
+
+    public ConnectionImpl getConnection() {
+        return this.jdbcConnection;
+    }
+
+    private PreparedStatement getPreparedStatement(String[] returnKeys) throws SQLException {
+
+        if (preparedStatement == null) {
+            if (isPaging) {
+                preparedStatement = jdbcConnection.preparePagedStatement(queryString);
+            } else {
+                preparedStatement = jdbcConnection.prepareStatement(queryString, returnKeys);
+            }
+        }
+
+        return preparedStatement;
+    }
+
+    public Integer getGeneratedKey() throws SQLException {
+
+    	if (getConnection().isGeneratedKeysSupported()) {
+            ResultSet rs = preparedStatement.getGeneratedKeys();
+            if (rs.next()) {
+                return new Integer(rs.getInt(1));
+            }
+        }
+
+        return null;
+    }
+
+    protected void enablePaging() {
+        isPaging = true;
+    }
+
+    public void close() {
+
+        if (this.preparedStatement != null) {
+            try {
+                preparedStatement.close();
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java
new file mode 100644
index 0000000000..4155360341
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java
@@ -0,0 +1,37 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import org.apache.tuscany.das.rdb.config.Update;
+
+public class UpdateCommandImpl extends WriteCommandImpl {
+	public UpdateCommandImpl(org.apache.tuscany.das.rdb.config.Command command) {
+		super(command);
+	}
+	
+    public UpdateCommandImpl(String sqlString) {
+        super(sqlString);
+    }
+
+    public UpdateCommandImpl(Update update) {
+        super(update.getSql());
+        this.addParameters(update.getParameters());
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java
new file mode 100644
index 0000000000..e7bb58698c
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java
@@ -0,0 +1,45 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Updates don't have to be sorted, so this class is a simple wrapper of ArrayList. 
+ *
+ */
+public class UpdateList {
+
+    private List updates = new ArrayList();
+
+    public UpdateList() {
+        super();
+    }
+
+    public void add(ChangeOperation c) {
+        updates.add(c);
+    }
+
+    public Collection getSortedList() {
+        return updates;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java
new file mode 100644
index 0000000000..1bcf3441b6
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java
@@ -0,0 +1,32 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+
+import commonj.sdo.DataObject;
+
+
+public class UpdateOperation extends ChangeOperation {
+
+    public UpdateOperation(UpdateCommandImpl command, DataObject changedObject, String id) {
+        super(command, changedObject);
+        this.propagatedID = id;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
new file mode 100644
index 0000000000..ee3f3d8faa
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
@@ -0,0 +1,165 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.impl;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.TreeMap;
+
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.Parameters;
+import org.apache.tuscany.das.rdb.config.ResultDescriptor;
+import org.apache.tuscany.das.rdb.config.impl.ParameterImpl;
+
+import commonj.sdo.DataObject;
+
+public abstract class WriteCommandImpl extends CommandImpl {
+
+	public WriteCommandImpl(org.apache.tuscany.das.rdb.config.Command command) {
+		super(command);
+	}
+	
+    public WriteCommandImpl(String sqlString) {
+        super(sqlString);
+    }
+
+    public void setResultDescriptors(List resultDescriptorList){
+    	//ignore , applicable for ReadCommand only
+    }
+    
+    public List getResultDescriptors(){
+    	//ignore, applicable for ReadCommand only
+    	return null;
+    }
+    
+    public void addResultDescriptor(ResultDescriptor resultDescriptor){
+    	//ignore
+    }
+    
+
+    public ResultDescriptor removeResultDescriptor(int index){
+    	return null;
+    }
+    
+    public ResultDescriptor removeResultDescriptor(ResultDescriptor resultDescriptor){
+    	return null;
+    }
+    
+    public ResultDescriptor getResultDescriptor(int index){
+    	return null;
+    }
+    
+    public void printResultDescriptors(OutputStream ostrm) throws IOException{
+    //ignore	
+    }
+    
+    public void execute() {
+
+        boolean success = false;
+        try {
+            basicExecute();
+            success = true;
+        } finally {
+            if (success) {
+                statement.getConnection().cleanUp();
+            } else {
+                statement.getConnection().errorCleanUp();
+            }
+        }
+
+    }
+
+    public void basicExecute() {
+        try {
+            statement.executeUpdate(parameters);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public DataObject executeQuery() {
+        throw new UnsupportedOperationException();
+    }
+
+    public Config getMappingModel() {
+        return configWrapper.getConfig();
+    }
+
+    public String toString() {
+
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("\nSQL: " + statement.queryString);
+
+        return buffer.toString();
+    }
+
+    public int getGeneratedKey() {
+        throw new RuntimeException("No generated key is available");
+    }
+
+    //it is acceptable if params having index set by caller are listed in any order in Parameters
+    //but, if index is not set by caller, the order of parameters in Parameters should be in sync
+    //with the Command string parameters
+    protected void addParameters(Parameters parameters) {
+    	List params = parameters.getParameter();
+    	if(params == null) 
+    		return;
+
+    	boolean paramsIndexed = true;
+    	TreeMap sortedParams = null;
+    	for(int i=0; i<params.size(); i++){
+    		if(((ParameterImpl)params.get(i)).getIndex() <= 0){
+    			paramsIndexed=false; //any index not set, ignore all externally set indexes and do auto indexing
+    			break;
+    		}    		
+    	}
+    
+    	//auto-indexing
+    	if(!paramsIndexed) {
+    		for(int i=0; i<params.size(); i++){
+    			ParameterExtendedImpl param = new ParameterExtendedImpl((ParameterImpl)params.get(i));
+    			param.setIndex(i+1);
+    			this.addParameter(param);
+    		}
+    		return;
+    	}
+    	else {//dont allow duplicates and check indexing with +1 increment from 1st to last param
+    		sortedParams = new TreeMap();
+    		for(int i=0; i<params.size(); i++){    			
+    			ParameterImpl existingParam = (ParameterImpl)sortedParams.put( new Integer(((ParameterImpl)params.get(i)).getIndex()), ((ParameterImpl)params.get(i)));
+    			if(existingParam != null) {
+    				throw new RuntimeException("Parameters with duplicate indexes!");
+    			}
+    		}
+
+    		if( ((Integer)sortedParams.firstKey()).intValue() + sortedParams.size() -1 != 
+    			((Integer)sortedParams.lastKey()).intValue()) {
+    			throw new RuntimeException("Parameters with improper indexes!");
+    		}
+    	}
+    	    	
+    	for(int i=0; i<params.size(); i++) {
+    		ParameterExtendedImpl param = new ParameterExtendedImpl((ParameterImpl)params.get(i));    		
+    		param.setIndex(((ParameterImpl)params.get(i)).getIndex());
+    		this.addParameter(param);
+    	}
+    }    
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
new file mode 100644
index 0000000000..2f43a6675f
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
@@ -0,0 +1,391 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.merge.impl;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.config.wrapper.QualifiedColumn;
+import org.apache.tuscany.das.rdb.graphbuilder.impl.MultiTableRegistry;
+import org.apache.tuscany.das.rdb.graphbuilder.impl.TableRegistry;
+import org.apache.tuscany.sdo.api.SDOUtil;
+
+import commonj.sdo.ChangeSummary;
+import commonj.sdo.DataGraph;
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+import commonj.sdo.Type;
+import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.impl.HelperProvider;
+
+public class GraphMerger {
+
+    private static Logger logger = Logger.getLogger("GraphMerger");
+
+    private Map keys = new HashMap();
+
+    private TableRegistry registry = new MultiTableRegistry();
+    
+    private Config config = null;//JIRA-962 for any new tests with schema , we need this
+
+    // TODO lots of cleanup/design
+    public GraphMerger() {
+        // Empty Constructor
+    }
+
+    //JIRA-952
+    public GraphMerger(Config cfg) {
+        this.config = cfg;
+    }
+    
+    public DataObject emptyGraph() {
+    	if(this.config != null)
+    		return emptyGraph(this.config);
+    	else
+    		return null;
+    }
+    
+    // TODO Replace EMF reference with SDOUtil function when available
+    // (Tuscany-583)
+    public DataObject emptyGraph(Config config) {
+
+        if (config.getDataObjectModel() == null) {
+            throw new RuntimeException("DataObjectModel must be specified in the Config");
+        }
+
+        Type rootType = createDataGraphRoot();
+        
+        List types = SDOUtil.getTypes(HelperProvider.getDefaultContext(), config.getDataObjectModel());
+        if (types == null) {
+            throw new RuntimeException("SDO Types have not been registered for URI " + config.getDataObjectModel());
+        }
+
+        Iterator i = types.iterator();
+        while (i.hasNext()) {
+            Type type = (Type) i.next();
+            Property property = getOrCreateProperty(rootType, type);
+        }
+
+        // Create the DataGraph
+        DataGraph g = SDOUtil.createDataGraph();
+
+        // Create the root object
+        g.createRootObject(rootType);
+
+        ChangeSummary summary = g.getChangeSummary();
+        summary.beginLogging();
+
+        return g.getRootObject();
+    }
+
+    private Type createDataGraphRoot() {
+	    String uri = "http:///org.apache.tuscany.das.rdb/das";
+	    TypeHelper typeHelper = HelperProvider.getDefaultContext().getTypeHelper();
+	    Type rootType = null;
+	    rootType = typeHelper.getType(uri+ "/DataGraphRoot", "DataGraphRoot");
+	    if(rootType == null){
+	    	rootType = SDOUtil.createType(HelperProvider.getDefaultContext(), uri+ "/DataGraphRoot", "DataGraphRoot", false);
+	    	if (logger.isDebugEnabled()) {
+	    		logger.debug("GraphMerger.createDataGraphRoot():creating type for "+uri);
+	    	}        	
+	    }
+	    return rootType;
+    }
+
+    private Property getOrCreateProperty(Type rootType, Type type) {
+        Property property = rootType.getProperty(type.getName());
+        if( !(property != null && 
+           (property.getType().isDataType()== type.isDataType()) &&
+           (property.isContainment() == true) &&
+           (property.isMany() == true)) ){
+            property = SDOUtil.createProperty(rootType, type.getName(), type);
+            SDOUtil.setContainment(property, true);
+            SDOUtil.setMany(property, true);
+            property = rootType.getProperty(type.getName());
+        }
+        return property;
+     }
+    
+    private boolean isContainedWithChangeSummary(DataObject object) {
+    	if(!object.getType().getName().equals("DataGraphRoot") || object.getChangeSummary() == null) {
+    		return false;
+    	}
+    	return true;
+    }
+    
+    private DataObject containWithChangeSummary(Type rootType, DataObject object) {
+    	Property property = rootType.getProperty(object.getType().getName());
+        
+        if( property == null) {
+            property = SDOUtil.createProperty(rootType, object.getType().getName(), object.getType());
+            SDOUtil.setContainment(property, true);
+            SDOUtil.setMany(property, true);
+            property = rootType.getProperty(object.getType().getName());
+        }
+        
+        DataGraph dataGraph = SDOUtil.createDataGraph();
+        DataObject root = dataGraph.createRootObject(rootType);
+        root.getDataGraph().getChangeSummary().beginLogging();
+        createObjectWithSubtree(root, property, object);
+        
+        if(root.getDataGraph().getChangeSummary().getChangedDataObjects() != null) {
+        	List cos = root.getDataGraph().getChangeSummary().getChangedDataObjects();
+        	for(int i=0; i<cos.size(); i++) {
+        		DataObject changedDO = (DataObject)cos.get(i);
+        	}
+        }
+        //as we are just wrapping individual DOs in DataGraphRoot, and later during merge we will merge all such DOs, no need to have registry entry
+        //right now.
+        registry.remove(object.getType().getName(), Collections.singletonList(getPrimaryKey(object)));
+        return root;
+    }
+    
+    /**
+     * If list contains at least one with DG and CS, select it, if none, return -1, if more than one, select the first one matching condition
+     * @param graphs
+     * @return
+     */
+    private int getPrimaryFromList(List graphs) {
+    	//select primary
+    	Iterator itr = graphs.iterator();
+    	int index = -1;
+    	int primaryIndex = -1;
+    	while(itr.hasNext()) {
+    		index++;
+    		DataObject currentGraph = (DataObject)itr.next();
+    		if(isContainedWithChangeSummary(currentGraph) && currentGraph.getChangeSummary() != null) {
+    			primaryIndex = index;
+    		}
+    	}
+    	return primaryIndex;
+    }
+    
+    //JIRA-1815
+    //preservePrimaryChangeSummary - default true - primary CS is preserved, secondary DOs are added without alteration to CS of primary - old behavior
+    //preservePrimaryChangeSummary - false - secondaries are treated as CREATE and primary CS is altered for merges - way to INSERT with adhoc SDOs.
+    public DataObject merge(List graphs, boolean preservePrimaryChangeSummary) {
+    	DataObject primaryGraph = null;
+    	int primaryIndex = getPrimaryFromList(graphs);
+
+    	if(primaryIndex > -1) {
+    		primaryGraph = (DataObject)graphs.remove(primaryIndex);
+    	}
+
+    	Iterator i = graphs.iterator();    	
+    	if(primaryGraph == null) {
+            if (i.hasNext()) {
+            	primaryGraph = (DataObject)i.next();
+            }    		
+    	}
+    	
+        while (i.hasNext()) {
+            primaryGraph = merge(primaryGraph, (DataObject) i.next(), preservePrimaryChangeSummary);
+        }
+
+        return primaryGraph;    	
+    }
+    
+    public DataObject merge(List graphs) {
+    	return merge(graphs, true);
+    }
+
+    public DataObject merge(DataObject primary, DataObject secondary, boolean preservePrimaryChangeSummary) {
+    	Type rootType = createDataGraphRoot();
+    	DataObject root1 = null;
+    	DataObject root2 = null;
+
+    	if(!isContainedWithChangeSummary(primary) && isContainedWithChangeSummary(secondary)) {
+    	//swap as secondary has change history
+    		DataObject temp = primary;
+    		primary = secondary;
+    		secondary = temp;
+    	}
+    	
+        //if primary top type name is not DataGraphRoot , add it
+    	if(!isContainedWithChangeSummary(primary)) {
+    		root1 = containWithChangeSummary(rootType, primary);
+    	} else {
+    		root1 = primary;
+    	}
+
+        //if secondary top type name is not DataGraphRoot , add it
+    	if(!isContainedWithChangeSummary(secondary)) {
+    		root2 = containWithChangeSummary(rootType, secondary);
+    	} else {
+    		root2 = secondary;
+    	}
+    	       
+        return mergeContained(root1, root2, preservePrimaryChangeSummary);    	
+    }
+    
+    public DataObject merge(DataObject primary, DataObject secondary) {
+    	return merge(primary, secondary, true);
+    }
+    
+    public DataObject mergeContained(DataObject primary, DataObject secondary, boolean preservePrimaryChangeSummary) {   	
+        addGraphToRegistry(primary);
+
+        Iterator i = secondary.getType().getProperties().iterator();
+        ChangeSummary summary = primary.getDataGraph().getChangeSummary();
+
+        if(preservePrimaryChangeSummary && summary.isLogging()) {
+        	summary.endLogging();
+        }
+
+        while (i.hasNext()) {
+            Property p = (Property) i.next();
+
+            Iterator objects = secondary.getList(p.getName()).iterator();            
+            while (objects.hasNext()) {
+                DataObject object = (DataObject) objects.next();
+                createObjectWithSubtree(primary, p, object);
+            }
+        }
+
+        if(preservePrimaryChangeSummary && !summary.isLogging()) {
+        	summary.beginLogging();
+        }
+        
+        return primary;
+    }
+
+    private void createObjectWithSubtree(DataObject root, Property p, DataObject object) {
+        Object pk = getPrimaryKey(object);
+
+        if (!registry.contains(object.getType().getName(), Collections.singletonList(pk))) {           
+           	Iterator attrs = object.getType().getProperties().iterator();
+    	    DataObject newObject = root.createDataObject(p.getName());
+    	    
+    	    createDataProperties(attrs, newObject, object);
+            registry.put(object.getType().getName(), Collections.singletonList(pk), newObject);
+            createReferenceProperties(root, newObject, object);            
+        }
+
+    }
+
+    private void createDataProperties(Iterator attrs, DataObject newObject, DataObject object) {
+	    while (attrs.hasNext()) {
+	        Property attr = (Property) attrs.next();
+	        if (attr.getType().isDataType()) {
+	        	try {
+	        		newObject.set(attr.getName(), object.get(attr));
+	        	} catch(Exception e) {
+	        		throw new RuntimeException("Graph structures do not match, can not merge! " + attr.getName());
+	        	}
+	        }
+	    }
+    }
+    
+    private void createReferenceProperties(DataObject root, DataObject newObject, DataObject object) {
+        Iterator refs = object.getType().getProperties().iterator();
+        while (refs.hasNext()) {
+            Property ref = (Property) refs.next();
+            if (!ref.getType().isDataType()) {
+                List refObjects;
+                if (!ref.isMany()) {
+                    refObjects = Collections.singletonList(object.get(ref));
+                } else {
+                    refObjects = (List) object.get(ref);
+                }
+                Iterator iter = refObjects.iterator();
+                while (iter.hasNext()) {
+                    DataObject refObject = (DataObject) iter.next();
+                    createObjectWithSubtree(root, refObject.getContainmentProperty(), refObject);
+                    refObject = registry.get(refObject.getType().getName(), 
+                            Collections.singletonList(getPrimaryKey(refObject)));
+                    if (ref.isMany()) {
+                        newObject.getList(newObject.getType().getProperty(ref.getName())).add(refObject);
+                    } else {
+                        newObject.set(newObject.getType().getProperty(ref.getName()), refObject);
+                    }
+                }
+            }
+        }    	
+    }
+    
+    private void addGraphToRegistry(DataObject graph1) {
+        Iterator i = graph1.getType().getProperties().iterator();
+        while (i.hasNext()) {
+            Property p = (Property) i.next();
+            Iterator objects = graph1.getList(p).iterator();
+            while (objects.hasNext()) {
+                DataObject object = (DataObject) objects.next();                
+                Object pk = object.get(getPrimaryKeyName(object));
+                if (logger.isDebugEnabled()) {
+                	logger.debug("Adding object with pk " + pk + " to registry");
+                }
+                registry.put(object.getType().getName(), Collections.singletonList(pk), object);
+            }
+        }
+    }
+
+    private Object getPrimaryKey(DataObject object) {
+        String pkName = getPrimaryKeyName(object);
+        return object.get(pkName);
+    }
+
+    private String getPrimaryKeyName(DataObject object) {
+        return (String) keys.get(object.getType().getName());
+    }
+
+    //JIRA-952
+    //if the table and column have SDO type name and property name use it else use database table and column name
+    public void addPrimaryKey(String key) {
+    	QualifiedColumn column = null;
+    	if(this.config != null && this.config.isDatabaseSchemaNameSupported()){
+    		column = new QualifiedColumn(key, this.config.isDatabaseSchemaNameSupported()); 
+    	}
+    	else{
+    		column = new QualifiedColumn(key);
+    	}
+        
+    	String tableName = column.getTableName();
+    	String columnName = column.getColumnName();
+    	String schemaName = column.getSchemaName();
+    	String qualifiedTableName = null;
+    	
+    	if(this.config != null && this.config.isDatabaseSchemaNameSupported()) {
+    		qualifiedTableName = schemaName+"."+tableName; 
+    	} else {
+    		qualifiedTableName = tableName;
+    	}
+    	MappingWrapper configWrapper = new MappingWrapper(this.config);
+    	
+    	String typeName = configWrapper.getTableTypeName(qualifiedTableName);
+    	String propertyName = configWrapper.getColumnPropertyName(qualifiedTableName, columnName);
+    	
+    	if(typeName != null && propertyName != null) {
+    		if (logger.isDebugEnabled()) {
+        		logger.debug("Adding " + typeName + " " + propertyName + " to keys");	
+        	}
+            keys.put(typeName, propertyName);
+    	} else {
+        	if (logger.isDebugEnabled()) {
+        		logger.debug("Adding " + column.getTableName() + " " + column.getColumnName() + " to keys");	
+        	}
+            keys.put(column.getTableName(), column.getColumnName());    		
+    	}    	
+    }
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/util/CollectionsUtil.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/util/CollectionsUtil.java
new file mode 100644
index 0000000000..64e8826f76
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/util/CollectionsUtil.java
@@ -0,0 +1,49 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.util;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ */
+public final class CollectionsUtil {
+
+    private CollectionsUtil() {
+        
+    }
+    
+    // Utilities
+    public static boolean disjoint(Collection c1, Collection c2) {
+      
+        if (c1.size() > c2.size()) {
+          Collection c = c1;
+          c1 = c2;
+          c2 = c;
+        }
+        for (Iterator iterator = c2.iterator(); iterator.hasNext();) {
+          Object o = (Object)iterator.next();
+          if (c1.contains(o)) {
+            return false;
+          }
+        }
+        return true;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
new file mode 100644
index 0000000000..c5c7a38aab
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
@@ -0,0 +1,130 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.config.Command;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.ConfigFactory;
+import org.apache.tuscany.das.rdb.config.Create;
+import org.apache.tuscany.das.rdb.config.Delete;
+import org.apache.tuscany.das.rdb.config.Parameter;
+import org.apache.tuscany.das.rdb.config.Update;
+
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLHelper;
+import commonj.sdo.impl.HelperProvider;
+
+/**
+ * Config util provides config-related utilities such as loading a Config
+ * instance from an InputStream
+ * 
+ */
+public final class ConfigUtil {
+
+    private ConfigUtil() {
+        
+    }
+    
+    public static Config loadConfig(InputStream configStream) {
+
+        if (configStream == null) {
+            throw new RuntimeException("Cannot load configuration from a null InputStream. "
+                    + "Possibly caused by an incorrect config xml file name");
+        }
+
+        HelperContext context = HelperProvider.getDefaultContext();
+        ConfigFactory.INSTANCE.register(context);
+        XMLHelper helper = context.getXMLHelper();
+
+        try {
+            return (Config) helper.load(configStream).getRootObject();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String getParameters(Create createCommand) {
+    	List parameters = createCommand.getParameters().getParameter();
+    	if(parameters != null) {
+	    	Iterator itr = parameters.iterator();
+	    	StringBuffer serializedParameters = new StringBuffer();
+	    	
+	    	while(itr.hasNext()) {
+	    		serializedParameters.append(((Parameter)itr.next()).getName()+" ");
+	    	}
+	    	return serializedParameters.toString().trim();
+    	}
+    	else {
+    		return null;
+    	}
+    }
+    
+    public static String getParameters(Update updateCommand) {
+    	List parameters = updateCommand.getParameters().getParameter();
+    	if(parameters != null) {
+	    	Iterator itr = parameters.iterator();
+	    	StringBuffer serializedParameters = new StringBuffer();
+	    	
+	    	while(itr.hasNext()) {
+	    		serializedParameters.append(((Parameter)itr.next()).getName()+" ");
+	    	}
+	    	return serializedParameters.toString().trim();
+    	}
+    	else {
+    		return null;
+    	}
+    }
+    
+    public static String getParameters(Delete deleteCommand) {
+    	List parameters = deleteCommand.getParameters().getParameter();
+    	if(parameters != null) {
+	    	Iterator itr = parameters.iterator();
+	    	StringBuffer serializedParameters = new StringBuffer();
+	    	
+	    	while(itr.hasNext()) {
+	    		serializedParameters.append(((Parameter)itr.next()).getName()+" ");
+	    	}
+	    	return serializedParameters.toString().trim();
+    	}
+    	else {
+    		return null;
+    	}
+    }
+    
+    public static String getParameters(Command command) {
+    	List parameters = command.getParameter();
+    	if(parameters != null) {
+	    	Iterator itr = parameters.iterator();
+	    	StringBuffer serializedParameters = new StringBuffer();
+	    	
+	    	while(itr.hasNext()) {
+	    		serializedParameters.append(((Parameter)itr.next()).getName()+" ");
+	    	}
+	    	return serializedParameters.toString().trim();
+    	}
+    	else {
+    		return null;
+    	}
+    }    
+}
diff --git a/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
new file mode 100644
index 0000000000..b9649669e5
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
@@ -0,0 +1,79 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.util;
+
+import java.util.Iterator;
+import java.util.List;
+
+import commonj.sdo.ChangeSummary;
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+import commonj.sdo.ChangeSummary.Setting;
+import commonj.sdo.helper.DataFactory;
+
+/**
+ */
+public final class DataObjectUtil {
+
+    private DataObjectUtil() {
+        
+    }
+    
+    // Utilities
+    public static DataObject getRestoredCopy(DataObject changedDO) {
+        DataObject changedCopy = getCopy(changedDO);
+        restoreAttributeValues(changedCopy, changedDO);
+        return changedCopy;
+    }
+
+    public static DataObject getCopy(DataObject original) {
+
+        DataObject copy = DataFactory.INSTANCE.create(original.getType());
+
+        // Fill in values
+        Iterator i = original.getType().getProperties().iterator();
+        while (i.hasNext()) {
+            Property feature = (Property) i.next();
+            copy.set(feature, original.get(feature));
+        }
+        return copy;
+    }
+
+    /**
+     * @param changedCopy
+     * @return
+     */
+    private static void restoreAttributeValues(DataObject changedCopy, DataObject changedDO) {
+
+        ChangeSummary changeSummary = changedDO.getDataGraph().getChangeSummary();
+        List changes = changeSummary.getOldValues(changedDO);
+        if (changes == null) {
+            return;
+        }
+
+        Iterator i = changes.iterator();
+        while (i.hasNext()) {
+            Setting s = (Setting) i.next();
+            if (s.getProperty().getType().isDataType()) {
+                changedCopy.set(s.getProperty(), s.getValue());
+            }
+        }
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/main/resources/META-INF/DISCLAIMER b/das-java/trunk/rdb/src/main/resources/META-INF/DISCLAIMER
new file mode 100644
index 0000000000..a65af91c5a
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/resources/META-INF/DISCLAIMER
@@ -0,0 +1,7 @@
+Apache Tuscany is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
+\ No newline at end of file
diff --git a/das-java/trunk/rdb/src/main/resources/META-INF/LICENSE b/das-java/trunk/rdb/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000000..9597d92eb3
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,353 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+===============================================================================================================
+
+Other components and dependencies under Apache Software License 2.0 : 
+
+   log4j-1.2.14.jar    - Apache Logging Services
+   derby 10.2.2.0.jar  - Apache Derby
+   stax-api-1.0.1.jar  - The Streaming API for XML (StAX)
+   wstx-asl-3.2.0.jar  - WoodStox StAX implementation
+   standard-1.1.1.jar  - The Apache Jackarta Taglibs
+   jstl-1.1.2.jar      - The Apache Jackarta Taglibs
+   *.tld               - The Apache Jackarta Taglibs
+
+===============================================================================================================
+
+
+Apache Tuscany SDO for Java Subcomponents
+=========================================: 
+
+The Tuscany SDO for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
+
+Permission to copy, make derivative works of, and distribute the Service Data Objects 
+JavaDoc and Interface Definition Files files in any medium without fee or royalty as part 
+of a compliant implementation of the Service Data Objects Specification is hereby granted.  
+The Service Data Objects Specification may be found at any of the following locations:
+
+http://dev2dev.bea.com/technologies/commonj/index.jsp
+http://www.ibm.com/developerworks/library/specification/ws-sdo/
+http://oracle.com/technology/webservices/sca
+https://www.sdn.sap.com/
+http://www.xcalia/xdn/specs/sdo
+
+THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES 
+ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS 
+SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES AND THE IMPLEMENTATION OF THEIR CONTENTS, 
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE 
+SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or 
+publicity pertaining to the Service Component Architecture Specification or its contents without specific, 
+written prior permission. Title to copyright in the Service Data Objects Specification and the 
+JavaDoc and Interface Definition Files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+=================================================================================================================
+
+For the Eclipse EMF components
+(codegen-2.2.3.jar
+codegen-ecore-2.2.3.jar
+common-2.2.3.jar
+ecore-2.2.3.jar
+ecore-change-2.2.3.jar
+ecore-xmi-2.2.3.jar
+xsd-2.2.3.jar)
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+===================================================================================================
diff --git a/das-java/trunk/rdb/src/main/resources/META-INF/NOTICE b/das-java/trunk/rdb/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000000..e9d98fc7f5
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,32 @@
+Apache Tuscany SDO for Java
+Copyright 2006, 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Apache Tuscany is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Web Services PMC. Incubation is required of all newly accepted
+projects until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with other successful
+ASF projects. While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be fully endorsed
+by the ASF.
+
+Unless otherwise indicated, all distribution made available by the Apache Software Foundation
+is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
+A copy of the AL is provided with this distribution as the LICENSE.txt file present in the
+root directory, and is also available at http://www.apache.org/licenses/.
+
+The terms and conditions governing the distribution may refer to the AL or other license
+agreements, notices or terms and conditions. Some of these other license agreements may
+include (but are not limited to):
+
+  . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
+
+It is your obligation to read and accept all such terms and conditions prior to use of the
+distribution. If term or condition is provided, please contact the Apache Software Foundation
+to determine what terms and conditions govern that particular distribution.
+
+This product also includes software developed by the Open Service Oriented Architecture organisation
+(http://osoa.org). The license for this software may be found in the LICENSE.txt file contained in this
+distribution.
diff --git a/das-java/trunk/rdb/src/main/resources/META-INF/README b/das-java/trunk/rdb/src/main/resources/META-INF/README
new file mode 100644
index 0000000000..853d9546db
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/resources/META-INF/README
@@ -0,0 +1,35 @@
+Apache Tuscany DAS beta1 build (June, 2006)
+=================+++++++========+==========
+
+http://incubator.apache.org/tuscany/
+
+Tuscany is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Web Services PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness or 
+stability of the code, it does indicate that the project has yet to be fully
+endorsed by the ASF.
+
+
+Support
+-------
+
+Any problem with this release can be reported to the Tuscany mailing list 
+or in the JIRA issue tracker.
+
+Mailing list subscription:
+    tuscany-dev-subscribe@ws.apache.org
+
+Jira:
+    http://issues.apache.org/jira/browse/Tuscany
+
+
+Thank you for using Tuscany!
+
+
+The Tuscany Team. 
+
diff --git a/das-java/trunk/rdb/src/main/resources/config.xsd b/das-java/trunk/rdb/src/main/resources/config.xsd
new file mode 100644
index 0000000000..e48d01ed2a
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/resources/config.xsd
@@ -0,0 +1,152 @@
+<?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: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"
+   elementFormDefault="qualified">
+
+   <xsd:element name="Config" type="config:Config"/> 
+
+   <xsd:complexType name="Config">
+      <xsd:sequence>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="Command"
+            type="config:Command"/>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="Table" type="config:Table"/>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="Relationship"
+            type="config:Relationship"/>
+         <xsd:element  maxOccurs="1" minOccurs="0" name="ConnectionInfo"
+            type="config:ConnectionInfo"/>
+      </xsd:sequence>
+      <xsd:attribute name="uri" type="xsd:string"/>
+      <xsd:attribute name="dataObjectModel" type="xsd:string"/>
+      <xsd:attribute name="databaseSchemaNameSupported" type="xsd:boolean" default="false"/>
+      <xsd:attribute name="generatedKeysSupported">
+         <xsd:simpleType>
+            <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="true"/>
+                <xsd:enumeration value="false"/>
+            </xsd:restriction>
+         </xsd:simpleType>
+      </xsd:attribute>
+   </xsd:complexType>
+
+   <xsd:complexType name="ConnectionProperties">
+      <xsd:attribute name="driverClass" type="xsd:string"/>
+      <xsd:attribute name="databaseURL" type="xsd:string"/>
+      <xsd:attribute name="userName" type="xsd:string" default=""/>
+      <xsd:attribute name="password" type="xsd:string" default=""/>
+      <xsd:attribute name="loginTimeout" type="xsd:int" default="0"/>      
+   </xsd:complexType>
+   
+   <xsd:complexType name="ConnectionInfo">
+      <xsd:sequence>
+        <xsd:element  maxOccurs="1" minOccurs="0" name="ConnectionProperties" type="config:ConnectionProperties"/>
+      </xsd:sequence>
+      <xsd:attribute name="dataSource" type="xsd:string"/>
+      <xsd:attribute name="managedtx" type="xsd:boolean" default="true"/>
+   </xsd:complexType>
+   
+   
+   <xsd:complexType name="Command">
+      <xsd:sequence>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="Parameter"
+            type="config:Parameter"/>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="ResultDescriptor"
+            type="config:ResultDescriptor"/>
+      </xsd:sequence>
+      <xsd:attribute name="name" type="xsd:string"/>
+      <xsd:attribute name="SQL" type="xsd:string"/>
+      <xsd:attribute name="kind" type="xsd:string"/>
+   </xsd:complexType>
+   <xsd:complexType name="Parameter">     
+	  <xsd:attribute name="name" type="xsd:string"/> 
+      <xsd:attribute name="columnType" type="xsd:string"/>
+      <xsd:attribute name="direction" type="xsd:string" default="IN"/>
+      <xsd:attribute name="index" type="xsd:int"/>
+   </xsd:complexType>
+	<xsd:complexType name="Parameters">
+		<xsd:sequence>
+			<xsd:element  maxOccurs="unbounded" minOccurs="0" name="Parameter" type="config:Parameter"/>
+		</xsd:sequence>
+	</xsd:complexType>   
+   <xsd:complexType name="Relationship">
+      <xsd:sequence>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="KeyPair"
+            type="config:KeyPair"/>
+      </xsd:sequence>
+      <xsd:attribute name="name" type="xsd:string"/>
+      <xsd:attribute name="primaryKeyTable" type="xsd:string"/>
+      <xsd:attribute name="foreignKeyTable" type="xsd:string"/>
+      <xsd:attribute name="many" type="xsd:boolean"/>
+      <xsd:attribute name="keyRestricted" type="xsd:boolean"/>
+   </xsd:complexType>
+   <xsd:complexType name="Table">
+      <xsd:sequence>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="Column"
+            type="config:Column"/>
+         <xsd:element  maxOccurs="1" minOccurs="0" name="create" type="config:Create"/>
+         <xsd:element  maxOccurs="1" minOccurs="0" name="update" type="config:Update"/>
+         <xsd:element maxOccurs="1" minOccurs="0" name="delete" type="config:Delete"/>
+      </xsd:sequence>
+      <xsd:attribute name="tableName" type="xsd:string"/>
+      <xsd:attribute name="typeName" type="xsd:string"/>      
+      <xsd:attribute name="schemaName" type="xsd:string" default=""/> 
+   </xsd:complexType>
+   <xsd:complexType name="Create">
+	<xsd:sequence>
+         <xsd:element  maxOccurs="1" minOccurs="0" name="Parameters" type="config:Parameters"/>
+     </xsd:sequence>   
+   	  <xsd:attribute name="sql" type="xsd:string"/>
+   </xsd:complexType>
+    <xsd:complexType name="Update">
+	 <xsd:sequence>
+         <xsd:element  maxOccurs="1" minOccurs="0" name="Parameters" type="config:Parameters"/>
+     </xsd:sequence>    
+   	  <xsd:attribute name="sql" type="xsd:string"/>
+   </xsd:complexType>
+    <xsd:complexType name="Delete">
+	  <xsd:sequence>
+         <xsd:element  maxOccurs="1" minOccurs="0" name="Parameters" type="config:Parameters"/>
+      </xsd:sequence>    
+   	  <xsd:attribute name="sql" type="xsd:string"/>
+   </xsd:complexType>
+   <xsd:complexType name="KeyPair">
+      <xsd:attribute name="primaryKeyColumn" type="xsd:string"/>
+      <xsd:attribute name="foreignKeyColumn" type="xsd:string"/>
+   </xsd:complexType>
+   <xsd:complexType name="Column">
+      <xsd:attribute name="columnName" type="xsd:string"/>
+      <xsd:attribute name="propertyName" type="xsd:string"/>
+      <xsd:attribute name="converterClassName" type="xsd:string"/>
+      <xsd:attribute name="primaryKey" type="xsd:boolean"/>
+      <xsd:attribute name="generated" type="xsd:boolean"/>
+      <xsd:attribute name="collision" type="xsd:boolean"/>
+      <xsd:attribute name="managed" type="xsd:boolean" default="true"/>
+   </xsd:complexType>
+   <xsd:complexType name="ResultDescriptor">
+      <xsd:attribute name="columnIndex" type="xsd:int" default="-1"/>
+      <xsd:attribute name="columnName" type="xsd:string"/>
+      <xsd:attribute name="tableName" type="xsd:string"/>
+      <xsd:attribute name="schemaName" type="xsd:string"/>      
+      <xsd:attribute name="columnType" type="xsd:string"/>
+   </xsd:complexType>
+
+</xsd:schema>
diff --git a/das-java/trunk/rdb/src/main/resources/dasmodel4.mdl b/das-java/trunk/rdb/src/main/resources/dasmodel4.mdl
new file mode 100644
index 0000000000..476974975b
--- /dev/null
+++ b/das-java/trunk/rdb/src/main/resources/dasmodel4.mdl
@@ -0,0 +1,4622 @@
+
+(object Petal
+    version    	42
+    _written   	"Rose 4.5.8163.3"
+    charSet    	0)
+
+(object Design "Logical View"
+    is_unit    	TRUE
+    is_loaded  	TRUE
+    defaults   	(object defaults
+	rightMargin 	0.250000
+	leftMargin 	0.250000
+	topMargin  	0.250000
+	bottomMargin 	0.500000
+	pageOverlap 	0.250000
+	clipIconLabels 	TRUE
+	autoResize 	TRUE
+	snapToGrid 	TRUE
+	gridX      	31
+	gridY      	31
+	defaultFont 	(object Font
+	    size       	10
+	    face       	"Arial"
+	    bold       	FALSE
+	    italics    	FALSE
+	    underline  	FALSE
+	    strike     	FALSE
+	    color      	0
+	    default_color 	TRUE)
+	showMessageNum 	3
+	showClassOfObject 	TRUE
+	notation   	"Unified")
+    root_usecase_package 	(object Class_Category "Use Case View"
+	quid       	"4362A29901BA"
+	exportControl 	"Public"
+	global     	TRUE
+	logical_models 	(list unit_reference_list)
+	logical_presentations 	(list unit_reference_list
+	    (object UseCaseDiagram "Main"
+		quid       	"4362A2990259"
+		title      	"Main"
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list))))
+    root_category 	(object Class_Category "Logical View"
+	quid       	"4362A29901B9"
+	exportControl 	"Public"
+	global     	TRUE
+	subsystem  	"Component View"
+	quidu      	"4362A29901BB"
+	logical_models 	(list unit_reference_list
+	    (object Class_Category "config"
+		attributes 	(list Attribute_Set
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"nsURI"
+			value      	"http:///org.apache.tuscany.das.rdb/config.xsd")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"basePackage"
+			value      	"org.apache.tuscany.das.rdb"))
+		quid       	"4362A2A10169"
+		exportControl 	"Public"
+		logical_models 	(list unit_reference_list
+		    (object Class "Config"
+			quid       	"4362A2DE0045"
+			class_attributes 	(list class_attribute_list
+			    (object ClassAttribute "uri"
+				quid       	"4362A337006B"
+				type       	"String")
+			    (object ClassAttribute "dataSource"
+				quid       	"4485DF600233"
+				type       	"String")
+			    (object ClassAttribute "dataObjectModel"
+				quid       	"449AB6CD0132"
+				type       	"String")))
+		    (object Class "Command"
+			quid       	"4362A2EC01FE"
+			class_attributes 	(list class_attribute_list
+			    (object ClassAttribute "name"
+				quid       	"4362A3EC02EC"
+				type       	"String")
+			    (object ClassAttribute "SQL"
+				quid       	"4362A3EF0246"
+				type       	"String")
+			    (object ClassAttribute "kind"
+				quid       	"437903E60321"
+				type       	"String")))
+		    (object Class "Parameter"
+			quid       	"4362A3C902BA"
+			class_attributes 	(list class_attribute_list
+			    (object ClassAttribute "name"
+				quid       	"4362A40600D7"
+				type       	"String")
+			    (object ClassAttribute "columnType"
+				quid       	"4362A4090280"
+				type       	"String")))
+		    (object Class "Relationship"
+			quid       	"4362A42E03A5"
+			class_attributes 	(list class_attribute_list
+			    (object ClassAttribute "name"
+				quid       	"4362A73A0216"
+				type       	"String")
+			    (object ClassAttribute "primaryKeyTable"
+				quid       	"4362A73D0329"
+				type       	"String")
+			    (object ClassAttribute "foreignKeyTable"
+				quid       	"4362A74002FB"
+				type       	"String")
+			    (object ClassAttribute "many"
+				quid       	"4362A7430241"
+				type       	"boolean")))
+		    (object Class "Table"
+			quid       	"4362A43C0002"
+			class_attributes 	(list class_attribute_list
+			    (object ClassAttribute "tableName"
+				quid       	"4362A7B2031D"
+				type       	"String")
+			    (object ClassAttribute "typeName"
+				quid       	"4362A7C203A2"
+				type       	"String")
+			    (object ClassAttribute "create"
+				quid       	"4362A7D0024E"
+				type       	"String")
+			    (object ClassAttribute "update"
+				quid       	"4362A7D30220"
+				type       	"String")
+			    (object ClassAttribute "delete"
+				quid       	"4362A7E1031B"
+				type       	"String")))
+		    (object Class "KeyPair"
+			quid       	"4362A72E0010"
+			class_attributes 	(list class_attribute_list
+			    (object ClassAttribute "primaryKeyColumn"
+				quid       	"4362A8E702A9"
+				type       	"String")
+			    (object ClassAttribute "foreignKeyColumn"
+				quid       	"4362A8ED01AE"
+				type       	"String")))
+		    (object Class "Column"
+			quid       	"4362A75C016B"
+			class_attributes 	(list class_attribute_list
+			    (object ClassAttribute "columnName"
+				quid       	"4362A8BD02E5"
+				type       	"String")
+			    (object ClassAttribute "propertyName"
+				quid       	"4362A8C001C7"
+				type       	"String")
+			    (object ClassAttribute "converterClassName"
+				quid       	"4362A8C303A2"
+				type       	"String")
+			    (object ClassAttribute "columnType"
+				quid       	"4362A8C903A0"
+				type       	"String")
+			    (object ClassAttribute "primaryKey"
+				quid       	"437907F200F9"
+				type       	"boolean")
+			    (object ClassAttribute "generated"
+				quid       	"4379083900BF"
+				type       	"boolean")
+			    (object ClassAttribute "collision"
+				quid       	"437908E5012B"
+				type       	"boolean")))
+		    (object Class "ResultDescriptor"
+			quid       	"437B57EF0008"
+			class_attributes 	(list class_attribute_list
+			    (object ClassAttribute "columnName"
+				quid       	"437B5A6503BB"
+				type       	"String")
+			    (object ClassAttribute "tableName"
+				quid       	"437B5A6B016B"
+				type       	"String")
+			    (object ClassAttribute "columnType"
+				quid       	"437B5A6D033A"
+				type       	"String")
+			    (object ClassAttribute "name"
+				quid       	"449AB74D03DF"
+				type       	"type"
+				initv      	"initval"))
+			language   	"Java")
+		    (object Association "$UNNAMED$0"
+			quid       	"4362A3030323"
+			roles      	(list role_list
+			    (object Role "$UNNAMED$1"
+				quid       	"4362A3040108"
+				supplier   	"Logical View::config::Config"
+				quidu      	"4362A2DE0045"
+				is_navigable 	TRUE
+				is_aggregate 	TRUE)
+			    (object Role "$UNNAMED$2"
+				quid       	"4362A3040109"
+				supplier   	"Logical View::config::Command"
+				quidu      	"4362A2EC01FE"
+				client_cardinality 	(value cardinality "0..n")
+				Containment 	"By Value"
+				is_navigable 	TRUE)))
+		    (object Association "$UNNAMED$3"
+			quid       	"4362A3D302FA"
+			roles      	(list role_list
+			    (object Role "$UNNAMED$4"
+				quid       	"4362A3D40143"
+				supplier   	"Logical View::config::Command"
+				quidu      	"4362A2EC01FE"
+				is_navigable 	TRUE
+				is_aggregate 	TRUE)
+			    (object Role "$UNNAMED$5"
+				quid       	"4362A3D40144"
+				supplier   	"Logical View::config::Parameter"
+				quidu      	"4362A3C902BA"
+				client_cardinality 	(value cardinality "0..n")
+				Containment 	"By Value"
+				is_navigable 	TRUE)))
+		    (object Association "$UNNAMED$6"
+			quid       	"4362A448026C"
+			roles      	(list role_list
+			    (object Role "$UNNAMED$7"
+				quid       	"4362A4490105"
+				supplier   	"Logical View::config::Config"
+				quidu      	"4362A2DE0045"
+				is_navigable 	TRUE
+				is_aggregate 	TRUE)
+			    (object Role "$UNNAMED$8"
+				quid       	"4362A4490106"
+				supplier   	"Logical View::config::Table"
+				quidu      	"4362A43C0002"
+				client_cardinality 	(value cardinality "0..n")
+				Containment 	"By Value"
+				is_navigable 	TRUE)))
+		    (object Association "$UNNAMED$9"
+			quid       	"4362A44B0298"
+			roles      	(list role_list
+			    (object Role "$UNNAMED$10"
+				quid       	"4362A44C01AA"
+				supplier   	"Logical View::config::Config"
+				quidu      	"4362A2DE0045"
+				is_navigable 	TRUE
+				is_aggregate 	TRUE)
+			    (object Role "$UNNAMED$11"
+				quid       	"4362A44C01AB"
+				supplier   	"Logical View::config::Relationship"
+				quidu      	"4362A42E03A5"
+				client_cardinality 	(value cardinality "0..n")
+				Containment 	"By Value"
+				is_navigable 	TRUE)))
+		    (object Association "$UNNAMED$12"
+			quid       	"4362A76302A1"
+			roles      	(list role_list
+			    (object Role "$UNNAMED$13"
+				quid       	"4362A7640090"
+				supplier   	"Logical View::config::Table"
+				quidu      	"4362A43C0002"
+				is_navigable 	TRUE
+				is_aggregate 	TRUE)
+			    (object Role "$UNNAMED$14"
+				quid       	"4362A7640091"
+				supplier   	"Logical View::config::Column"
+				quidu      	"4362A75C016B"
+				client_cardinality 	(value cardinality "0..n")
+				Containment 	"By Value"
+				is_navigable 	TRUE)))
+		    (object Association "$UNNAMED$15"
+			quid       	"4362A771032E"
+			roles      	(list role_list
+			    (object Role "$UNNAMED$16"
+				quid       	"4362A7720108"
+				supplier   	"Logical View::config::Relationship"
+				quidu      	"4362A42E03A5"
+				is_navigable 	TRUE
+				is_aggregate 	TRUE)
+			    (object Role "$UNNAMED$17"
+				quid       	"4362A7720109"
+				supplier   	"Logical View::config::KeyPair"
+				quidu      	"4362A72E0010"
+				client_cardinality 	(value cardinality "0..n")
+				Containment 	"By Value"
+				is_navigable 	TRUE)))
+		    (object Association "$UNNAMED$18"
+			quid       	"437B59A10066"
+			roles      	(list role_list
+			    (object Role "$UNNAMED$19"
+				quid       	"437B59A30145"
+				supplier   	"Logical View::config::Command"
+				quidu      	"4362A2EC01FE"
+				Containment 	"By Value"
+				is_navigable 	TRUE
+				is_aggregate 	TRUE)
+			    (object Role "$UNNAMED$20"
+				quid       	"437B59A30146"
+				supplier   	"Logical View::config::ResultDescriptor"
+				quidu      	"437B57EF0008"
+				client_cardinality 	(value cardinality "0..n")
+				Containment 	"By Value"
+				is_navigable 	TRUE))))
+		logical_presentations 	(list unit_reference_list
+		    (object ClassDiagram "Main"
+			quid       	"4362A2A900AD"
+			title      	"Main"
+			zoom       	100
+			max_height 	28350
+			max_width  	21600
+			origin_x   	0
+			origin_y   	0
+			items      	(list diagram_item_list
+			    (object ClassView "Class" "Logical View::config::KeyPair" @1
+				ShowCompartmentStereotypes 	TRUE
+				IncludeAttribute 	TRUE
+				IncludeOperation 	TRUE
+				location   	(1054, 1333)
+				label      	(object ItemLabel
+				    Parent_View 	@1
+				    location   	(809, 1227)
+				    fill_color 	13434879
+				    nlines     	1
+				    max_width  	490
+				    justify    	0
+				    label      	"KeyPair")
+				icon_style 	"Icon"
+				line_color 	3342489
+				fill_color 	13434879
+				quidu      	"4362A72E0010"
+				compartment 	(object Compartment
+				    Parent_View 	@1
+				    location   	(809, 1287)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	3
+				    max_width  	496)
+				width      	508
+				height     	236
+				autoResize 	TRUE)
+			    (object ClassView "Class" "Logical View::config::Column" @2
+				ShowCompartmentStereotypes 	TRUE
+				IncludeAttribute 	TRUE
+				IncludeOperation 	TRUE
+				location   	(2015, 1519)
+				label      	(object ItemLabel
+				    Parent_View 	@2
+				    location   	(1756, 1288)
+				    fill_color 	13434879
+				    nlines     	1
+				    max_width  	518
+				    justify    	0
+				    label      	"Column")
+				icon_style 	"Icon"
+				line_color 	3342489
+				fill_color 	13434879
+				quidu      	"4362A75C016B"
+				compartment 	(object Compartment
+				    Parent_View 	@2
+				    location   	(1756, 1348)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	8
+				    max_width  	525)
+				width      	536
+				height     	486
+				autoResize 	TRUE)
+			    (object ClassView "Class" "Logical View::config::Relationship" @3
+				ShowCompartmentStereotypes 	TRUE
+				IncludeAttribute 	TRUE
+				IncludeOperation 	TRUE
+				location   	(1054, 744)
+				label      	(object ItemLabel
+				    Parent_View 	@3
+				    location   	(829, 588)
+				    fill_color 	13434879
+				    nlines     	1
+				    max_width  	450
+				    justify    	0
+				    label      	"Relationship")
+				icon_style 	"Icon"
+				line_color 	3342489
+				fill_color 	13434879
+				quidu      	"4362A42E03A5"
+				compartment 	(object Compartment
+				    Parent_View 	@3
+				    location   	(829, 648)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	5
+				    max_width  	456)
+				width      	468
+				height     	336
+				autoResize 	TRUE)
+			    (object AssociationViewNew "$UNNAMED$15" @4
+				location   	(1081, 1063)
+				stereotype 	TRUE
+				line_color 	3342489
+				quidu      	"4362A771032E"
+				roleview_list 	(list RoleViews
+				    (object RoleView "$UNNAMED$16" @5
+					Parent_View 	@4
+					location   	(-97, -84)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"4362A7720108"
+					client     	@4
+					supplier   	@3
+					line_style 	3
+					origin_attachment 	(1080, 1063)
+					terminal_attachment 	(1080, 912))
+				    (object RoleView "$UNNAMED$17" @6
+					Parent_View 	@4
+					location   	(-97, -84)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"4362A7720109"
+					client     	@4
+					supplier   	@1
+					line_style 	3
+					origin_attachment 	(1080, 1063)
+					terminal_attachment 	(1080, 1215)
+					label      	(object SegLabel @7
+					    Parent_View 	@6
+					    location   	(1135, 1112)
+					    anchor     	2
+					    anchor_loc 	1
+					    nlines     	1
+					    max_width  	15
+					    justify    	0
+					    label      	"0..*"
+					    pctDist    	0.327273
+					    height     	55
+					    orientation 	0))))
+			    (object ClassView "Class" "Logical View::config::Table" @8
+				ShowCompartmentStereotypes 	TRUE
+				IncludeAttribute 	TRUE
+				IncludeOperation 	TRUE
+				location   	(1984, 837)
+				label      	(object ItemLabel
+				    Parent_View 	@8
+				    location   	(1814, 656)
+				    fill_color 	13434879
+				    nlines     	1
+				    max_width  	340
+				    justify    	0
+				    label      	"Table")
+				icon_style 	"Icon"
+				line_color 	3342489
+				fill_color 	13434879
+				quidu      	"4362A43C0002"
+				compartment 	(object Compartment
+				    Parent_View 	@8
+				    location   	(1814, 716)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	6
+				    max_width  	346)
+				width      	358
+				height     	386
+				autoResize 	TRUE)
+			    (object AssociationViewNew "$UNNAMED$12" @9
+				location   	(1807, 1153)
+				stereotype 	TRUE
+				line_color 	3342489
+				quidu      	"4362A76302A1"
+				roleview_list 	(list RoleViews
+				    (object RoleView "$UNNAMED$13" @10
+					Parent_View 	@9
+					location   	(1032, 6)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"4362A7640090"
+					client     	@9
+					supplier   	@8
+					line_style 	3
+					origin_attachment 	(1807, 1153)
+					terminal_attachment 	(1807, 1030))
+				    (object RoleView "$UNNAMED$14" @11
+					Parent_View 	@9
+					location   	(1032, 6)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"4362A7640091"
+					client     	@9
+					supplier   	@2
+					line_style 	3
+					origin_attachment 	(1807, 1153)
+					terminal_attachment 	(1807, 1276)
+					label      	(object SegLabel @12
+					    Parent_View 	@11
+					    location   	(1861, 1166)
+					    anchor     	2
+					    anchor_loc 	1
+					    nlines     	1
+					    max_width  	15
+					    justify    	0
+					    label      	"0..*"
+					    pctDist    	0.109091
+					    height     	54
+					    orientation 	0))))
+			    (object ClassView "Class" "Logical View::config::Parameter" @13
+				ShowCompartmentStereotypes 	TRUE
+				IncludeAttribute 	TRUE
+				IncludeOperation 	TRUE
+				location   	(186, 806)
+				label      	(object ItemLabel
+				    Parent_View 	@13
+				    location   	(4, 700)
+				    fill_color 	13434879
+				    nlines     	1
+				    max_width  	364
+				    justify    	0
+				    label      	"Parameter")
+				icon_style 	"Icon"
+				line_color 	3342489
+				fill_color 	13434879
+				quidu      	"4362A3C902BA"
+				compartment 	(object Compartment
+				    Parent_View 	@13
+				    location   	(4, 760)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	3
+				    max_width  	371)
+				width      	382
+				height     	236
+				autoResize 	TRUE)
+			    (object ClassView "Class" "Logical View::config::Config" @14
+				ShowCompartmentStereotypes 	TRUE
+				IncludeAttribute 	TRUE
+				IncludeOperation 	TRUE
+				location   	(1054, 186)
+				label      	(object ItemLabel
+				    Parent_View 	@14
+				    location   	(828, 55)
+				    fill_color 	13434879
+				    nlines     	1
+				    max_width  	452
+				    justify    	0
+				    label      	"Config")
+				icon_style 	"Icon"
+				line_color 	3342489
+				fill_color 	13434879
+				quidu      	"4362A2DE0045"
+				compartment 	(object Compartment
+				    Parent_View 	@14
+				    location   	(828, 115)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	4
+				    max_width  	450)
+				width      	470
+				height     	286
+				autoResize 	TRUE)
+			    (object AssociationViewNew "$UNNAMED$9" @15
+				location   	(1054, 452)
+				label      	(object SegLabel @16
+				    Parent_View 	@15
+				    location   	(1054, 393)
+				    font       	(object Font
+					italics    	TRUE)
+				    hidden     	TRUE
+				    anchor     	1
+				    anchor_loc 	1
+				    nlines     	1
+				    max_width  	600
+				    justify    	0
+				    label      	""
+				    pctDist    	0.500000
+				    height     	60
+				    orientation 	0)
+				stereotype 	TRUE
+				line_color 	3342489
+				quidu      	"4362A44B0298"
+				roleview_list 	(list RoleViews
+				    (object RoleView "$UNNAMED$10" @17
+					Parent_View 	@15
+					location   	(-93, -354)
+					label      	(object SegLabel @18
+					    Parent_View 	@17
+					    location   	(1013, 354)
+					    hidden     	TRUE
+					    anchor     	1
+					    anchor_loc 	1
+					    nlines     	1
+					    max_width  	252
+					    justify    	0
+					    label      	""
+					    pctDist    	0.800000
+					    height     	42
+					    orientation 	0)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"4362A44C01AA"
+					client     	@15
+					supplier   	@14
+					line_style 	0)
+				    (object RoleView "$UNNAMED$11" @19
+					Parent_View 	@15
+					location   	(-93, -354)
+					label      	(object SegLabel @20
+					    Parent_View 	@19
+					    location   	(1013, 526)
+					    hidden     	TRUE
+					    anchor     	1
+					    anchor_loc 	1
+					    nlines     	1
+					    max_width  	252
+					    justify    	0
+					    label      	""
+					    pctDist    	0.597561
+					    height     	42
+					    orientation 	1)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"4362A44C01AB"
+					client     	@15
+					supplier   	@3
+					line_style 	0
+					label      	(object SegLabel @21
+					    Parent_View 	@19
+					    location   	(1011, 562)
+					    anchor     	2
+					    anchor_loc 	1
+					    nlines     	1
+					    max_width  	15
+					    justify    	0
+					    label      	"0..*"
+					    pctDist    	0.899471
+					    height     	44
+					    orientation 	1))))
+			    (object AssociationViewNew "$UNNAMED$6" @22
+				location   	(1829, 247)
+				stereotype 	TRUE
+				line_color 	3342489
+				quidu      	"4362A448026C"
+				roleview_list 	(list RoleViews
+				    (object RoleView "$UNNAMED$7" @23
+					Parent_View 	@22
+					location   	(1023, -559)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"4362A4490105"
+					client     	@22
+					supplier   	@14
+					line_style 	3
+					origin_attachment 	(1829, 247)
+					terminal_attachment 	(1289, 247))
+				    (object RoleView "$UNNAMED$8" @24
+					Parent_View 	@22
+					location   	(1023, -559)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"4362A4490106"
+					client     	@22
+					supplier   	@8
+					vertices   	(list Points
+					    (1829, 247)
+					    (1972, 247)
+					    (1972, 644))
+					line_style 	3
+					origin_attachment 	(1829, 247)
+					terminal_attachment 	(1972, 644)
+					label      	(object SegLabel @25
+					    Parent_View 	@24
+					    location   	(2031, 441)
+					    anchor     	2
+					    anchor_loc 	1
+					    nlines     	1
+					    max_width  	15
+					    justify    	0
+					    label      	"0..*"
+					    pctDist    	0.625538
+					    height     	59
+					    orientation 	0))))
+			    (object ClassView "Class" "Logical View::config::Command" @26
+				ShowCompartmentStereotypes 	TRUE
+				IncludeAttribute 	TRUE
+				IncludeOperation 	TRUE
+				location   	(186, 217)
+				label      	(object ItemLabel
+				    Parent_View 	@26
+				    location   	(63, 86)
+				    fill_color 	13434879
+				    nlines     	1
+				    max_width  	246
+				    justify    	0
+				    label      	"Command")
+				icon_style 	"Icon"
+				line_color 	3342489
+				fill_color 	13434879
+				quidu      	"4362A2EC01FE"
+				compartment 	(object Compartment
+				    Parent_View 	@26
+				    location   	(63, 146)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	4
+				    max_width  	253)
+				width      	264
+				height     	286
+				autoResize 	TRUE)
+			    (object AssociationViewNew "$UNNAMED$3" @27
+				location   	(186, 523)
+				stereotype 	TRUE
+				line_color 	3342489
+				quidu      	"4362A3D302FA"
+				roleview_list 	(list RoleViews
+				    (object RoleView "$UNNAMED$4" @28
+					Parent_View 	@27
+					location   	(-279, -500)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"4362A3D40143"
+					client     	@27
+					supplier   	@26
+					line_style 	0)
+				    (object RoleView "$UNNAMED$5" @29
+					Parent_View 	@27
+					location   	(-279, -500)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"4362A3D40144"
+					client     	@27
+					supplier   	@13
+					line_style 	0
+					label      	(object SegLabel @30
+					    Parent_View 	@29
+					    location   	(241, 600)
+					    anchor     	2
+					    anchor_loc 	1
+					    nlines     	1
+					    max_width  	15
+					    justify    	0
+					    label      	"0..*"
+					    pctDist    	0.473684
+					    height     	55
+					    orientation 	0))))
+			    (object AssociationViewNew "$UNNAMED$0" @31
+				location   	(568, 213)
+				stereotype 	TRUE
+				line_color 	3342489
+				quidu      	"4362A3030323"
+				roleview_list 	(list RoleViews
+				    (object RoleView "$UNNAMED$1" @32
+					Parent_View 	@31
+					location   	(134, -469)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"4362A3040108"
+					client     	@31
+					supplier   	@14
+					line_style 	3
+					origin_attachment 	(568, 213)
+					terminal_attachment 	(819, 213))
+				    (object RoleView "$UNNAMED$2" @33
+					Parent_View 	@31
+					location   	(134, -469)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"4362A3040109"
+					client     	@31
+					supplier   	@26
+					line_style 	3
+					origin_attachment 	(568, 213)
+					terminal_attachment 	(318, 213)
+					label      	(object SegLabel @34
+					    Parent_View 	@33
+					    location   	(360, 261)
+					    anchor     	2
+					    anchor_loc 	1
+					    nlines     	1
+					    max_width  	15
+					    justify    	0
+					    label      	"0..*"
+					    pctDist    	0.831858
+					    height     	48
+					    orientation 	0))))
+			    (object ClassView "Class" "Logical View::config::ResultDescriptor" @35
+				ShowCompartmentStereotypes 	TRUE
+				IncludeAttribute 	TRUE
+				IncludeOperation 	TRUE
+				location   	(465, 1240)
+				label      	(object ItemLabel
+				    Parent_View 	@35
+				    location   	(248, 1084)
+				    fill_color 	13434879
+				    nlines     	1
+				    max_width  	434
+				    justify    	0
+				    label      	"ResultDescriptor")
+				icon_style 	"Icon"
+				line_color 	3342489
+				fill_color 	13434879
+				quidu      	"437B57EF0008"
+				compartment 	(object Compartment
+				    Parent_View 	@35
+				    location   	(248, 1144)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	5
+				    max_width  	431)
+				width      	452
+				height     	336
+				annotation 	8
+				autoResize 	TRUE)
+			    (object AssociationViewNew "$UNNAMED$18" @36
+				location   	(484, 626)
+				stereotype 	TRUE
+				line_color 	3342489
+				quidu      	"437B59A10066"
+				roleview_list 	(list RoleViews
+				    (object RoleView "$UNNAMED$19" @37
+					Parent_View 	@36
+					location   	(50, -614)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"437B59A30145"
+					client     	@36
+					supplier   	@26
+					vertices   	(list Points
+					    (484, 626)
+					    (484, 347)
+					    (318, 347))
+					line_style 	3
+					origin_attachment 	(484, 626)
+					terminal_attachment 	(318, 347))
+				    (object RoleView "$UNNAMED$20" @38
+					Parent_View 	@36
+					location   	(50, -614)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"437B59A30146"
+					client     	@36
+					supplier   	@35
+					line_style 	3
+					origin_attachment 	(484, 626)
+					terminal_attachment 	(484, 1072)
+					label      	(object SegLabel @39
+					    Parent_View 	@38
+					    location   	(538, 1027)
+					    anchor     	2
+					    anchor_loc 	1
+					    nlines     	1
+					    max_width  	15
+					    justify    	0
+					    label      	"0..*"
+					    pctDist    	0.900000
+					    height     	54
+					    orientation 	0)))))))))
+	logical_presentations 	(list unit_reference_list
+	    (object ClassDiagram "Main"
+		quid       	"4362A299025A"
+		title      	"Main"
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list
+		    (object CategoryView "Logical View::config" @40
+			location   	(682, 589)
+			label      	(object ItemLabel
+			    Parent_View 	@40
+			    location   	(538, 505)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	288
+			    justify    	0
+			    label      	"config")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"4362A2A10169"
+			width      	300
+			height     	180)))))
+    root_subsystem 	(object SubSystem "Component View"
+	quid       	"4362A29901BB"
+	physical_models 	(list unit_reference_list)
+	physical_presentations 	(list unit_reference_list
+	    (object Module_Diagram "Main"
+		quid       	"4362A2990258"
+		title      	"Main"
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list))))
+    process_structure 	(object Processes
+	quid       	"4362A29901BC"
+	ProcsNDevs 	(list
+	    (object Process_Diagram "Deployment View"
+		quid       	"4362A29901BE"
+		title      	"Deployment View"
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list))))
+    properties 	(object Properties
+	attributes 	(list Attribute_Set
+	    (object Attribute
+		tool       	"Ecore"
+		name       	"propertyId"
+		value      	"809135969")
+	    (object Attribute
+		tool       	"Ecore"
+		name       	"default__Category"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"packageName"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"nsPrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"nsURI"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"basePackage"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"prefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"annotation"
+			value      	"")))
+	    (object Attribute
+		tool       	"Ecore"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"classifierName"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"constraints"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"xmlName"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"xmlContentKind"
+			value      	("ContentKind" 0))
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"ContentKind"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Unspecified"
+				value      	0)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Empty"
+				value      	1)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Simple"
+				value      	2)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Mixed"
+				value      	3)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"ElementOnly"
+				value      	4)))
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"annotation"
+			value      	"")))
+	    (object Attribute
+		tool       	"Ecore"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"operationName"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"isUnique"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"annotation"
+			value      	"")))
+	    (object Attribute
+		tool       	"Ecore"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"attributeName"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"isTransient"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"isVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"isChangeable"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"isUnsettable"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"isUnique"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"isID"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"visibility"
+			value      	("VisibilityKind" 0))
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"VisibilityKind"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Unspecified"
+				value      	0)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"None"
+				value      	1)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Read-only"
+				value      	2)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Read-write"
+				value      	3)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Read-only unsettable"
+				value      	4)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Read-write unsettable"
+				value      	5)))
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"xmlName"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"xmlNamespace"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"xmlFeatureKind"
+			value      	("FeatureKind" 0))
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"FeatureKind"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Unspecified"
+				value      	0)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Simple"
+				value      	1)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Attribute"
+				value      	2)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Element"
+				value      	4)))
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"annotation"
+			value      	"")))
+	    (object Attribute
+		tool       	"Ecore"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"referenceName"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"isTransient"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"isVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"isChangeable"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"isUnsettable"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"isResolveProxies"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"visibility"
+			value      	("VisibilityKind" 0))
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"VisibilityKind"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Unspecified"
+				value      	0)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"None"
+				value      	1)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Read-only"
+				value      	2)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Read-write"
+				value      	3)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Read-only unsettable"
+				value      	4)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Read-write unsettable"
+				value      	5)))
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"xmlName"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"xmlNamespace"
+			value      	"")
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"xmlFeatureKind"
+			value      	("FeatureKind" 0))
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"FeatureKind"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Unspecified"
+				value      	0)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Simple"
+				value      	1)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Attribute"
+				value      	2)
+			    (object Attribute
+				tool       	"Ecore"
+				name       	"Element"
+				value      	4)))
+		    (object Attribute
+			tool       	"Ecore"
+			name       	"annotation"
+			value      	"")))
+	    (object Attribute
+		tool       	"DDL"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"DDL"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"DDL"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DataBase"
+			value      	("DataBaseSet" 800))
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DataBaseSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"DDL"
+				name       	"ANSI"
+				value      	800)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"Oracle"
+				value      	801)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"SQLServer"
+				value      	802)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"Sybase"
+				value      	803)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"Watcom"
+				value      	804)))
+		    (object Attribute
+			tool       	"DDL"
+			name       	"PrimaryKeyColumnName"
+			value      	"Id")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"PrimaryKeyColumnType"
+			value      	"NUMBER(5)")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"ViewName"
+			value      	"V_")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"TableName"
+			value      	"T_")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"InheritSuffix"
+			value      	"_V")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DropClause"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"BaseViews"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DDLScriptFilename"
+			value      	"DDL1.SQL")))
+	    (object Attribute
+		tool       	"DDL"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"DDL"
+			name       	"ColumnType"
+			value      	"VARCHAR")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"Length"
+			value      	"")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"NullsOK"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"PrimaryKey"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"Unique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"CompositeUnique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"CheckConstraint"
+			value      	"")))
+	    (object Attribute
+		tool       	"DDL"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"framework"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"IDL"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"StopOnError"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GeneratePreserveRegions"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"ImplementationType"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"ConstValue"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateDefaultSpecifier"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"DefaultSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IDLElement"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IDLSpecificationType"
+			value      	("IDLSpecSet" 22))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IDLSpecSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Interface"
+				value      	22)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Typedef"
+				value      	54)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Enumeration"
+				value      	8)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Const"
+				value      	71)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Exception"
+				value      	61)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Struct"
+				value      	51)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Union"
+				value      	81)))))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateIDLModule"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"InclusionProtectionSymbol"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"OperationIsOneWay"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Context"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Raises"
+			value      	"")))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CaseSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IsConst"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"ConstValue"
+			value      	"")))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Has"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"NameIfUnlabeled"
+			value      	"the_$supplier")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"BoundedHasRelType"
+			value      	("HasRelTypeSet" 47))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"HasRelTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"NameIfUnlabeled"
+			value      	"the_$supplier")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"BoundedRoleType"
+			value      	("AssocTypeSet" 47))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"AssocTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Uses"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateForwardReference"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Subsystem"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Directory"
+			value      	"AUTO GENERATE")))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Java"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"StopOnError"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"Java"
+			name       	"UsePrefixes"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"InstanceVariablePrefix"
+			value      	"m_")
+		    (object Attribute
+			tool       	"Java"
+			name       	"ClassVariablePrefix"
+			value      	"s_")
+		    (object Attribute
+			tool       	"Java"
+			name       	"DefaultAttributeDataType"
+			value      	"int")
+		    (object Attribute
+			tool       	"Java"
+			name       	"DefaultOperationReturnType"
+			value      	"void")))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"Final"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateDefaultConstructor"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"ConstructorIs"
+			value      	("Ctor_Set" 62))
+		    (object Attribute
+			tool       	"Java"
+			name       	"Ctor_Set"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"Public"
+				value      	62)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Protected"
+				value      	63)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Private"
+				value      	64)))
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateFinalizer"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateStaticInitializer"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateInstanceInitializer"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"CmIdentification"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"AdditionalImports"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"CmIdentification"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"AdditionalImports"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"Abstract"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Static"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Final"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Native"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Synchronized"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Final"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Transient"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Volatile"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"ContainerClass"
+			value      	"")
+		    (object Attribute
+			tool       	"Java"
+			name       	"InitialValue"
+			value      	"")
+		    (object Attribute
+			tool       	"Java"
+			name       	"Final"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Transient"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Volatile"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Java"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"propertyId"
+		value      	"360000002")
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"DDLScriptFilename"
+			value      	"DDL1.SQL")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"DropClause"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"PrimaryKeyColumnName"
+			value      	"_ID")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"PrimaryKeyColumnType"
+			value      	"NUMBER(5,0)")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"SchemaNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"SchemaNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TableNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TableNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TypeNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TypeNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"ViewNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"ViewNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"VarrayNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"VarrayNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"NestedTableNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"NestedTableNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"ObjectTableNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"ObjectTableNameSuffix"
+			value      	"")))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsSchema"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OID"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"WhereClause"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CheckConstraint"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CollectionTypeLength"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CollectionTypePrecision"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CollectionTypeScale"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CollectionOfREFS"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"MethodKind"
+			value      	("MethodKindSet" 1903))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OverloadID"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OrderNumber"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsReadNoDataState"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsReadNoProcessState"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsWriteNoDataState"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsWriteNoProcessState"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsSelfish"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerType"
+			value      	("TriggerTypeSet" 1801))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerEvent"
+			value      	("TriggerEventSet" 1601))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerText"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerReferencingNames"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerForEach"
+			value      	("TriggerForEachSet" 1701))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerWhenClause"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"MethodKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"MapMethod"
+				value      	1901)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"OrderMethod"
+				value      	1902)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Function"
+				value      	1903)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Procedure"
+				value      	1904)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Operator"
+				value      	1905)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Constructor"
+				value      	1906)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Destructor"
+				value      	1907)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Trigger"
+				value      	1908)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Calculated"
+				value      	1909)))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"AFTER"
+				value      	1801)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"BEFORE"
+				value      	1802)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSTEAD OF"
+				value      	1803)))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerForEachSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"ROW"
+				value      	1701)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"STATEMENT"
+				value      	1702)))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerEventSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSERT"
+				value      	1601)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"UPDATE"
+				value      	1602)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"DELETE"
+				value      	1603)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSERT OR UPDATE"
+				value      	1604)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSERT OR DELETE"
+				value      	1605)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"UPDATE OR DELETE"
+				value      	1606)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSERT OR UPDATE OR DELETE"
+				value      	1607)))))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OrderNumber"
+			value      	"")))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OrderNumber"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsUnique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"NullsAllowed"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"Length"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"Precision"
+			value      	"2")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"Scale"
+			value      	"6")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsIndex"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsPrimaryKey"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CompositeUnique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CheckConstraint"
+			value      	"")))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Repository"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"cg"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"UseMSVC"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileExtension"
+			value      	"h")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileBackupExtension"
+			value      	"h~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileTemporaryExtension"
+			value      	"h#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileExtension"
+			value      	"cpp")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileBackupExtension"
+			value      	"cp~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileTemporaryExtension"
+			value      	"cp#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StopOnError"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ErrorLimit"
+			value      	30)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"$ROSECPP_SOURCE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"PathSeparator"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileNameFormat"
+			value      	"128vx_b")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BooleanType"
+			value      	"int")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowTemplates"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowExplicitInstantiations"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowProtectedInheritance"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CommentWidth"
+			value      	60)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByValueContainer"
+			value      	"$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByValueContainer"
+			value      	"OptionalByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByValueContainer"
+			value      	"BoundedListByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByValueContainer"
+			value      	"BoundedSetByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByReferenceContainer"
+			value      	"BoundedListByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByReferenceContainer"
+			value      	"BoundedSetByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByValueContainer"
+			value      	"UnboundedListByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByValueContainer"
+			value      	"UnboundedSetByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByReferenceContainer"
+			value      	"UnboundedListByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByReferenceContainer"
+			value      	"UnboundedSetByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByValueContainer"
+			value      	"AssociationByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByValueContainer"
+			value      	"DictionaryByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByReferenceContainer"
+			value      	"AssociationByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByReferenceContainer"
+			value      	"DictionaryByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GeneratePreserveRegions"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ImplementationType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ClassKey"
+			value      	"class")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"PutBodiesInSpec"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDefaultConstructor"
+			value      	("GenerateSet" 199))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DefaultConstructorVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineDefaultConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ExplicitDefaultConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateCopyConstructor"
+			value      	("GenerateSet" 199))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CopyConstructorVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineCopyConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ExplicitCopyConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDestructor"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DestructorVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DestructorKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineDestructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssignmentOperation"
+			value      	("GenerateSet" 199))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssignmentVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssignmentKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineAssignmentOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEqualityOperations"
+			value      	("GenerateSet" 199))
+		    (object Attribute
+			tool       	"cg"
+			name       	"EqualityVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"EqualityKind"
+			value      	("FriendKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineEqualityOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateRelationalOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"RelationalVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"RelationalKind"
+			value      	("FriendKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineRelationalOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateStorageMgmtOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StorageMgmtVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineStorageMgmtOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSubscriptOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SubscriptVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"SubscriptKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"SubscriptResultType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSubscriptOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDereferenceOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DereferenceVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DereferenceKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DereferenceResultType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineDereferenceOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateIndirectionOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IndirectionVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IndirectionKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IndirectionResultType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineIndirectionOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateStreamOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StreamVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineStreamOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ThreeKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"KindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"FriendKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"DeclareAndDefine"
+				value      	199)
+			    (object Attribute
+				tool       	"cg"
+				name       	"DeclareOnly"
+				value      	205)
+			    (object Attribute
+				tool       	"cg"
+				name       	"DoNotDeclare"
+				value      	206)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"VisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ConstValue"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDefaultSpecifier"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DefaultSpecifier"
+			value      	"")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowExtensionlessFileName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InclusionProtectionSymbol"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeFormat"
+			value      	(value Text 
+|// $package
+|#include "$file"
+|
+			))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludePrecompiledHeader"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeOrder"
+			value      	"AMIR")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyle"
+			value      	("InliningStyleSet" 207))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyleSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"InClassDeclaration"
+				value      	208)
+			    (object Attribute
+				tool       	"cg"
+				name       	"FollowingClassDeclaration"
+				value      	207)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"TypesDefined"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeClosure"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowExtensionlessFileName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeFormat"
+			value      	(value Text 
+|// $package
+|#include "$file"
+|
+			))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludePrecompiledHeader"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeOrder"
+			value      	"AMIR")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyle"
+			value      	("InliningStyleSet" 207))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyleSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"InClassDeclaration"
+				value      	208)
+			    (object Attribute
+				tool       	"cg"
+				name       	"FollowingClassDeclaration"
+				value      	207)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"TypesDefined"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeClosure"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationKind"
+			value      	("OperationKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationIsConst"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationIsExplicit"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Inline"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"EntryCode"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ExitCode"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"BodyAnnotations"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationIsOneWay"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Context"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"Raises"
+			value      	"")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Has"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"Ordered"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"NameIfUnlabeled"
+			value      	"the_$supplier")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtRelationshipVisibility"
+				value      	210)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutability"
+			value      	("DataMemberMutabilitySet" 0))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutabilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unrestricted"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Mutable"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Const"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberIsVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberFieldSize"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InitialValue"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetName"
+			value      	"get_$relationship")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetName"
+			value      	"set_$relationship")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKindsSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerClass"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SelectorName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SelectorType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConstSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"False"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"True"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Same_As_Function"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetByReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ForwardReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedHasRelType"
+			value      	("HasRelTypeSet" 47))
+		    (object Attribute
+			tool       	"cg"
+			name       	"HasRelTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Association"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"NameIfUnlabeled"
+			value      	"the_$targetClass")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Inherit"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"InstanceArguments"
+			value      	"")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ForwardReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"NameIfUnlabeled"
+			value      	"the_$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberName"
+			value      	"$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtRelationshipVisibility"
+				value      	210)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutability"
+			value      	("DataMemberMutabilitySet" 0))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutabilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unrestricted"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Mutable"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Const"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberIsVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberFieldSize"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InitialValue"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerClass"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerGet"
+			value      	"$data.get($keys)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerSet"
+			value      	"$data.set($keys,$value)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedContainer"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassContainer"
+			value      	"$supplier *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassInitialValue"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKindsSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetByReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetName"
+			value      	"get_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConstSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"False"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"True"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Same_As_Function"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetName"
+			value      	"set_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetSetByReference"
+			value      	("QualifiedGetSetByReferenceSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetSetByReferenceSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"False"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"True"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Same_As_GetSetByReference"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateQualifiedGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetName"
+			value      	"get_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineQualifiedGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateQualifiedSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedSetName"
+			value      	"set_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedSetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineQualifiedSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssocClassDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberName"
+			value      	"$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtRelationshipVisibility"
+				value      	210)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberMutability"
+			value      	("DataMemberMutabilitySet" 0))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutabilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unrestricted"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Mutable"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Const"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberIsVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssocClassGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetName"
+			value      	"get_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineAssocClassGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssocClassSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassSetName"
+			value      	"set_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassSetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineAssocClassSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassForwardReferenceOnly"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedRoleType"
+			value      	("AssocTypeSet" 47))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberName"
+			value      	"$attribute")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtAttributeVisibility"
+				value      	211)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutability"
+			value      	("DataMemberMutabilitySet" 0))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutabilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unrestricted"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Mutable"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Const"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberIsVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberFieldSize"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetName"
+			value      	"get_$attribute")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetName"
+			value      	"set_$attribute")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKindsSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConstSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"False"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"True"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Same_As_Function"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetByReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CaseSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsReadOnly"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Uses"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"ForwardReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"BodyReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateForwardReference"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Subsystem"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DirectoryIsOnSearchList"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"PrecompiledHeader"
+			value      	"")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Category"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsNamespace"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Indent"
+			value      	2)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Version"
+			value      	"5.0")))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCClassTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCClassTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Interface_Part"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Connection_Part"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Class_Factory"
+				value      	3)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CObjectFunctionality"
+			value      	("CObjectFunctionalitySet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CObjectFunctionalitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dynamic"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dyncreate"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Serial"
+				value      	3)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateOverrideGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateDataGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DATA_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateFieldGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_FIELD_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateMessageGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateMessageMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_MSG_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MESSAGE_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEFactory"
+			value      	("OLEFactorySet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEFactorySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Built_in"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Simple"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Licensed"
+				value      	3)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEName"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEClassID"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateOLECtlType"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLECtlType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateOLETypeLib"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLETypeLibID"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLETypeLibMajor"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLETypeLibMinor"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GeneratePropPageIDs"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEPropPageIDs"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateDispatchMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockProperties"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockFunctions"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DispatchDefValue"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateDispIdEnum"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISP_ID_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateInterfaceMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"INTERFACE_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"InitInterface"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateEventMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENT_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"EVENT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockEvents"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateEventSinkMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENTSINK_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENTSINK_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"EVENTSINK_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PropNotifySinks"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateConnectionMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CONNECTION_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"ConnectionPointIID"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"InheritanceType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLECommands"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MFCDeclares"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MFCImplements"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"ATL_Declares"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateCOMMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"COM_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateConnectionPointMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CONNECTION_POINT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateMsgMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSG_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GeneratePropertyMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PROPERTY_MAP_Entries"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCOperationTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCOperationTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Virtual_Override"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Message_Handler"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dispatch_Handler"
+				value      	3)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Event_Firing_Function"
+				value      	4)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Event_Sink_Handler"
+				value      	5)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Std_OLE_Method"
+				value      	6)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Command_Parser"
+				value      	7)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Property_Get_Function"
+				value      	8)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Property_Set_Function"
+				value      	9)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Property_Notify_Function"
+				value      	10)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Macro_Generated_Function"
+				value      	11)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_MSG_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MESSAGE_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"EVENT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENTSINK_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"EVENTSINK_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CallType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"BodyImage"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCAttributeTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCAttributeTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Member_Property"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Get_Set_Property"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dialog_Data"
+				value      	3)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Field_Data"
+				value      	4)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Stock_Property"
+				value      	5)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PointerBase"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CallType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockPropertyImplementation"
+			value      	"")))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Has"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCAttributeTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCAttributeTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Member_Property"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Get_Set_Property"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dialog_Data"
+				value      	3)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Field_Data"
+				value      	4)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Stock_Property"
+				value      	5)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PointerBase"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CallType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockPropertyImplementation"
+			value      	"")))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCAttributeTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCAttributeTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Member_Property"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Get_Set_Property"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dialog_Data"
+				value      	3)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Field_Data"
+				value      	4)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Stock_Property"
+				value      	5)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PointerBase"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CallType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockPropertyImplementation"
+			value      	"")))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateIncludesGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_INCLUDES_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateInsertLocation"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateIncludesGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_INCLUDES_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateInsertLocation"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"SCC"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"TypeLibImporter"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"propertyId"
+		value      	"783606378")
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"CreatableSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"Private"
+				value      	221)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"PublicNotCreatable"
+				value      	213)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"SingleUse"
+				value      	214)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"GlobalSingleUse"
+				value      	215)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"MultiUse"
+				value      	219)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"GlobalMultiUse"
+				value      	220)))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"OptionBase"
+			value      	"0")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"OptionExplicit"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"OptionCompare"
+			value      	("CompareSet" 202))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"Creatable"
+			value      	("CreatableSet" 221))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateInitialization"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateTermination"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"CollectionClass"
+			value      	"Collection")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"CompareSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"None"
+				value      	202)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"Binary"
+				value      	203)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"Text"
+				value      	204)))))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"OperationName"
+			value      	"$operation")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"LibraryName"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"AliasName"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"IsStatic"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"EntryCode"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ExitCode"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"IsConst"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"New"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"WithEvents"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"Subscript"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"NameIfUnlabeled"
+			value      	"the$supplier")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateGetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateSetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateLetOperation"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"New"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"WithEvents"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"Subscript"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"NameIfUnlabeled"
+			value      	"the$supplier")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateGetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateSetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateLetOperation"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Inherit"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ImplementsDelegation"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ProjectFile"
+			value      	"")))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"VisualStudio"
+		name       	"HiddenTool"
+		value      	FALSE))
+	quid       	"4362A29901BD"))
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java
new file mode 100644
index 0000000000..eca81623d8
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java
@@ -0,0 +1,186 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.util.Iterator;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.BookData;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class AliasTests extends DasTest {
+
+    protected void setUp() throws Exception {
+    
+        super.setUp();
+        new BookData(getAutoConnection()).refresh();
+        new CustomerData(getAutoConnection()).refresh();
+    }
+
+    /**
+     * Tests the use of column aliasing. The property name change is found in the 
+     * BooksConfig.xml file Otherwise similar to testTableAlias
+     * 
+     * @throws Exception
+     */
+    public void testColumnAlias() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("BooksConfigWithAlias.xml"), getConnection());
+
+        Command select = das.getCommand("get all books");
+        // select.setConnection( getConnection() );
+
+        DataObject root = select.executeQuery();
+
+        DataObject book = root.getDataObject("Book[2]");
+        book.set("Writer", "Dr. Seuss");
+
+        das.applyChanges(root);
+
+        select = das.getCommand("get Cat in the Hat");
+
+        root = select.executeQuery();
+        // Ensure the change actually updated
+        assertEquals("Dr. Seuss", root.getString("Book[1]/Writer"));
+    }
+
+    /**
+     * Tests to ensure that columns are being properly read when using an Alias, 
+     * just a bunch of simple creating, renaming, and deleting of entries
+     * while using an alias.
+     */
+    public void testColumnData() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("BooksConfigWithAlias.xml"), getConnection());
+
+        Command select = das.getCommand("get book by ID");
+        select.setParameter(1, new Integer(1));
+
+        // *******Verifys a column entry is readable
+        DataObject root = select.executeQuery();
+        assertEquals("Fyodor Dostoevsky", root.getString("Book[1]/Writer"));
+
+        DataObject bookToChange = root.getDataObject("Book[1]");
+        bookToChange.set("Writer", "Fyodor Dostoevskii"); // His last name COULD be spelt like that too!
+
+        das.applyChanges(root);
+
+        // *******Verifys correct information in entry after a column data is changed
+        select = das.getCommand("get all books");
+        // select.setConnection(getConnection());
+
+        root = select.executeQuery();
+        bookToChange = null;
+        Iterator i = root.getList("Book").iterator();
+        while (i.hasNext()) {
+            DataObject d = (DataObject) i.next();
+            if ("Fyodor Dostoevskii".equals(d.getString("Writer"))) {
+                bookToChange = d;
+            }
+        }
+        assertFalse(bookToChange == null);
+
+        bookToChange.delete();
+
+        das.applyChanges(root);
+
+        // *******Verifys correct in table, after entry is deleted
+        select = das.getCommand("get all books");
+        // select.setConnection(getConnection());
+
+        root = select.executeQuery();
+        assertEquals(1, root.getList("Book").size());
+        assertEquals("Doctor Seuss", root.getString("Book[1]/Writer"));
+    }
+
+    /**
+     * Test to check if updating a table works when using Aliasing Previously this was test_4 in ExceptionTests.
+     */
+    public void testTableAlias() throws Exception {
+
+        // Create Table config programmatically
+        // ConfigHelper helper = new ConfigHelper();
+        // helper.addTable("BOOK", "Book");
+        // helper.addPrimaryKey("BOOK.BOOK_ID");
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("BooksConfigWithAlias.xml"), getConnection());
+        Command select = das.getCommand("get book by ID");
+        select.setParameter(1, new Integer(1));
+
+        DataObject root = select.executeQuery();
+
+        DataObject newBook = root.createDataObject("Book");
+        newBook.setString("NAME", "Ant Colonies of the Old World");
+        newBook.setInt("BOOK_ID", 1001);
+        root.getList("Book").add(newBook);
+
+        das.applyChanges(root);
+
+        root = select.executeQuery();
+
+        // Verify
+        select.setParameter(1, new Integer(1001));
+        root = select.executeQuery();
+
+        assertEquals("Ant Colonies of the Old World", root.getString("Book[1]/NAME"));
+    }
+
+    /**
+     * Test ability to assign DataObject type and propertyaliases with xml file
+     */
+    public void testRead() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("customerMapping.xml"), getConnection());
+        // Read a customer
+        Command select = das.createCommand("SELECT * FROM CUSTOMER WHERE CUSTOMER.ID = 1");
+
+        DataObject root = select.executeQuery();
+        DataObject customer = root.getDataObject("Customer[1]");
+        assertEquals(1, customer.getInt("id"));
+        assertEquals("1212 foobar lane", customer.getString("address"));
+        assertEquals("Williams", customer.getString("lastname"));
+
+    }
+    
+    /**
+     * Test modify PK value
+     */
+    public void testModifyPK() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("customerMapping.xml"), getConnection());
+        // Read a customer
+        Command select = das.createCommand("SELECT * FROM CUSTOMER WHERE CUSTOMER.ID = 1");
+
+        DataObject root = select.executeQuery();
+        DataObject customer = root.getDataObject("Customer[1]");
+        assertEquals(1, customer.getInt("id"));
+
+        customer.setInt("id", 100);
+        das.applyChanges(root);
+        
+        select = das.createCommand("SELECT * FROM CUSTOMER WHERE CUSTOMER.ID = 100");
+        root = select.executeQuery();
+        customer = root.getDataObject("Customer[1]");
+        assertEquals(100, customer.getInt("id"));
+    }    
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
new file mode 100644
index 0000000000..3a7c4560cb
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
@@ -0,0 +1,153 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.CompanyData;
+import org.apache.tuscany.das.rdb.test.data.CompanyDeptData;
+import org.apache.tuscany.das.rdb.test.data.DepEmpData;
+import org.apache.tuscany.das.rdb.test.data.DepartmentData;
+import org.apache.tuscany.das.rdb.test.data.EmployeeData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class BestPracticeTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new CompanyData(getAutoConnection()).refresh();
+        new DepartmentData(getAutoConnection()).refresh();
+        new EmployeeData(getAutoConnection()).refresh();
+        new CompanyDeptData(getAutoConnection()).refresh();
+        new DepEmpData(getAutoConnection()).refresh();
+
+    }
+
+    //Read list of companies
+    public void testReadCompanies() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection());
+        Command read = das.getCommand("all companies");
+        DataObject root = read.executeQuery();
+        assertEquals(3, root.getList("COMPANY").size());
+
+    }
+
+    //Read list of companies
+    public void testReadCompaniesWithDepartments() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection());
+        Command read = das.getCommand("all companies and departments");
+        DataObject root = read.executeQuery();
+
+        Iterator i = root.getList("COMPANY").iterator();
+        while (i.hasNext()) {
+            DataObject d = (DataObject) i.next();
+            List departments = d.getList("departments");
+            if (d.getString("NAME").equals("Do-rite plumbing") || d.getString("NAME").equals("ACME Publishing")) {
+                assertEquals(0, departments.size());
+            } else {
+                assertEquals(1, departments.size());
+            }
+        }
+
+    }
+
+    public void testddDepartmentToFirstCompany() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection());
+        Command read = das.getCommand("all companies and departments");
+        DataObject root = read.executeQuery();
+        DataObject firstCustomer = root.getDataObject("COMPANY[1]");
+        int deptCount = firstCustomer.getList("departments").size();
+
+        DataObject newDepartment = root.createDataObject("DEPARTMENT");
+        firstCustomer.getList("departments").add(newDepartment);
+
+        das.applyChanges(root);
+
+        //verify
+        root = read.executeQuery();
+        firstCustomer = root.getDataObject("COMPANY[1]");
+        assertEquals(deptCount + 1, firstCustomer.getList("departments").size());
+    }
+
+    /**
+     * Test ability to correctly flush heirarchy of objects that have generated
+     * keys
+     */
+    public void testFlushCreateHeirarchy() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection());
+        Command select = das.getCommand("all companies and departments");
+        DataObject root = select.executeQuery();
+
+        // Create a new Company
+        DataObject company = root.createDataObject("COMPANY");
+        company.setString("NAME", "Do-rite Pest Control");
+
+        // Create a new Department
+        //Do not set ID or CompanyID since these are generated
+        DataObject department = root.createDataObject("DEPARTMENT");
+        department.setString("NAME", "Do-rite Pest Control");
+        department.setString("LOCATION", "The boonies");
+        department.setString("DEPNUMBER", "101");
+
+        // Associate the new department with the new company
+        company.getList("departments").add(department);
+
+        // Get apply command
+        das.applyChanges(root);
+
+        // Save the id
+        Integer id = (Integer) company.get("ID");
+
+        // Verify the change
+
+        select = das.getCommand("company by id with departments");
+        select.setParameter(1, id);
+        root = select.executeQuery();
+        assertEquals("Do-rite Pest Control", root.getDataObject("COMPANY[1]").getString("NAME"));
+
+    }
+
+    /**
+     * Test ability to get an empty graph with the Types/Properties intact
+     */
+    public void testGetEmptyGraph() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection());
+
+        Command select = das.getCommand("company by id with departments");
+        Integer idOfNoExistingCompany = new Integer(-1);
+        select.setParameter(1, idOfNoExistingCompany);
+        DataObject root = select.executeQuery();
+
+        //Will fail if there is no property named "COMPANY"
+        assertEquals(0, root.getList("COMPANY").size());
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
new file mode 100644
index 0000000000..60b0d05ead
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
@@ -0,0 +1,111 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class CUDGeneration extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new CustomerData(getAutoConnection()).refresh();
+        new OrderData(getAutoConnection()).refresh();
+    }
+
+    /**
+     * This tests provides invalid SQL and should fail on Apply.execute. If not 
+     * then the engine is generating CUD and overlooking the provided
+     * statements.
+     */
+    public void testCUDGeneration1() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMappingWithInvalidCUD.xml"), getConnection());
+
+        // Read customer with particular ID
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+
+        DataObject customer = (DataObject) root.get("CUSTOMER[1]");
+
+        // Modify customer
+        customer.set("LASTNAME", "Pavick");
+
+        // Flush changes
+        try {
+            das.applyChanges(root);
+            fail("Should fail with invalid SQL.  Provided CUD not used!!");
+        } catch (RuntimeException e) {
+            // Everything OK
+        }
+
+    }
+
+    public void testInsertCUDGeneration() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+
+        DataObject customer = root.createDataObject("CUSTOMER");
+        customer.setInt("ID", 720);
+        customer.set("LASTNAME", "foobar");
+        customer.set("ADDRESS", "asdfasdf");
+
+        das.applyChanges(root);
+
+        select = das.createCommand("select * from CUSTOMER where ID = 720");
+        root = select.executeQuery();
+
+        assertEquals(1, root.getList("CUSTOMER").size());
+    }
+
+    public void testReadModifyApply() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("1xM_mapping_no_cud.xml"), getConnection());
+
+        // Build the select command to read a specific customer and related
+        // orders
+        Command select = das.createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON " 
+                + "CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
+
+        // Parameterize the command
+        select.setParameter(1, new Integer(1));
+
+        // Get the graph
+        DataObject root = select.executeQuery();
+
+        // Modify a customer
+        DataObject customer = (DataObject) root.get("Customer[1]");
+        customer.set("LASTNAME", "Pavick");
+
+        // Modify an order
+        DataObject order = (DataObject) customer.get("orders[1]");
+        order.setString("PRODUCT", "Kitchen Sink 001");
+
+        das.applyChanges(root);
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CheckSupportGeneratedKeys.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CheckSupportGeneratedKeys.java
new file mode 100644
index 0000000000..8e3c983e63
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CheckSupportGeneratedKeys.java
@@ -0,0 +1,167 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.ConfigHelper;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.test.data.CompanyData;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class CheckSupportGeneratedKeys extends DasTest {
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new CustomerData(getAutoConnection()).refresh();//no generated keys used
+        new CompanyData(getAutoConnection()).refresh();//generated keys used
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+    
+    //<Config> useGetGeneratedKeys set to TRUE - Company
+    public void testInsert() throws Exception {
+    	ConfigHelper helper = new ConfigHelper();
+        Config config = helper.getConfig();
+        config.setGeneratedKeysSupported("true");
+        
+        DAS das = DAS.FACTORY.createDAS(config, getConnection());
+        Command insert = das.createCommand("insert into COMPANY (NAME) values (?)");
+        insert.setParameter(1, "AAA Rental");
+        insert.execute();
+        Integer key = new Integer(insert.getGeneratedKey());
+        // Verify insert
+        Command select = das.createCommand("Select ID, NAME from COMPANY where ID = ?");
+        select.setParameter(1, key);
+        DataObject root = select.executeQuery();
+        assertEquals(key, root.get("COMPANY[1]/ID"));
+    }
+
+    //<Config> useGetGeneratedKeys not set - Company (should work as default TRUE)
+    public void testInsert1() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        Config config = helper.getConfig();
+    	
+        DAS das = DAS.FACTORY.createDAS(config, getConnection());
+        Command insert = das.createCommand("insert into COMPANY (NAME) values (?)");
+        insert.setParameter(1, "AAA Rental");
+        insert.execute();
+        Integer key = new Integer(insert.getGeneratedKey());
+        // Verify insert
+        Command select = das.createCommand("Select ID, NAME from COMPANY where ID = ?");
+        select.setParameter(1, key);
+        DataObject root = select.executeQuery();
+        assertEquals(key, root.get("COMPANY[1]/ID"));
+    }
+    
+    //<Config> useGetGeneratedKeys set to FALSE - Company - 
+    // exception as insert.getGen..Keys will throw RuntimeException
+    public void testInsert2() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        Config config = helper.getConfig();
+        config.setGeneratedKeysSupported("false");
+
+        DAS das = DAS.FACTORY.createDAS(config, getConnection());
+        Command insert = das.createCommand("insert into COMPANY (NAME) values (?)");
+        insert.setParameter(1, "AAA Rental");
+        insert.execute();//this will happen as table is created with proper clause
+                
+        try{
+        	Integer key = new Integer(insert.getGeneratedKey());
+        	fail("Should not be able to retrieve key "+key);//unexpected
+        }catch(RuntimeException e){
+        	//e.printStackTrace();
+        	assertTrue(true);//expected
+        }
+    }
+    
+    //<Config> useGetGeneratedKeys set to TRUE - Customer - flag should be ignored during insert
+    public void testInsert3() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        Config config = helper.getConfig();
+        config.setGeneratedKeysSupported("true");
+    	
+        DAS das = DAS.FACTORY.createDAS(config, getConnection());
+        Command insert = das.createCommand("insert into CUSTOMER (ID, LASTNAME, ADDRESS) values (?, ?, ?)");
+        String key = "10";
+        insert.setParameter(1, key);
+        insert.setParameter(2, "CUST10");
+        insert.setParameter(3, "ADDR10");
+        insert.execute();
+        
+        // Verify insert
+        Command select = das.createCommand("Select ID, LASTNAME from CUSTOMER where ID = ?");
+        select.setParameter(1, key);
+        DataObject root = select.executeQuery();
+        assertEquals(key, root.get("CUSTOMER[1]/ID").toString());
+    }
+    
+    //<Config> useGetGeneratedKeys set to FALSE - Customer, flag has no effect
+    public void testInsert4() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        Config config = helper.getConfig();
+        config.setGeneratedKeysSupported("false");
+    	
+        DAS das = DAS.FACTORY.createDAS(config, getConnection());
+        Command insert = das.createCommand("insert into CUSTOMER (ID, LASTNAME, ADDRESS) values (?, ?, ?)");
+        String key = "10";
+        insert.setParameter(1, key);
+        insert.setParameter(2, "CUST10");
+        insert.setParameter(3, "ADDR10");
+        insert.execute();
+        try{
+        	Integer retkey = new Integer(insert.getGeneratedKey());
+        	fail("Should not be able to retrieve key "+retkey);
+        }catch(RuntimeException e){
+        	//e.printStackTrace();
+        	assertTrue(true);//expected
+        }
+        
+        // Verify insert
+        Command select = das.createCommand("Select ID, LASTNAME from CUSTOMER where ID = ?");
+        select.setParameter(1, key);
+        DataObject root = select.executeQuery();
+        assertEquals(key, root.get("CUSTOMER[1]/ID").toString());
+    }
+    
+    //<Config> useGetGeneratedKeys not set - Customer - default TRUE is ignored
+    public void testInsert5() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        Config config = helper.getConfig();
+    	
+        DAS das = DAS.FACTORY.createDAS(config, getConnection());
+        Command insert = das.createCommand("insert into CUSTOMER (ID, LASTNAME, ADDRESS) values (?, ?, ?)");
+        String key = "10";
+        insert.setParameter(1, key);
+        insert.setParameter(2, "CUST10");
+        insert.setParameter(3, "ADDR10");
+        insert.execute();
+        
+        // Verify insert
+        Command select = das.createCommand("Select ID, LASTNAME from CUSTOMER where ID = ?");
+        select.setParameter(1, key);
+        DataObject root = select.executeQuery();
+        assertEquals(key, root.get("CUSTOMER[1]/ID").toString());
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
new file mode 100644
index 0000000000..5e7bf3976f
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
@@ -0,0 +1,161 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ * This test
+ * 
+ */
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+import org.apache.tuscany.das.rdb.util.ConfigUtil;
+
+import commonj.sdo.DataObject;
+
+/**
+ * 
+ * This tests use of the XML Config file. Tests will utilize the 
+ * customer-orders-orderdetails tables. The plan is for the config file to have a
+ * section that applies to all commands and another that applies to specific commands.
+ * 
+ * The config file will be used to initialize a command factory that will then return named commands.
+ * 
+ * There will be two read commands:
+ * 
+ * 1) Return all customers 2) Return a specific customer (by ID) and related orders and order details
+ * 
+ * A test will demonstrate the creation of the factory and then reuse of commands created from the same config data file
+ * 
+ */
+public class CommandGroupTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new CustomerData(getAutoConnection()).refresh();
+        new OrderData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Read
+     */
+    public void testRead() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
+
+        Command read = das.getCommand("all customers");
+        DataObject root = read.executeQuery();
+
+        assertEquals(5, root.getList("CUSTOMER").size());
+
+    }
+
+    /**
+     * Read
+     */
+    public void testReadUsingConfigInput() throws Exception {
+        Config config = ConfigUtil.loadConfig(getConfig("CustomersOrdersConfig.xml"));
+        DAS das = DAS.FACTORY.createDAS(config, getConnection());
+
+        Command read = das.getCommand("all customers");
+        DataObject root = read.executeQuery();
+
+        assertEquals(5, root.getList("CUSTOMER").size());
+
+    }
+
+    /**
+     * Read an order using parm marker
+     */
+    public void testReadWithParmmarker() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
+
+        Command read = das.getCommand("order by id");
+        read.setParameter(1, new Integer(1));
+        DataObject root = read.executeQuery();
+
+        assertEquals("recombobulator", root.getString("ANORDER[1]/PRODUCT"));
+
+    }
+
+    /**
+     * Specify connection properties in config. Add explicit update command
+     */
+    public void testUpdate() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
+
+        Command read = das.getCommand("all customers");
+        DataObject root = read.executeQuery();
+        // Verify precondition
+        assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
+        int id = root.getInt("CUSTOMER[1]/ID");
+
+        Command update = das.getCommand("update customer");
+        update.setParameter(1, new Integer(id));
+        update.execute();
+
+        // Verify update - reuse select command
+        root = read.executeQuery();
+        assertEquals("Pavick", root.get("CUSTOMER[1]/LASTNAME"));
+
+    }
+
+    /**
+     * Read all customers, select a specific customer. Then read that 
+     * customer and related orders. Modify an order and flush changes back
+     */
+    public void testRead2() throws Exception {
+
+        // Create the group and set common connection
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
+
+        // Read all customers and remember the first one
+        Command read = das.getCommand("all customers");
+        DataObject root = read.executeQuery();
+        Integer id = (Integer) root.get("CUSTOMER[1]/ID");
+
+        // Read the specific Customer from above and its related orders
+        Command custOrders = das.getCommand("customer and orders");
+        custOrders.setParameter(1, id);
+        root = custOrders.executeQuery();
+
+        // Modify the first order and flush this change back to the database
+        root.setString("CUSTOMER[1]/orders[1]/PRODUCT", "Defibrillator");
+        Integer orderId = (Integer) root.get("CUSTOMER[1]/orders[1]/ID");
+        das.applyChanges(root);
+
+        // Verify
+        Command orderByID = das.getCommand("order by id");
+        orderByID.setParameter(1, orderId);
+        assertEquals("Defibrillator", root.getString("ANORDER[1]/PRODUCT"));
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
new file mode 100644
index 0000000000..65c2e86592
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
@@ -0,0 +1,171 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.company.CompanyFactory;
+import org.apache.tuscany.das.rdb.test.company.CompanyType;
+import org.apache.tuscany.das.rdb.test.company.DepartmentType;
+import org.apache.tuscany.das.rdb.test.company.EmployeeType;
+import org.apache.tuscany.das.rdb.test.data.CompanyData;
+import org.apache.tuscany.das.rdb.test.data.CompanyDeptData;
+import org.apache.tuscany.das.rdb.test.data.DepEmpData;
+import org.apache.tuscany.das.rdb.test.data.DepartmentData;
+import org.apache.tuscany.das.rdb.test.data.EmployeeData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
+
+public class CompanyTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new CompanyData(getAutoConnection()).refresh();
+        new DepartmentData(getAutoConnection()).refresh();
+        new EmployeeData(getAutoConnection()).refresh();
+        new CompanyDeptData(getAutoConnection()).refresh();
+        new DepEmpData(getAutoConnection()).refresh();
+
+    }
+
+    public void testSimple() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("companyMapping.xml"), getConnection());
+
+        // Build the select command
+        Command selectCommand = das.createCommand("select COMPANY.ID, COMPANY.NAME, " 
+                + "EMPLOYEE.ID, EMPLOYEE.NAME, EMPLOYEE.SN, EMPLOYEE.MANAGER, "
+                + "DEPARTMENT.ID, DEPARTMENT.NAME, DEPARTMENT.LOCATION, DEPARTMENT.DEPNUMBER from COMPANY, DEPARTMENT, EMPLOYEE "
+                + "where COMPANY.ID=DEPARTMENT.COMPANYID and DEPARTMENT.ID=EMPLOYEE.DEPARTMENTID");
+
+        // Get the graph
+        DataObject root = selectCommand.executeQuery();
+
+        // Get a company
+        DataObject company = (DataObject) root.getList("CompanyType").get(0);
+        assertEquals("MegaCorp", company.get("NAME"));
+
+        // Get a department
+        DataObject department = (DataObject) company.getList("departments").get(0);
+        assertEquals("Advanced Technologies", department.get("NAME"));
+
+        DataObject employee = (DataObject) department.getList("employees").get(0);
+        assertEquals("John Jones", employee.get("NAME"));
+    }
+
+    public void testSimpleStatic() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("companyMappingWithConverters.xml"), getConnection());
+        HelperContext context = HelperProvider.getDefaultContext();
+        CompanyFactory.INSTANCE.register(context);
+        // Build the select command
+        Command selectCommand = das.createCommand("select COMPANY.ID, COMPANY.NAME, " 
+                + "EMPLOYEE.ID, EMPLOYEE.NAME, EMPLOYEE.SN, EMPLOYEE.MANAGER, "
+                + "DEPARTMENT.ID, DEPARTMENT.NAME, DEPARTMENT.LOCATION, DEPARTMENT.DEPNUMBER from COMPANY, DEPARTMENT, EMPLOYEE "
+                + "where COMPANY.ID=DEPARTMENT.COMPANYID and DEPARTMENT.ID=EMPLOYEE.DEPARTMENTID");
+
+        // Get the graph
+        DataObject root = selectCommand.executeQuery();
+
+        CompanyType company = (CompanyType) root.getList("CompanyType").get(0);
+
+        assertEquals("MegaCorp", company.getName());
+
+        // Get a department
+        DepartmentType department = (DepartmentType) company.getDepartments().get(0);
+        assertEquals("Advanced Technologies", department.getName());
+
+        EmployeeType employee = (EmployeeType) department.getEmployees().get(0);
+
+        assertEquals("John Jones", employee.getName());
+    }
+
+    /**
+     * Default database setup inserts 3 records in COMPANY. This test verifies that these records have auto-gen keys
+     * 1,2,3 and the new created record has auto-gen key 4 in COMPANY.ID
+     * @throws Exception
+     */
+    public void testCreateAutoGenKeyStatic() throws Exception {
+    	//get DAS and select command
+    	DataObject root = null;
+    	
+    	DAS das = DAS.FACTORY.createDAS(getConfig("companyMappingWithConverters.xml"), getConnection());
+    	HelperContext context = HelperProvider.getDefaultContext();
+        CompanyFactory.INSTANCE.register(context);
+        Command selectCommand = das.getCommand("AllCompanies");
+        root = selectCommand.executeQuery();
+        assertEquals(3, root.getList("CompanyType").size());
+        //verify result
+        CompanyType company = (CompanyType) root.getList("CompanyType").get(0);
+        int startId = company.getId();
+        assertEquals(startId, company.getId());
+        assertEquals("ACME Publishing", company.getName());
+
+        company = (CompanyType) root.getList("CompanyType").get(1);
+        assertEquals(startId+1, company.getId());
+        assertEquals("Do-rite plumbing", company.getName());
+        
+        company = (CompanyType) root.getList("CompanyType").get(2);
+        assertEquals(startId+2, company.getId());
+        assertEquals("MegaCorp", company.getName());
+        
+        //create a new company. auto get keys set in config and supported in table creation statement
+        CompanyType newCompany = (CompanyType)root.createDataObject("CompanyType");
+        newCompany.setName("MyNewCompany");
+        das.applyChanges(root);        
+
+        assertEquals("MyNewCompany", newCompany.getName());
+        assertEquals(startId+3, newCompany.getId());
+    }
+    
+    public void testCreateAutoGenKeyDynamic() throws Exception {
+    	//get DAS and select command
+    	DataObject root = null;
+    	
+    	DAS das = DAS.FACTORY.createDAS(getConfig("basicCompanyDepartmentMapping.xml"), getConnection());
+        Command selectCommand = das.createCommand("select * from COMPANY");
+        root = selectCommand.executeQuery();
+        assertEquals(3, root.getList("COMPANY").size());
+        //verify result
+        DataObject company = (DataObject)root.getList("COMPANY").get(0);
+        int startId = company.getInt("ID");
+        assertEquals(startId, company.getInt("ID"));
+        assertEquals("ACME Publishing", company.getString("NAME"));
+
+        company = (DataObject)root.getList("COMPANY").get(1);
+        assertEquals(startId+1, company.getInt("ID"));
+        assertEquals("Do-rite plumbing", company.getString("NAME"));
+        
+        company = (DataObject)root.getList("COMPANY").get(2);
+        assertEquals(startId+2, company.getInt("ID"));
+        assertEquals("MegaCorp", company.getString("NAME"));
+        
+        //create a new company. auto get keys set in config and supported in table creation statement
+        DataObject newCompany = root.createDataObject("COMPANY");
+        newCompany.setString("NAME", "MyNewCompany");
+        das.applyChanges(root);        
+
+        assertEquals("MyNewCompany", newCompany.getString("NAME"));
+        assertEquals(startId+3, newCompany.getInt("ID"));       
+    }    
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java
new file mode 100644
index 0000000000..8bd3c2479a
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java
@@ -0,0 +1,265 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ * 
+ * 
+ */
+
+import java.sql.SQLException;
+import java.util.Vector;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.ConfigHelper;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.Relationship;
+import org.apache.tuscany.das.rdb.test.data.OrderDetailsData;
+import org.apache.tuscany.das.rdb.test.data.OrderDetailsDescriptionData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class CompoundKeyRelationshipTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        //new OrderData(getAutoConnection()).refresh();
+        //new ProductData(getAutoConnection()).refresh();
+        new OrderDetailsData(getAutoConnection()).refresh();
+        new OrderDetailsDescriptionData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Test ability to read a compound graph
+     */
+    public void testRead() throws Exception {
+
+        String statement = "SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC "
+                + "ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID AND " +
+                  " ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID " +
+                  " WHERE ORDERDETAILS.ORDERID = 1 AND ORDERDETAILS.PRODUCTID = 1";
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("OrderDetailsAndDescription.xml"), getConnection());
+        // Read some order details and related order details description
+        Command select = das.createCommand(statement);
+
+        DataObject root = select.executeQuery();
+        DataObject orderdetails = root.getDataObject("ORDERDETAILS[1]");
+        
+        assertEquals(2, orderdetails.getList("orderDetailsDesc").size());
+    }
+
+    /**
+     * Same as above except uses xml file for relationhip and key information.
+     * Employs CUD generation.
+     */
+    public void testRelationshipModification2() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("OrderDetailsAndDescription.xml"), getConnection());
+        // Read some order details and related order details descs
+        Command select = das
+                .createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+                		" AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID");
+
+        DataObject root = select.executeQuery();
+
+        DataObject ordDet1 = root.getDataObject("ORDERDETAILS[1]");
+        DataObject ordDet2 = root.getDataObject("ORDERDETAILS[2]");
+
+        // Save IDs
+        Integer ord1ID = (Integer) ordDet1.get("ORDERID");
+        Integer prod1ID = (Integer) ordDet1.get("PRODUCTID");
+        
+        Integer ord2ID = (Integer) ordDet2.get("ORDERID");
+        Integer prod2ID = (Integer) ordDet2.get("PRODUCTID");
+        
+        // save order count
+        Integer order1DetDescCount = new Integer(ordDet1.getList("orderDetailsDesc").size());
+        Integer order2DetDescCount = new Integer(ordDet2.getList("orderDetailsDesc").size());
+
+        // Move an order detail desc to ord det1 from ord det2
+        DataObject orderDetailsDesc = (DataObject) ordDet2.getList("orderDetailsDesc").get(0);
+        ordDet1.getList("orderDetailsDesc").add(orderDetailsDesc);
+
+        // Flush changes
+        das.applyChanges(root);
+
+        // verify ord det1 relationship updates
+        select = das
+        .createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+        		" AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID where ORDERDETAILS.ORDERID = ? AND ORDERDETAILS.PRODUCTID = ?");
+        select.setParameter(1, ord1ID);
+        select.setParameter(2, prod1ID);
+
+        root = select.executeQuery();
+        assertEquals(order1DetDescCount.intValue() + 1, root.getList("ORDERDETAILS[1]/orderDetailsDesc").size());
+
+        // verify ord det2 relationship updates
+        select.setParameter(1, ord2ID);
+        select.setParameter(2, prod2ID);
+        
+        root = select.executeQuery();
+        assertEquals(order2DetDescCount.intValue() - 1, root.getList("ORDERDETAILS[1]/orderDetailsDesc").size());
+    }
+    
+    public void testFKBehavior() throws SQLException {
+        DAS das = DAS.FACTORY.createDAS(getConfig("OrderDetailsAndDescription.xml"), getConnection());
+        // Read some order details and related order details descs
+        Command select = das
+                .createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+                		" AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID");
+
+        DataObject root = select.executeQuery();
+
+        DataObject ordDet1 = root.getDataObject("ORDERDETAILS[1]");
+        DataObject ordDet2 = root.getDataObject("ORDERDETAILS[2]");
+
+        // Save IDs
+        Integer ord1ID = (Integer) ordDet1.get("ORDERID");
+        Integer prod1ID = (Integer) ordDet1.get("PRODUCTID");
+        
+        // Move an order det desc to ord det1 from ord det2
+        DataObject orderDetDesc = (DataObject) ordDet2.getList("orderDetailsDesc").get(0);
+        ordDet1.getList("orderDetailsDesc").add(orderDetDesc);
+        orderDetDesc.setInt("ORDERID", ord1ID.intValue());
+       
+        try {
+            das.applyChanges(root);
+            fail("An exception should be thrown");
+        } catch (RuntimeException ex) {
+            assertEquals("Foreign key properties should not be set when the corresponding relationship has changed", ex.getMessage());
+        }
+
+    }
+    
+    public void testFKBehavior2() throws SQLException {
+        DAS das = DAS.FACTORY.createDAS(getConfig("OrderDetailsAndDescription.xml"), getConnection());
+        // Read some order details and related order details descs
+        Command select = das
+                .createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+                		" AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID");
+
+        DataObject root = select.executeQuery();
+
+        DataObject ordDet1 = root.getDataObject("ORDERDETAILS[1]");
+        DataObject ordDet2 = root.getDataObject("ORDERDETAILS[2]");
+
+        // Save IDs
+        Integer ord1ID = (Integer) ordDet1.get("ORDERID");
+        Integer prod1ID = (Integer) ordDet1.get("PRODUCTID");
+        
+        // Create an order det desc for ord det1
+        DataObject orderDetDesc = root.createDataObject("ORDERDETAILSDESC");
+        orderDetDesc.setInt("ID", 500);
+        orderDetDesc.setInt("ORDERID", ord1ID.intValue());
+        ordDet1.getList("orderDetailsDesc").add(orderDetDesc);       
+       
+        try {
+            das.applyChanges(root);
+            fail("An exception should be thrown");
+        } catch (RuntimeException ex) {
+            assertEquals("Foreign key properties should not be set when the corresponding relationship has changed", ex.getMessage());
+        }
+    }
+
+    //add relationship through config helper
+    public void testValidFKColumn() throws SQLException {
+        ConfigHelper helper = new ConfigHelper();
+        Vector parentColumnNames = new Vector();
+        Vector childColumnNames = new Vector();
+
+        parentColumnNames.add(0, "ORDERDETAILS.ORDERID");
+        parentColumnNames.add(1, "ORDERDETAILS.PRODUCTID");
+
+        childColumnNames.add(0, "ORDERDETAILSDESC.ORDERID");
+        childColumnNames.add(1, "ORDERDETAILSDESC.PRODUCTID");        
+        
+        Relationship r = helper.addRelationship(parentColumnNames, childColumnNames);
+
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+        Command select = das.createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+                		" AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID");
+
+        DataObject root = select.executeQuery();  
+        DataObject ordDet1 = root.getDataObject("ORDERDETAILS[1]"); 
+        int order1DetDescCount = ordDet1.getList("ORDERDETAILSDESC").size();
+        
+        DataObject orderDetDesc = root.createDataObject("ORDERDETAILSDESC");
+        orderDetDesc.setInt("ID", 500);
+        
+        if(ordDet1 == null) System.out.println("order det1 is null");
+        if(ordDet1.getList("ORDERDETAILSDESC") == null)System.out.println("list is null");
+        
+        ordDet1.getList("ORDERDETAILSDESC").add(orderDetDesc);   
+        try {
+            das.applyChanges(root);
+            
+            select = das.createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+    		" AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID");
+
+            int modOrder1DetDescCount = select.executeQuery().
+            	getDataObject("ORDERDETAILS[1]").getList("ORDERDETAILSDESC").size();
+            this.assertEquals(modOrder1DetDescCount, order1DetDescCount+1);
+        } catch (RuntimeException ex) {
+            fail("Exception was not expected:DETAILS:"+ ex.getMessage());
+        }
+    }
+    
+    //add invalid relationship through config helper using invalid FK column name
+    public void testInvalidFKColumn() throws SQLException {
+        ConfigHelper helper = new ConfigHelper();
+        Vector parentColumnNames = new Vector();
+        Vector childColumnNames = new Vector();
+
+        parentColumnNames.add(0, "ORDERDETAILS.ORDERID");
+        parentColumnNames.add(1, "ORDERDETAILS.PRODUCTID");
+
+        childColumnNames.add(0, "ORDERDETAILSDESC.ORDERID_INVALID");
+        childColumnNames.add(1, "ORDERDETAILSDESC.PRODUCTID");        
+        
+        Relationship r = helper.addRelationship(parentColumnNames, childColumnNames);
+
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+        Command select = das.createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+                		" AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID");
+
+        DataObject root = select.executeQuery();  
+        DataObject ordDet1 = root.getDataObject("ORDERDETAILS[1]"); 
+        int order1DetDescCount = ordDet1.getList("ORDERDETAILSDESC").size();
+        
+        DataObject orderDetDesc = root.createDataObject("ORDERDETAILSDESC");
+        orderDetDesc.setInt("ID", 500);
+        
+        if(ordDet1 == null) System.out.println("order det1 is null");
+        if(ordDet1.getList("ORDERDETAILSDESC") == null)System.out.println("list is null");
+        
+        ordDet1.getList("ORDERDETAILSDESC").add(orderDetDesc);   
+        try {
+            das.applyChanges(root);
+            fail("Exception was expected");
+        } catch (RuntimeException ex) {
+        	assertEquals("Invalid foreign key column: ORDERID_INVALID", ex.getMessage());            
+        }
+    }    
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
new file mode 100644
index 0000000000..db8a59e638
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
@@ -0,0 +1,109 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.data.OrderDetailsData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+/**
+ * Tests for Compound Keys
+ */
+public class CompoundKeyTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new OrderDetailsData(getAutoConnection()).refresh();
+        new OrderData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testRead() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command getOrderDetails = das.createCommand("Select * from ORDERDETAILS where ORDERID = ? AND PRODUCTID = ?");
+
+        getOrderDetails.setParameter(1, new Integer(1));
+        getOrderDetails.setParameter(2, new Integer(1));
+
+        DataObject root = getOrderDetails.executeQuery();
+
+        DataObject orderDetail = (DataObject) root.get("ORDERDETAILS[1]");
+        assertEquals(1.1f, orderDetail.getFloat("PRICE"), 0.01);
+
+    }
+
+    public void testReadModifyWrite2() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("OrdersOrderDetailsConfig.xml"), getConnection());
+        Command getOrderDetails = das.createCommand("Select * from ORDERDETAILS where ORDERID = 1 AND PRODUCTID = 1");
+
+        DataObject root = getOrderDetails.executeQuery();
+
+        DataObject orderDetails = (DataObject) root.get("ORDERDETAILS[1]");
+        assertEquals(1.1f, orderDetails.getFloat("PRICE"), 0.01);
+
+        // Modify
+        orderDetails.setFloat("PRICE", 0f);
+
+        // Build apply changes command
+
+        das.applyChanges(root);
+
+        // Verify
+        root = getOrderDetails.executeQuery();
+        orderDetails = root.getDataObject("ORDERDETAILS[1]");
+        assertEquals(0f, orderDetails.getFloat("PRICE"), 0.01);
+
+    }
+
+    public void testReadOrdersAndDetails2() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("OrdersOrderDetailsConfig.xml"), getConnection());
+        Command read = das.createCommand("SELECT * FROM ANORDER LEFT JOIN ORDERDETAILS " 
+                + "ON ANORDER.ID = ORDERDETAILS.ORDERID ORDER BY ANORDER.ID");
+
+        DataObject root = read.executeQuery();
+
+        DataObject firstOrder = root.getDataObject("ANORDER[1]");
+        assertEquals(1, firstOrder.getInt("ID"));
+        assertEquals(2, firstOrder.getList("ORDERDETAILS").size());
+
+    }
+
+    public void testReadAndDelete() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("OrdersOrderDetailsConfig.xml"), getConnection());
+        Command getOrderDetails = das.createCommand("Select * from ORDERDETAILS where ORDERID = ? AND PRODUCTID = ?");
+
+        getOrderDetails.setParameter(1, new Integer(1));
+        getOrderDetails.setParameter(2, new Integer(1));
+
+        DataObject root = getOrderDetails.executeQuery();
+
+        DataObject orderDetail = (DataObject) root.get("ORDERDETAILS[1]");
+        orderDetail.delete();
+        das.applyChanges(root);
+
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConnectionTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConnectionTests.java
new file mode 100644
index 0000000000..42ff57b831
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConnectionTests.java
@@ -0,0 +1,89 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.sql.Connection;
+import java.sql.Statement;
+import java.util.Properties;
+
+import org.apache.derby.jdbc.EmbeddedDataSource;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+/**
+ * Test Database Connection with and without authentication required 
+ */
+public class ConnectionTests extends DasTest {
+	Properties p = null;
+	
+    protected void setUp() throws Exception {        
+        super.setUp();
+        p = System.getProperties();
+        p.put("derby.system.home", "target");
+
+        EmbeddedDataSource ds = new EmbeddedDataSource();       
+    	ds.setDatabaseName("dastestcon");
+    	ds.setDataSourceName("java/dastestcon");
+   		ds.setCreateDatabase("create");
+   		ds.setUser("dasuser");
+   		ds.setPassword("dasuser");
+   		Connection connection = ds.getConnection("dasuser", "dasuser");//to actually create the database
+   		Statement stmt = connection.createStatement();
+   		try{
+   			stmt.executeQuery("select * from BOOK");
+   		} catch(Exception e) {
+	   		stmt.execute("create table BOOK (id int, name varchar(30))");
+	   		stmt.execute("insert into BOOK values (1, 'book1')");
+   		}
+   		connection.commit();
+   		connection.close();   		
+    }
+    
+    protected void tearDown() throws Exception {
+    	super.tearDown();
+    }
+
+    /**
+     * As database is created with user, password, connection without same authentication can not look up data
+     */
+    public void testConnectionUsingDriverManagerNoAuth() throws Exception {
+    	try {
+	   		DAS das = DAS.FACTORY.createDAS(getConfig("connectionInfoDriverManagerNoAuth.xml"));
+	   		das.getCommand("getBook").executeQuery();
+	   		fail("Expected exception, as DB is created with id, pwd, needs same to get data from DB!");
+		} catch(Exception e) {
+			assertTrue(true);//Expected exception
+		}
+    }
+    
+    /**
+     * As database is created with user, password, connection with same authentication can look up data
+     */
+    public void testConnectionUsingDriverManagerAuth() throws Exception {
+    	try {
+	   		DAS das = DAS.FACTORY.createDAS(getConfig("connectionInfoDriverManagerAuth.xml"));
+	   		DataObject root = das.getCommand("getBook").executeQuery();
+	   		assertEquals(1, root.getList("BOOK").size());
+		} catch(Exception e) {
+			fail("Expected DAS to obtain authenticated connection using data source!");
+		}
+    }    
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
new file mode 100644
index 0000000000..b300b85192
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
@@ -0,0 +1,222 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.customer.Customer;
+import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
+/**
+ * Tests the Converter framwork
+ */
+public class ConverterTests extends DasTest {
+
+    private static DateFormat myformat = new SimpleDateFormat("yyyy.MM.dd");
+
+    private static Date kbday;
+
+    private static Date tbday;
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+        new OrderData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    static {
+        try {
+            kbday = myformat.parse("1957.09.27");
+            tbday = myformat.parse("1966.12.20");
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * This tests the use of an arbitrary converter. The column converted is a VARCAHAR. ResultSetShape is used to specify that the property will be a
+     * SDODataTypes.DATE.
+     * 
+     * So this example uses a converter that transforms a string column into a date property and conversely, a date property back to a string for the
+     * underlying column.
+     * 
+     * The converter returns 1957.09.27 if the column value is "Williams" and 1966.12.20 if the value is "Pavick"
+     * 
+     * On write, the converter returns "Pavick" if the property value is 1966.12.20 and "Williams" if the property value is 1957.09.27
+     * 
+     */
+    public void testArbitraryConverter() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomerConfigWithConverter.xml"), getConnection());
+
+        // Create and initialize command to read customers
+        Command read = das.getCommand("testArbitraryConverter");
+
+        // Read
+        DataObject root = read.executeQuery();
+
+        // Verify
+        assertEquals(kbday, root.getDate("CUSTOMER[1]/LASTNAME"));
+
+        // Modify
+        root.setDate("CUSTOMER[1]/LASTNAME", tbday);
+
+        das.applyChanges(root);
+
+        // Read
+        root = read.executeQuery();
+
+        // Verify
+        assertEquals(tbday, root.getDate("CUSTOMER[1]/LASTNAME"));
+
+    }
+
+    public void testInvalidConverter1() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("InvalidConverter.xml"), getConnection());
+
+        // Build the select command to read a specific customer and related
+        // orders
+        Command select = das
+                .createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER " + "ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
+
+        // Parameterize the command
+        select.setParameter(1, new Integer(1));
+
+        // Get the graph
+        try {
+            select.executeQuery();
+        } catch (Exception ex) {
+            assertEquals("java.lang.ClassNotFoundException: not.a.valid.class", ex.getMessage());
+        }
+
+    }
+
+    public void testInvalidConverter2() throws Exception {
+
+    	HelperContext context = HelperProvider.getDefaultContext();
+    	CustomerFactory.INSTANCE.register(context);
+        DAS das = DAS.FACTORY.createDAS(getConfig("InvalidConverter.xml"), getConnection());
+
+        // Build the select command to read a specific customer and related
+        // orders
+        Command select = das.createCommand("SELECT * FROM ANORDER");
+
+        // Get the graph
+
+        DataObject root = select.executeQuery();
+        DataObject order = root.getDataObject("AnOrder[1]");
+
+        Customer customer = (Customer) root.createDataObject("Customer");
+        customer.setID(700);
+        customer.setLastName("Daniel");
+        customer.setAddress("an address");
+
+        customer.getOrders().add(order);
+
+        try {
+            das.applyChanges(root);
+        } catch (Exception ex) {
+            assertEquals("java.lang.ClassNotFoundException: not.a.valid.class", ex.getMessage());
+        }
+
+    }
+
+    /**
+     * This tests the use of a converter that does not produce a new "type". Instead it 
+     * modifies the original value before storing to the database.  In this exampe, the
+     * converter restores the original value on read.
+     * 
+     * This is illustrated by obfuscating the lastname value before it is stored to the database and 
+     * deobfuscating on read.
+     * 
+     */
+    public void testConverter3() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomerConfigWithConverter2.xml"), getConnection());
+
+        // Create and initialize command to read customers
+        Command read = das.getCommand("getFirstCustomer");
+
+        // Read
+        DataObject root = read.executeQuery();
+        
+        //Modify
+        root.setString("CUSTOMER[1]/LASTNAME", "Some new name");
+       
+        das.applyChanges(root);
+
+        // Read
+        root = read.executeQuery();
+
+        // Verify that I can read back the deobfuscated value
+        assertEquals("Some new name", root.getString("CUSTOMER[1]/LASTNAME"));
+        
+        //Now read directly without applying the converter to ensure that the value was obfuscated 
+        //in the database.
+        DAS das2 = DAS.FACTORY.createDAS(getConnection());
+        Command directRead = das2.createCommand("select * from CUSTOMER where ID = 1");
+        root = directRead.executeQuery();
+
+        assertEquals("Fbzr arj anzr", root.getString("CUSTOMER[1]/LASTNAME"));
+        assertEquals(obfuscate("Some new name"), root.getString("CUSTOMER[1]/LASTNAME"));
+
+    }
+
+    // Utilities
+    
+    private String obfuscate (String original) throws Exception {
+        return toRot13(original);
+    }
+ 
+    private String deobfuscate (String obfuscated) throws Exception {
+        return toRot13(obfuscated);
+    }    
+    
+    //A simple, reversible, obfuscation algorithm using a ROT13 implementation
+    private String toRot13(String original) throws Exception {
+
+        int abyte = 0;
+        byte[] buffer = original.getBytes("ISO-8859-1");
+
+        for (int i = 0; i < buffer.length; i++) {
+            abyte = buffer[i];
+            int cap = abyte & 32;
+            abyte &= ~cap;
+            abyte = ((abyte >= 'A') && (abyte <= 'Z') ? ((abyte - 'A' + 13) % 26 + 'A') : abyte) | cap;
+            buffer[i] = (byte) abyte;
+        }
+        
+        return new String(buffer, "ISO-8859-1");
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
new file mode 100644
index 0000000000..028861ed77
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
@@ -0,0 +1,304 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ * These tests attempt to duplicate customer reported errors and then to verify
+ * any necessary fix.
+ * 
+ */
+
+import java.util.Iterator;
+import java.util.Random;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.ConfigHelper;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.test.data.CompanyData;
+import org.apache.tuscany.das.rdb.test.data.CompanyDeptData;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.data.DepartmentData;
+import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class CorrectedDefectTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+        new OrderData(getAutoConnection()).refresh();
+
+        new CompanyData(getAutoConnection()).refresh();
+        new DepartmentData(getAutoConnection()).refresh();
+        new CompanyDeptData(getAutoConnection()).refresh();
+
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Dilton's bug for adding new child data object
+     */
+    public void testAddNewOrder() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
+        // Read some customers and related orders
+        Command select = das.createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER "
+                + "ON CUSTOMER.ID = ANORDER.CUSTOMER_ID");
+
+        DataObject root = select.executeQuery();
+
+        DataObject cust = root.getDataObject("CUSTOMER[1]");
+
+        // Save ID and Order Count
+        int custID = cust.getInt("ID");
+        int custOrderCount = cust.getList("orders").size();
+
+        // Create a new Order and add to customer1
+        DataObject order = root.createDataObject("ANORDER");
+
+        order.set("ID", new Integer(99));
+        order.set("PRODUCT", "The 99th product");
+        order.set("QUANTITY", new Integer(99));
+        cust.getList("orders").add(order);
+
+        assertEquals(custOrderCount + 1, cust.getList("orders").size());
+
+        // Build apply changes command      
+        das.applyChanges(root);
+
+        // verify cust1 relationship updates
+        select = das.createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER "
+                + "ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
+
+        select.setParameter(1, new Integer(custID));
+        root = select.executeQuery();
+
+        assertEquals(custOrderCount + 1, root.getList("CUSTOMER[1]/orders").size());
+
+    }
+
+    public void testDiltonsInsertWorkaround() throws Exception {
+
+        // String sql = "insert into conmgt.serverstatus (statusid,
+        // managedserverid, timestamp) values (316405209, 316405209, '2005-11-23
+        // 19:29:52.636')";
+        // String sql = "insert into conmgt.serverstatus (managedserverid,
+        // timestamp) values (316405209, '2005-11-23 19:29:52.636')";
+        String sql = "insert into conmgt.serverstatus (managedserverid, timestamp) values (?, ?)";
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command insert = das.createCommand(sql);
+        insert.setParameter(1, new Integer(316405209));
+        insert.setParameter(2, "2005-11-23 19:29:52.636");
+        insert.execute();
+
+        // Verify
+        Command select = das.createCommand("Select * from conmgt.SERVERSTATUS");
+        DataObject root = select.executeQuery();
+        assertEquals(1, root.getList("SERVERSTATUS").size());
+
+    }
+
+    public void testWASDefect330118() throws Exception {
+
+        // Create the group and set common connection
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
+
+        // Read all customers and add one
+        Command read = das.getCommand("all customers");
+        DataObject root = read.executeQuery();
+        int numCustomers = root.getList("CUSTOMER").size();
+
+        DataObject newCust = root.createDataObject("CUSTOMER");
+        newCust.set("ID", new Integer(100));
+        newCust.set("ADDRESS", "5528 Wells Fargo Drive");
+        newCust.set("LASTNAME", "Gerkin");
+
+        // Now delete this new customer
+        newCust.delete();
+
+        das.applyChanges(root);
+
+        // Verify
+        root = read.executeQuery();
+        assertEquals(numCustomers, root.getList("CUSTOMER").size());
+
+    }
+
+    /**
+     * Should be able to explicitly set a parameter to null. But, should require
+     * that the parameter type is set.
+     */
+    public void testDiltonsNullParameterBug1() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command insert = das.createCommand("insert into CUSTOMER values (?, ?, ?)");
+        insert.setParameter(1, new Integer(10));
+        insert.setParameter(2, null);
+        insert.setParameter(3, "5528 Wells Fargo Dr");
+        insert.execute();
+
+        // Verify
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
+        DataObject root = select.executeQuery();
+        assertEquals(1, root.getList("CUSTOMER").size());
+        assertEquals("5528 Wells Fargo Dr", root.get("CUSTOMER[1]/ADDRESS"));
+
+    }
+
+    /**
+     * Error by not setting a parameter
+     */
+    public void testDiltonsNullParameterBug2() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command insert = das.createCommand("insert into CUSTOMER values (?, ?, ?)");
+        insert.setParameter(1, new Integer(10));
+        // insert.setParameterValue("LASTNAME", null);
+        insert.setParameter(3, "5528 Wells Fargo Dr");
+
+        try {
+            insert.execute();
+            fail();
+        } catch (RuntimeException e) {
+            // Expected since "LASTNAME" parameter not set
+        }
+    }
+
+    /**
+     * Set parameter to empty string
+     */
+    public void testDiltonsNullParameterBug3() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command insert = das.createCommand("insert into CUSTOMER values (?, ?, ?)");
+        insert.setParameter(1, new Integer(10));
+        insert.setParameter(2, "");
+        insert.setParameter(3, "5528 Wells Fargo Dr");
+        insert.execute();
+
+        // Verify
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
+        DataObject root = select.executeQuery();
+        assertEquals(1, root.getList("CUSTOMER").size());
+        assertEquals("5528 Wells Fargo Dr", root.get("CUSTOMER[1]/ADDRESS"));
+
+    }
+
+    public void testUpdateChildThatHasGeneratedKey() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection());
+
+        // Read a specific company based on the known ID
+        Command readCust = das.getCommand("all companies and departments");
+        DataObject root = readCust.executeQuery();
+        DataObject lastCustomer = root.getDataObject("COMPANY[3]");
+        Iterator i = lastCustomer.getList("departments").iterator();
+        Random generator = new Random();
+        int random = generator.nextInt(1000) + 1;
+        DataObject department;
+        while (i.hasNext()) {
+            department = (DataObject) i.next();
+            // System.out.println("Modifying department: " +
+            // department.getString("NAME"));
+            department.setString("NAME", "Dept-" + random);
+            random = random + 1;
+        }
+
+        das.applyChanges(root);
+    }
+
+    /**
+     * Yin Chen reports ... "In the class Statement, method: public int
+     * executeUpdate(Parameters parameters) - its tossing out RuntimeException
+     * when the value of the parameter is null. "
+     * 
+     * His example build a update statement and sets one parameter value to be
+     * null. I will try to duplicate with an insert since that is simpler
+     * 
+     */
+    public void testYingChen12162005() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command insert = das.createCommand("insert into CUSTOMER values (?, ?, ?)");
+        insert.setParameter(1, new Integer(10));
+        insert.setParameter(2, "Williams");
+        insert.setParameter(3, null);
+        insert.execute();
+
+        // Verify
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
+        DataObject root = select.executeQuery();
+        assertEquals(1, root.getList("CUSTOMER").size());
+        assertNull(root.get("CUSTOMER[1]/ADDRESS"));
+
+    }
+
+    /**
+     * Formely tests concerning Tuscany-433. The error causing these tests was cleared up when
+     * the method for handling parameters was changed.
+     */
+    public void testReadModifyApply() throws Exception {
+
+        // Provide updatecommand programmatically via config
+        ConfigHelper helper = new ConfigHelper();
+        Table customerTable = helper.addTable("CUSTOMER", "CUSTOMER");
+        helper.addUpdateStatement(customerTable, "update CUSTOMER set LASTNAME = ? where ID = ?", "LASTNAME ID");
+
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+
+        //Read customer 1
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+
+        DataObject customer = (DataObject) root.get("CUSTOMER[1]");
+
+        //Modify customer
+        customer.set("LASTNAME", "Pavick");
+
+        das.applyChanges(root);
+
+        //Verify changes
+        root = select.executeQuery();
+        assertEquals("Pavick", root.getString("CUSTOMER[1]/LASTNAME"));
+
+    }
+
+    public void testReadModifyApply1() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMappingWithCUD2.xml"), getConnection());
+        //Read customer 1
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+
+        DataObject customer = (DataObject) root.get("CUSTOMER[1]");
+
+        //Modify customer
+        customer.set("LASTNAME", "Pavick");
+
+        //Build apply changes command
+        das.applyChanges(root);
+
+        //Verify changes
+        root = select.executeQuery();
+        assertEquals("Pavick", root.getString("CUSTOMER[1]/LASTNAME"));
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
new file mode 100644
index 0000000000..3067d5ace7
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
@@ -0,0 +1,405 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ * This provdes the simplest examples that make use of the change history. The assumptions are:
+ * 
+ * Single type Change history utilized Dynamic DataObjects
+ * 
+ * 
+ */
+
+import java.util.Iterator;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.ConfigHelper;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.data.OrderDetailsData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class CrudWithChangeHistory extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+        new OrderDetailsData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testDeleteAndCreate() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMappingWithCUD2.xml"), getConnection());
+        // Read customer 1
+        Command select = das.createCommand("Select * from CUSTOMER");
+        DataObject root = select.executeQuery();
+
+        DataObject customer = (DataObject) root.get("CUSTOMER[1]");
+
+        int customerId = customer.getInt("ID");
+        // Modify customer
+        customer.delete();
+
+        DataObject newCustomer = root.createDataObject("CUSTOMER");
+        newCustomer.setInt("ID", 9999);
+        newCustomer.setString("LASTNAME", "Jones");
+
+        // Build apply changes command
+        das.applyChanges(root);
+
+        // Verify changes
+        root = select.executeQuery();
+        boolean found = false;
+        Iterator i = root.getList("CUSTOMER").iterator();
+        while (i.hasNext()) {
+            customer = (DataObject) i.next();
+            assertFalse(customerId == customer.getInt("ID"));
+            if (customer.getInt("ID") == 9999) {
+                found = true;
+            }
+        }
+
+        assertTrue(found);
+
+    }
+
+    /**
+     * Read and modify a customer. Provide needed Create/Update/Delete statements programatically
+     */
+    public void testReadModifyApply() throws Exception {
+
+        // Provide updatecommand programmatically via config
+        ConfigHelper helper = new ConfigHelper();
+        Table customerTable = helper.addTable("CUSTOMER", "CUSTOMER");
+        helper.addUpdateStatement(customerTable, "update CUSTOMER set LASTNAME = ?, ADDRESS = ? "
+                + "where ID = ?", "LASTNAME ADDRESS ID");
+
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+        // Read customer 1
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+        assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
+
+        DataObject customer = (DataObject) root.get("CUSTOMER[1]");
+
+        // Modify customer
+        customer.set("LASTNAME", "Pavick");
+
+        // Build apply changes command
+        das.applyChanges(root);
+
+        // Verify changes
+        root = select.executeQuery();
+        assertEquals("Pavick", root.getString("CUSTOMER[1]/LASTNAME"));
+
+    }
+
+    /**
+     * Read and modify a customer. Provide needed Create/Update/Delete statements via xml file
+     */
+    public void testReadModifyApply1() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMappingWithCUD.xml"), getConnection());
+        // Read customer 1
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+        assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
+
+        DataObject customer = (DataObject) root.get("CUSTOMER[1]");
+
+        // Modify customer
+        customer.set("LASTNAME", "Pavick");
+
+        // Build apply changes command
+        das.applyChanges(root);
+
+        // Verify changes
+        root = select.executeQuery();
+        assertEquals("Pavick", root.getString("CUSTOMER[1]/LASTNAME"));
+
+    }
+
+    /**
+     * Same as previous but: Utilizes generated CUD statements Key info provided programatically
+     */
+    public void testReadModifyApply2() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Read customer with particular ID
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+        assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
+
+        DataObject customer = root.getDataObject("CUSTOMER[1]");
+
+        // Modify customer
+        customer.set("LASTNAME", "Pavick");
+
+        // Build apply changes command
+        das.applyChanges(root);
+
+        // Verify the change
+        root = select.executeQuery();
+        assertEquals("Pavick", root.getDataObject("CUSTOMER[1]").getString("LASTNAME"));
+
+    }
+
+    /**
+     * Builds on previous but: 1. Key info provided via XML file
+     */
+    public void testReadModifyApply3() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMapping.xml"), getConnection());
+        // Read customer with particular ID
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+        assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
+
+        DataObject customer = (DataObject) root.get("CUSTOMER[1]");
+
+        // Modify customer
+        customer.set("LASTNAME", "Pavick");
+
+        // Build apply changes command
+        das.applyChanges(root);
+
+        // Verify the change
+        root = select.executeQuery();
+        assertEquals("Pavick", root.getDataObject("CUSTOMER[1]").getString("LASTNAME"));
+
+    }
+
+    /**
+     * Builds on previous but: 1. Uses a named command
+     */
+    public void testReadModifyApply4() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomerConfig.xml"), getConnection());
+        // Read customer with particular ID
+        Command select = das.getCommand("getCustomer");
+        select.setParameter(1, new Integer(1));
+        DataObject root = select.executeQuery();
+        assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
+
+        DataObject customer = (DataObject) root.get("CUSTOMER[1]");
+
+        // Modify customer
+        customer.set("LASTNAME", "Pavick");
+
+        // Build apply changes command
+        das.applyChanges(root);
+
+        // Verify the change
+        root = select.executeQuery();
+        assertEquals("Pavick", root.getDataObject("CUSTOMER[1]").getString("LASTNAME"));
+
+    }
+    
+    public void testReadModifyApplyMultipleRows() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Verify pre-condition
+        Command select = das.createCommand("Select * from CUSTOMER");
+        DataObject root = select.executeQuery();
+        assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
+        assertFalse(root.get("CUSTOMER[2]/LASTNAME").equals("Silva"));
+
+        
+        // Read and modify customer 1
+        DataObject customer1 = (DataObject) root.get("CUSTOMER[1]");
+        customer1.set("LASTNAME", "Pavick");
+
+        // Read and modify customer 2
+        DataObject customer2 = (DataObject) root.get("CUSTOMER[2]");
+        customer2.set("LASTNAME", "Silva");
+        
+        // Build apply changes command
+        das.applyChanges(root);
+
+        // Verify changes
+        root = select.executeQuery();
+        assertEquals("Pavick", root.getString("CUSTOMER[1]/LASTNAME"));
+        assertEquals("Silva", root.getString("CUSTOMER[2]/LASTNAME"));
+    }    
+    
+    /**
+     * Test ability to handle multiple changes to the graph including Creates/Updates/Deletes Employs generated CUD
+     */
+    public void testReadModifyDeleteInsertApply() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMapping.xml"), getConnection());
+        // Read some customers
+        Command select = das.createCommand("Select * from CUSTOMER where LASTNAME = 'Williams'");
+        DataObject root = select.executeQuery();
+
+        DataObject cust1 = (DataObject) root.getList("CUSTOMER").get(0);
+        DataObject cust2 = (DataObject) root.getList("CUSTOMER").get(1);
+        DataObject cust3 = (DataObject) root.getList("CUSTOMER").get(2);
+
+        // Modify a customer
+        cust1.set("LASTNAME", "Pavick");
+        int cust1ID = cust1.getInt("ID");
+
+        // Save IDs before delete
+        int cust2ID = cust2.getInt("ID");
+        int cust3ID = cust3.getInt("ID");
+        // Delete a couple
+        cust2.delete();
+        cust3.delete();
+
+        // Create a new customer
+        DataObject cust4 = root.createDataObject("CUSTOMER");
+        cust4.set("ID", new Integer(100));
+        cust4.set("ADDRESS", "5528 Wells Fargo Drive");
+        cust4.set("LASTNAME", "Gerkin");
+
+        // Build apply changes command
+        das.applyChanges(root);
+
+        // Verify deletes
+        select = das.createCommand("Select * from CUSTOMER where ID = ?");
+        select.setParameter(1, new Integer(cust2ID));
+        root = select.executeQuery();
+        assertTrue(root.getList("CUSTOMER").isEmpty());
+        // reparameterize same command
+        select.setParameter(1, new Integer(cust3ID));
+        root = select.executeQuery();
+        assertTrue(root.getList("CUSTOMER").isEmpty());
+
+        // verify insert
+        select.setParameter(1, new Integer(100));
+        root = select.executeQuery();
+        assertEquals(1, root.getList("CUSTOMER").size());
+        assertEquals("5528 Wells Fargo Drive", root.getString("CUSTOMER[1]/ADDRESS"));
+        assertEquals("Gerkin", root.getString("CUSTOMER[1]/LASTNAME"));
+
+        // verify update
+        select.setParameter(1, new Integer(cust1ID));
+        root = select.executeQuery();
+        assertEquals("Pavick", root.getString("CUSTOMER[1]/LASTNAME"));
+
+    }
+
+    public void testReadModifyApplyWithAssumedID() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Read customer with particular ID
+        Command select = das.createCommand("Select * from CUSTOMER");
+        DataObject root = select.executeQuery();
+
+        DataObject customer = root.getDataObject("CUSTOMER[1]");
+
+        // Modify customer
+        customer.set("LASTNAME", "Pavick");
+
+        DataObject customerForDelete = getCustomerByLastName(root, "Daniel");
+        customerForDelete.delete();
+
+        DataObject newCustomer = root.createDataObject("CUSTOMER");
+        newCustomer.set("LASTNAME", "NewCustomer");
+        newCustomer.setInt("ID", 9000);
+
+        // Build apply changes command
+        das.applyChanges(root);
+
+        // Verify the change
+        root = select.executeQuery();
+        assertEquals("Pavick", getCustomerByLastName(root, "Pavick").getString("LASTNAME"));
+        assertEquals("NewCustomer", getCustomerByLastName(root, "NewCustomer").getString("LASTNAME"));
+        assertNull(getCustomerByLastName(root, "Daniel"));
+
+    }
+
+    public void testReadModifyApplyWithAssumedIDFailure() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command select = das.createCommand("Select * from ORDERDETAILS");
+
+        DataObject root = select.executeQuery();
+
+        DataObject od = root.getDataObject("ORDERDETAILS[1]");
+
+        // Modify customer
+        od.setInt("PRODUCTID", 72);
+
+        // Flush changes -- This should fail because Order Details does not have
+        // a column that
+        // we can assume to be an ID
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+            assertTrue(ex.getMessage().indexOf("changed in the DataGraph but is not present in the Config") >= 0);
+        }
+
+    }
+
+    public void testReadModifyApplyWithAssumedIDFailure2() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command select = das.createCommand("Select * from ORDERDETAILS");
+        DataObject root = select.executeQuery();
+
+        DataObject od = root.getDataObject("ORDERDETAILS[1]");
+        od.delete();
+
+        // Flush changes -- This should fail because Order Details does not have
+        // a column that
+        // we can assume to be an ID
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+            assertTrue(ex.getMessage().indexOf("changed in the DataGraph but is not present in the Config") >= 0);
+        }
+
+    }
+
+    public void testReadModifyApplyWithAssumedIDFailure3() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command select = das.createCommand("Select * from ORDERDETAILS");
+        DataObject root = select.executeQuery();
+
+        DataObject od = root.createDataObject("ORDERDETAILS");
+
+        // Modify customer
+        od.setInt("PRODUCTID", 72);
+        od.setInt("ORDERID", 500);
+
+        // Flush changes -- This should fail because Order Details does not have
+        // a column that
+        // we can assume to be an ID
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+            assertTrue(ex.getMessage().indexOf("changed in the DataGraph but is not present in the Config") >= 0);
+        }
+
+    }
+
+    private DataObject getCustomerByLastName(DataObject root, String name) {
+        Iterator i = root.getList("CUSTOMER").iterator();
+        while (i.hasNext()) {
+            DataObject obj = (DataObject) i.next();
+            if (name.equals(obj.getString("LASTNAME"))) {
+                return obj;
+            }
+        }
+        return null;
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
new file mode 100644
index 0000000000..4eb68c1404
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
@@ -0,0 +1,115 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ * These tests attempt to duplicate customer reported errors and then to verify
+ * any necessary fix.
+ * 
+ */
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.BookData;
+import org.apache.tuscany.das.rdb.test.data.CompanyData;
+import org.apache.tuscany.das.rdb.test.data.CompanyDeptData;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.data.DepEmpData;
+import org.apache.tuscany.das.rdb.test.data.DepartmentData;
+import org.apache.tuscany.das.rdb.test.data.EmployeeData;
+import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+/**
+ *
+ *
+ */
+public class DefectTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+        new OrderData(getAutoConnection()).refresh();
+
+        new CompanyData(getAutoConnection()).refresh();
+        new DepartmentData(getAutoConnection()).refresh();
+        new EmployeeData(getAutoConnection()).refresh();
+        new CompanyDeptData(getAutoConnection()).refresh();
+        new DepEmpData(getAutoConnection()).refresh();
+        new BookData(getAutoConnection()).refresh();
+
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Read a specific customer
+     */
+    public void testDiltonsInsert() throws Exception {
+
+        // String sql = "insert into conmgt.serverstatus (statusid,
+        // managedserverid, timestamp) values (316405209, 316405209, '2005-11-23
+        // 19:29:52.636')";
+        String sql = "insert into conmgt.serverstatus (managedserverid, timestamp) " 
+                + "values (316405209, '2005-11-23 19:29:52.636')";
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command insert = das.createCommand(sql);
+        insert.execute();
+
+        // Verify
+        Command select = das.createCommand("Select * from conmgt.serverstatus where statusid = 1");
+        DataObject root = select.executeQuery();
+                
+        assertEquals(1, root.getList("SERVERSTATUS").size());
+
+    }
+
+
+    /**
+     * Test expected failure when applyChanges processes DO with no PK columns.  We
+     * should throw a better error than NPE
+     */
+
+    //now with JIRA-1464 , we will get exception in select itself , so can not reach upto
+    //applyChanges
+    /*public void testReadUpdateWithNoPKColumns() throws Exception {
+        
+        DAS das = DAS.FACTORY.createDAS(getConfig("BooksConfig.xml"),getConnection());
+        // Read a book instance
+        Command select = das.createCommand("SELECT NAME, AUTHOR, QUANTITY, OCC FROM BOOK WHERE BOOK_ID = 1");
+        DataObject root = select.executeQuery();
+
+        DataObject book = root.getDataObject("BOOK[1]");
+        // Change a field to mark the instance 'dirty'
+        book.setInt("QUANTITY", 2);
+
+        try {
+            das.applyChanges(root);
+            fail("An exception should be thrown since the DO has no PK defined");
+        } catch (NullPointerException ex) {
+            fail("We should do better than an NPE");
+        }
+    }*/
+    
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DynamicResultDescriptorTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DynamicResultDescriptorTests.java
new file mode 100644
index 0000000000..d2535a2223
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DynamicResultDescriptorTests.java
@@ -0,0 +1,351 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.ConfigFactory;
+import org.apache.tuscany.das.rdb.config.ResultDescriptor;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class DynamicResultDescriptorTests extends DasTest {
+
+    protected void setUp() throws Exception {    
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+    }
+    
+    protected void tearDown() throws Exception {
+    	super.tearDown();
+    }
+	
+    /**
+     * Set result descriptor on Command dynamically
+     */
+    public void testSetResultDescriptors() throws Exception {
+    	ConfigFactory factory = ConfigFactory.INSTANCE;
+    	DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Read a customer
+        Command select = das.createCommand("SELECT ID, LASTNAME, ADDRESS FROM CUSTOMER WHERE CUSTOMER.ID = 1");
+        
+        List resultDescriptorList = new ArrayList();
+        //as long as columnIndex is correct, order in ArrayList does not matter
+        ResultDescriptor desc3 = factory.createResultDescriptor();
+        desc3.setColumnIndex(3);
+        desc3.setColumnName("ADDRESS");
+        desc3.setColumnType("commonj.sdo.String");
+        desc3.setTableName("CUSTOMER");
+
+        ResultDescriptor desc1 = factory.createResultDescriptor();
+        desc1.setColumnIndex(1);
+        desc1.setColumnName("ID");
+        desc1.setColumnType("commonj.sdo.Int");
+        desc1.setTableName("CUSTOMER");
+        
+        ResultDescriptor desc2 = factory.createResultDescriptor();
+        desc2.setColumnIndex(2);
+        desc2.setColumnName("LASTNAME");
+        desc2.setColumnType("commonj.sdo.String");
+        desc2.setTableName("CUSTOMER");
+                
+        resultDescriptorList.add(desc3);
+        resultDescriptorList.add(desc1);
+        resultDescriptorList.add(desc2);
+        
+        select.setResultDescriptors(resultDescriptorList);
+        DataObject root = select.executeQuery();
+        assertEquals(1, root.getList("CUSTOMER").size());
+    }
+    
+    /**
+     * Set a result descriptor on Command dynamically
+     * and later replace it with another invalid one, and check failure
+     */
+    public void testReplaceResultDescriptors() throws Exception {
+    	ConfigFactory factory = ConfigFactory.INSTANCE;
+    	DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Read a customer
+        Command select = das.createCommand("SELECT ID, LASTNAME, ADDRESS FROM CUSTOMER WHERE CUSTOMER.ID = 1");
+        
+        List resultDescriptorList = new ArrayList();
+        //as long as columnIndex is correct, order in ArrayList does not matter
+        ResultDescriptor desc3 = factory.createResultDescriptor();
+        desc3.setColumnIndex(3);
+        desc3.setColumnName("ADDRESS");
+        desc3.setColumnType("commonj.sdo.String");
+        desc3.setTableName("CUSTOMER");
+
+        ResultDescriptor desc1 = factory.createResultDescriptor();
+        desc1.setColumnIndex(1);
+        desc1.setColumnName("ID");
+        desc1.setColumnType("commonj.sdo.Int");
+        desc1.setTableName("CUSTOMER");
+        
+        ResultDescriptor desc2 = factory.createResultDescriptor();
+        desc2.setColumnIndex(2);
+        desc2.setColumnName("LASTNAME");
+        desc2.setColumnType("commonj.sdo.String");
+        desc2.setTableName("CUSTOMER");
+                
+        resultDescriptorList.add(desc3);
+        resultDescriptorList.add(desc1);
+        resultDescriptorList.add(desc2);
+        
+        select.setResultDescriptors(resultDescriptorList);
+        DataObject root = select.executeQuery();
+        assertEquals(1, root.getList("CUSTOMER").size());
+        
+        //Now use invalid one
+        resultDescriptorList.clear();
+        
+        desc3.setColumnIndex(3);
+        desc3.setColumnName("ADDRESS");
+        desc3.setColumnType("commonj.sdo.Int");//incompatible type
+        desc3.setTableName("CUSTOMER");
+
+        desc1.setColumnIndex(1);
+        desc1.setColumnName("ID");
+        desc1.setColumnType("commonj.sdo.Int");
+        desc1.setTableName("CUSTOMER");
+        
+        desc2 = factory.createResultDescriptor();
+        desc2.setColumnIndex(2);
+        desc2.setColumnName("LASTNAME");
+        desc2.setColumnType("commonj.sdo.String");
+        desc2.setTableName("CUSTOMER");
+        
+        resultDescriptorList.add(desc3);
+        resultDescriptorList.add(desc2);
+        resultDescriptorList.add(desc1);
+        
+        select.setResultDescriptors(resultDescriptorList);
+        try{
+        	root = select.executeQuery();
+        	fail("Expected exception");
+        }catch(Exception e){
+        	assertTrue(e instanceof ClassCastException);
+        }
+    }
+    
+    /**
+     * Set result descriptor on Command dynamically
+     * , overriding the one set from static config.
+     */
+    public void testOverrideResultDescriptorsFromConfig() throws Exception {
+    	ConfigFactory factory = ConfigFactory.INSTANCE;
+    	DAS das = DAS.FACTORY.createDAS(getConfig("customerMappingWithResultDescriptor.xml"), getConnection());
+        Command select = das.getCommand("testSelectCustomer");
+        DataObject root = select.executeQuery();
+        List custList = root.getList("CUSTOMER");
+        assertEquals("Williams", ((DataObject)custList.get(0)).getString("LASTNAME"));
+        
+        List resultDescriptorList = new ArrayList();
+
+        ResultDescriptor desc3 = factory.createResultDescriptor();
+        desc3.setColumnIndex(3);
+        desc3.setColumnName("ADDRESS");
+        desc3.setColumnType("commonj.sdo.Int");//incompatible type
+        desc3.setTableName("CUSTOMER");
+
+        ResultDescriptor desc1 = factory.createResultDescriptor();
+        desc1.setColumnIndex(1);
+        desc1.setColumnName("ID");
+        desc1.setColumnType("commonj.sdo.Int");
+        desc1.setTableName("CUSTOMER");
+        
+        ResultDescriptor desc2 = factory.createResultDescriptor();
+        desc2.setColumnIndex(2);
+        desc2.setColumnName("LASTNAME");
+        desc2.setColumnType("commonj.sdo.String");
+        desc2.setTableName("CUSTOMER");
+                
+        resultDescriptorList.add(desc3);
+        resultDescriptorList.add(desc1);
+        resultDescriptorList.add(desc2);
+        
+        select.setResultDescriptors(resultDescriptorList);
+        try{
+        	select.executeQuery();
+        	fail("Expected exception");
+        }catch(Exception e){
+        	assertTrue(e instanceof ClassCastException);
+        }    	
+    }
+    
+    /**
+     * Set null result descriptor on Command dynamically 
+     */
+    public void testNullResultDescriptors() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Read a customer
+        Command select = das.createCommand("SELECT ID, LASTNAME, ADDRESS FROM CUSTOMER WHERE CUSTOMER.ID = 1");
+        
+        List resultDescriptorList = null;
+
+        try{
+        	select.setResultDescriptors(resultDescriptorList);
+
+        	select.executeQuery();
+        	this.assertTrue("Derby has DBMS metadata, so it will be used", true);
+        }catch(RuntimeException e){
+        	fail("Expected to succeed with no exception");
+        } 
+    }
+    
+    /**
+     * Set -ve columnIndex in result descriptor on Command dynamically
+     * Set will not be sorted and Type mismatch wi (Int and String for ID)
+     * will throw exception 
+     */
+    public void testNegativeIndexResultDescriptors() throws Exception {
+    	ConfigFactory factory = ConfigFactory.INSTANCE;
+    	DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Read a customer
+        Command select = das.createCommand("SELECT ID, LASTNAME, ADDRESS FROM CUSTOMER WHERE CUSTOMER.ID = 1");
+        
+        List resultDescriptorList = new ArrayList();
+        
+        ResultDescriptor desc3 = factory.createResultDescriptor();
+        desc3.setColumnIndex(-3);//invalid
+        desc3.setColumnName("ADDRESS");
+        desc3.setColumnType("commonj.sdo.String");
+        desc3.setTableName("CUSTOMER");
+
+        ResultDescriptor desc1 = factory.createResultDescriptor();
+        desc1.setColumnIndex(1);
+        desc1.setColumnName("ID");
+        desc1.setColumnType("commonj.sdo.Int");
+        desc1.setTableName("CUSTOMER");
+        
+        ResultDescriptor desc2 = factory.createResultDescriptor();
+        desc2.setColumnIndex(2);
+        desc2.setColumnName("LASTNAME");
+        desc2.setColumnType("commonj.sdo.String");
+        desc2.setTableName("CUSTOMER");
+                
+        resultDescriptorList.add(desc3);
+        resultDescriptorList.add(desc1);
+        resultDescriptorList.add(desc2);
+
+        try{
+        	select.setResultDescriptors(resultDescriptorList);
+
+        	select.executeQuery();
+        	fail("Expected exception");
+        }catch(RuntimeException e){
+        	assertTrue("Exception as sorting wil not happen due to -ve columnIndex", true);
+        } 
+    }
+    
+    /**
+     * Set matching columnIndices in result descriptor on Command dynamically 
+     */
+    public void testMatchingIndexResultDescriptor() throws Exception {
+    	ConfigFactory factory = ConfigFactory.INSTANCE;
+    	DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Read a customer
+        Command select = das.createCommand("SELECT ID, LASTNAME, ADDRESS FROM CUSTOMER WHERE CUSTOMER.ID = 1");
+        
+        List resultDescriptorList = new ArrayList();
+        
+        ResultDescriptor desc3 = factory.createResultDescriptor();
+        desc3.setColumnIndex(1);//two times index is 1
+        desc3.setColumnName("ADDRESS");
+        desc3.setColumnType("commonj.sdo.String");
+        desc3.setTableName("CUSTOMER");
+
+        ResultDescriptor desc1 = factory.createResultDescriptor();
+        desc1.setColumnIndex(1);
+        desc1.setColumnName("ID");
+        desc1.setColumnType("commonj.sdo.Int");
+        desc1.setTableName("CUSTOMER");
+        
+        ResultDescriptor desc2 = factory.createResultDescriptor();
+        desc2.setColumnIndex(2);
+        desc2.setColumnName("LASTNAME");
+        desc2.setColumnType("commonj.sdo.String");
+        desc2.setTableName("CUSTOMER");
+                
+        resultDescriptorList.add(desc3);
+        resultDescriptorList.add(desc1);
+        resultDescriptorList.add(desc2);
+
+        try{
+        	select.setResultDescriptors(resultDescriptorList);
+
+        	select.executeQuery();
+        	fail("Expected exception");
+        }catch(RuntimeException e){
+        	assertTrue(e.getMessage().indexOf("Two columns in Result Descriptor can not have same index")!= -1);
+        } 
+    }    
+    
+    public void testAddRemoveResultDescriptor() throws Exception {
+    	ConfigFactory factory = ConfigFactory.INSTANCE;
+
+    	ResultDescriptor desc3 = factory.createResultDescriptor();
+        desc3.setColumnIndex(3);//two times index is 1
+        desc3.setColumnName("ADDRESS");
+        desc3.setColumnType("commonj.sdo.String");
+        desc3.setTableName("CUSTOMER");
+
+    	ResultDescriptor desc1 = factory.createResultDescriptor();
+        desc1.setColumnIndex(1);
+        desc1.setColumnName("ID");
+        desc1.setColumnType("commonj.sdo.Int");
+        desc1.setTableName("CUSTOMER");
+        
+        ResultDescriptor desc2 = factory.createResultDescriptor();
+        desc2.setColumnIndex(2);
+        desc2.setColumnName("LASTNAME");
+        desc2.setColumnType("commonj.sdo.String");
+        desc2.setTableName("CUSTOMER");
+
+    	DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Read a customer
+        Command select = das.createCommand("SELECT ID, LASTNAME, ADDRESS FROM CUSTOMER WHERE CUSTOMER.ID = 1");
+        select.addResultDescriptor(desc3);
+        select.addResultDescriptor(desc1);
+        select.addResultDescriptor(desc2);
+        //select.printResultDescriptors(System.out);
+        assertEquals(1, ((ResultDescriptor)select.getResultDescriptors().get(0)).getColumnIndex());
+        assertEquals(2, ((ResultDescriptor)select.getResultDescriptors().get(1)).getColumnIndex());
+        assertEquals(3, ((ResultDescriptor)select.getResultDescriptors().get(2)).getColumnIndex());
+        
+        select.removeResultDescriptor(2);
+        //select.printResultDescriptors(System.out);
+        assertEquals(1, ((ResultDescriptor)select.getResultDescriptors().get(0)).getColumnIndex());
+        assertEquals(3, ((ResultDescriptor)select.getResultDescriptors().get(1)).getColumnIndex());
+        
+        select.removeResultDescriptor(desc3);
+        //select.printResultDescriptors(System.out);
+        assertEquals(1, ((ResultDescriptor)select.getResultDescriptors().get(0)).getColumnIndex());
+        
+        select.addResultDescriptor(null);
+        select.removeResultDescriptor(null);
+        //select.printResultDescriptors(System.out);
+        assertEquals(1, ((ResultDescriptor)select.getResultDescriptors().get(0)).getColumnIndex());        
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
new file mode 100644
index 0000000000..4da0df87ae
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
@@ -0,0 +1,153 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.companynoid.CompanynoidFactory;
+import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
+import org.apache.tuscany.das.rdb.test.data.BookData;
+import org.apache.tuscany.das.rdb.test.data.CompanyData;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.data.OrderDetailsData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
+
+public class ExceptionTests extends DasTest {
+
+    public ExceptionTests() {
+        super();
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new CustomerData(getAutoConnection()).refresh();
+        new OrderData(getAutoConnection()).refresh();
+        new BookData(getAutoConnection()).refresh();
+        new OrderDetailsData(getAutoConnection()).refresh();
+        new CompanyData(getAutoConnection()).refresh();
+
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testMissingConnection() throws Exception {
+        DAS das = DAS.FACTORY.createDAS((Connection) null);
+
+        try {
+            Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
+            readCustomers.executeQuery();
+            fail("RuntimeException should be thrown");
+        } catch (RuntimeException ex) {
+            assertEquals("No connection has been provided and no data source has been specified", ex.getMessage());
+        }
+
+    }
+
+    public void testUnregisteredTypes() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("staticInvalid.xml"), getConnection());
+        Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
+
+        try {
+            readCustomers.executeQuery();
+
+            fail("Exception should be thrown");
+        } catch (RuntimeException ex) {
+            assertEquals("SDO Types have not been registered for URI invalidURI", ex.getMessage());
+        }
+    }
+
+    public void testMissingMapping() throws Exception {
+    	HelperContext context = HelperProvider.getDefaultContext();
+    	CustomerFactory.INSTANCE.register(context);
+        DAS das = DAS.FACTORY.createDAS(getConfig("staticCustomer.xml"), getConnection());
+        Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
+
+        try {
+            readCustomers.executeQuery();
+
+            fail("Exception should be thrown");
+        } catch (RuntimeException ex) {
+            assertEquals("An SDO Type with name CUSTOMER was not found", ex.getMessage());
+        }
+
+    }
+
+    /**
+     * Test ability to describe problem when a user passes an empty stream
+     */
+    public void testEmptyStream() throws Exception {
+        try {
+            DAS.FACTORY.createDAS(getConfig("NonExistingFile.xml"));
+            fail("Error should be thrown");
+        } catch (RuntimeException e) {
+            assertEquals("Cannot load configuration from a null InputStream. Possibly caused "
+                    + "by an incorrect config xml file name", e.getMessage());
+        }
+    }
+
+    /**
+     * Test ability to describe problem when a user passes an empty stream
+     */
+    public void testEmptyStream2() throws Exception {
+        try {
+            DAS.FACTORY.createDAS(getConfig("NonExistingFile.xml"));
+            fail("Error should be thrown");
+        } catch (RuntimeException e) {
+            assertEquals("Cannot load configuration from a null InputStream. Possibly caused "
+                    + "by an incorrect config xml file name", e.getMessage());
+        }
+    }
+
+    public void testReadOrdersAndDetails2() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("InvalidConfig1.xml"), getConnection());
+        Command read = das.createCommand("SELECT * FROM ANORDER LEFT JOIN ORDERDETAILS "
+                + "ON ANORDER.ID = ORDERDETAILS.ORDERID ORDER BY ANORDER.ID");
+
+        try {
+            read.executeQuery();
+        } catch (Exception ex) {
+            assertEquals("The parent table (xxx) in relationship ORDERDETAILS was not found.", ex.getMessage());
+        }
+
+    }
+
+    public void testMismatchedDataObjectModel() throws SQLException {
+    	HelperContext context = HelperProvider.getDefaultContext();
+    	CompanynoidFactory.INSTANCE.register(context);    	
+        DAS das = DAS.FACTORY.createDAS(getConfig("companynoidMappingWithConverters.xml"), getConnection());
+        Command read = das.createCommand("select * from company");
+        try {
+            read.executeQuery();
+        } catch (RuntimeException ex) {
+            assertEquals("Type CompanynoidType does not contain a property named ID", ex.getMessage());
+        }
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
new file mode 100644
index 0000000000..45c83e6167
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
@@ -0,0 +1,94 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.test.commands.ReadCustomersByLastnameCommand;
+import org.apache.tuscany.das.rdb.test.commands.ReadCustomersCommand;
+import org.apache.tuscany.das.rdb.test.commands.ReadCustomersStaticTypesCommand;
+import org.apache.tuscany.das.rdb.test.commands.ReadCustomersWithShapeCommand;
+import org.apache.tuscany.das.rdb.test.commands.SimpleReadCustomersWithShapeCommand;
+import org.apache.tuscany.das.rdb.test.customer.Customer;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class GeneratedCommandTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new CustomerData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testReadCustomers() throws Exception {
+        ReadCustomersCommand cmd = new ReadCustomersCommand();
+        cmd.setConnection(getConnection());
+
+        DataObject root = cmd.executeQuery();
+        assertEquals(5, root.getList("CUSTOMER").size());
+    }
+
+    public void testReadSomeCustomers() throws Exception {
+        ReadCustomersByLastnameCommand cmd = new ReadCustomersByLastnameCommand();
+        cmd.setConnection(getConnection());
+        cmd.setParameter(1, "Williams");
+
+        DataObject root = cmd.executeQuery();
+        assertEquals(4, root.getList("CUSTOMER").size());
+
+    }
+
+    public void testReadCustomersStaticTypes() throws Exception {
+        ReadCustomersStaticTypesCommand cmd = new ReadCustomersStaticTypesCommand();
+        cmd.setConnection(getConnection());
+        cmd.setParameter(1, "Williams");
+
+        DataObject root = cmd.executeQuery();
+
+        List customers = root.getList("Customer");
+        assertEquals(4, customers.size());
+
+        Customer cust1 = (Customer) customers.get(0);
+        assertEquals("Williams", cust1.getLastName());
+
+    }
+
+    public void testSimpleReadCustomersWithShape() throws Exception {
+        SimpleReadCustomersWithShapeCommand cmd = new SimpleReadCustomersWithShapeCommand();
+        cmd.setConnection(getConnection());
+        DataObject root = cmd.executeQuery();
+        assertEquals(5, root.getList("CUSTOMER").size());
+    }
+
+    public void testReadCustomersOrdersWithShape() throws Exception {
+        ReadCustomersWithShapeCommand cmd = new ReadCustomersWithShapeCommand();
+        cmd.setConnection(getConnection());
+
+        DataObject root = cmd.executeQuery();
+        assertEquals(5, root.getList("CUSTOMER").size());
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
new file mode 100644
index 0000000000..ca8bd19868
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
@@ -0,0 +1,313 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ * Generated IDs
+ * 
+ * 
+ */
+
+import java.util.Iterator;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.CompanyData;
+import org.apache.tuscany.das.rdb.test.data.DepartmentData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class GeneratedId extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new CompanyData(getAutoConnection()).refresh();
+        new DepartmentData(getAutoConnection()).refresh();
+
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    // Test insert into row with generated ID
+    public void testInsert() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command insert = das.createCommand("insert into COMPANY (NAME) values (?)");
+        insert.setParameter(1, "AAA Rental");
+        insert.execute();
+
+        // Verify insert
+        // Verify
+        Command select = das.createCommand("Select ID, NAME from COMPANY");
+        DataObject root = select.executeQuery();
+
+        assertEquals(4, root.getList("COMPANY").size());
+        assertTrue(root.getInt("COMPANY[1]/ID") > 0);
+
+    }
+
+    // Test back to back insertions with the same command
+    public void testInsert2() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command insert = das.createCommand("insert into COMPANY (NAME) values (?)");
+        insert.setParameter(1, "AAA Rental");
+        insert.execute();
+
+        // insert another using same command
+        insert.setParameter(1, "BBB Rental");
+        insert.execute();
+
+        // Verify insert
+        // Verify
+        Command select = das.createCommand("Select ID, NAME from COMPANY");
+        DataObject root = select.executeQuery();
+
+        assertEquals(5, root.getList("COMPANY").size());
+
+    }
+
+    // Test ability to retrieve and utilize the generated key
+    public void testInsert3() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command insert = das.createCommand("insert into COMPANY (NAME) values (?)");
+        insert.setParameter(1, "AAA Rental");
+        insert.execute();
+        //       Integer key = (Integer) insert.getParameterValue("generated_key");
+        Integer key = new Integer(insert.getGeneratedKey());
+
+        // Verify insert
+        Command select = das.createCommand("Select ID, NAME from COMPANY where ID = ?");
+        select.setParameter(1, key);
+        DataObject root = select.executeQuery();
+        assertEquals(key, root.get("COMPANY[1]/ID"));
+
+    }
+
+    // Test insert into row with generated ID and generated insert
+    public void testInsert4() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection());
+        Command select = das.getCommand("all companies");
+        DataObject root = select.executeQuery();
+
+        DataObject company = root.createDataObject("COMPANY");
+        company.setString("NAME", "Phil's Tires");
+        // This shouldn't do anything
+        company.setInt("ID", 999);
+
+        das.applyChanges(root);
+
+        // Verify insert                 
+        root = select.executeQuery();
+
+        assertEquals(4, root.getList("COMPANY").size());
+        Iterator i = root.getList("COMPANY").iterator();
+        while (i.hasNext()) {
+            DataObject comp = (DataObject) i.next();
+            assertFalse(comp.getInt("ID") == 999);
+        }
+
+    }
+    
+    /** 
+     * Test insert into row with generated ID and no attributes set 
+     */ 
+    public void testInsert5() throws Exception { 
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection()); 
+        Command select = das.getCommand("all companies"); 
+        DataObject root = select.executeQuery(); 
+
+        root.createDataObject("COMPANY"); 
+
+        das.applyChanges(root); 
+
+        // Verify insert 
+        root = select.executeQuery(); 
+        assertEquals(4, root.getList("COMPANY").size()); 
+
+    } 
+
+
+    // Test ability to propogate generated values back to owning data objects
+    public void testPropagateIds() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection());
+        Command select = das.getCommand("all companies");
+        DataObject root = select.executeQuery();
+
+        // Create a new Company
+        DataObject company = root.createDataObject("COMPANY");
+        company.setString("NAME", "Do-rite Pest Control");
+
+        // verify pre-condition (id is not there until after flush)
+        assertNull(company.get("ID"));
+
+        // Flush changes      
+        das.applyChanges(root);
+
+        // Save the id
+        Integer id = (Integer) company.get("ID");
+
+        // Verify the change
+        select = das.createCommand("Select * from COMPANY where ID = ?");
+        select.setParameter(1, id);
+        root = select.executeQuery();
+        assertEquals("Do-rite Pest Control", root.getDataObject("COMPANY[1]").getString("NAME"));
+
+    }
+
+    /**
+     * Same as above but metadata provided by XML config file
+     */
+    public void testPropagateIdsXML() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("basicCompanyMapping.xml"), getConnection());
+        Command select = das.createCommand("Select * from COMPANY");
+        DataObject root = select.executeQuery();
+
+        // Create a new Company
+        DataObject company = root.createDataObject("COMPANY");
+        company.setString("NAME", "Do-rite Pest Control");
+
+        // verify pre-condition (id is not there until after flush)
+        assertNull(company.get("ID"));
+
+        // Flush changes      
+        das.applyChanges(root);
+
+        // Save the id
+        Integer id = (Integer) company.get("ID");
+
+        // Verify the change
+        select = das.createCommand("Select * from COMPANY where ID = ?");
+        select.setParameter(1, id);
+        root = select.executeQuery();
+        assertEquals("Do-rite Pest Control", root.getDataObject("COMPANY[1]").getString("NAME"));
+
+    }
+
+    /**
+     * Test ability to correctly flush heirarchy of objects that have generated
+     * keys
+     */
+    public void testFlushCreateHeirarchy() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("basicCompanyDepartmentMapping.xml"), getConnection());
+        String selectCompanys = "SELECT * FROM COMPANY LEFT JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID";
+
+        Command select = das.createCommand(selectCompanys);
+        DataObject root = select.executeQuery();
+
+        // Create a new Company
+        DataObject company = root.createDataObject("COMPANY");
+        company.setString("NAME", "Do-rite Pest Control");
+
+        // Create a new Department
+        // Do not set ID or CompanyID since these are generated
+        // ID INT, NAME VARCHAR(30), LOCATION VARCHAR(30), NUMBER VARCHAR(10),
+        // COMPANYID INT, EOTM INT
+        DataObject department = root.createDataObject("DEPARTMENT");
+        department.setString("NAME", "Do-rite Pest Control");
+        department.setString("LOCATION", "The boonies");
+        department.setString("DEPNUMBER", "101");
+
+        // Associate the new department with the new company
+        company.getList("departments").add(department);
+
+        das.applyChanges(root);
+
+        // Save the id
+        Integer id = (Integer) company.get("ID");
+
+        // Verify the change
+        String selectString = "SELECT * FROM COMPANY LEFT JOIN DEPARTMENT "
+                + "ON COMPANY.ID = DEPARTMENT.COMPANYID WHERE COMPANY.ID = ?";
+
+        select = das.createCommand(selectString);
+        select.setParameter(1, id);
+        root = select.executeQuery();
+        assertEquals("Do-rite Pest Control", root.getDataObject("COMPANY[1]").getString("NAME"));
+
+    }
+
+    /**
+     * Test ability to correctly flush heirarchy of objects that have generated
+     * keys even when a created object has legal but NULL property values
+     */
+    public void testFlushCreateHeirarchy2() throws Exception {
+
+        String selectCompanys = "SELECT * FROM COMPANY LEFT JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID";
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("basicCompanyDepartmentMapping.xml"), getConnection());
+        Command select = das.createCommand(selectCompanys);
+        DataObject root = select.executeQuery();
+
+        // Create a new Company
+        DataObject company = root.createDataObject("COMPANY");
+        company.setString("NAME", "Do-rite Pest Control");
+
+        // Create a new Department
+        // Do not set ID or CompanyID since these are generated
+        // ID INT, NAME VARCHAR(30), LOCATION VARCHAR(30), NUMBER VARCHAR(10),
+        // COMPANYID INT, EOTM INT
+        DataObject department = root.createDataObject("DEPARTMENT");
+        department.setString("NAME", "Do-rite Pest Control");
+        // Do not set this property to force storing NULL to DB
+        // department.setString("LOCATION", "The boonies");
+        department.setString("DEPNUMBER", "101");
+
+        // Associate the new department with the new company
+        company.getList("departments").add(department);
+
+        das.applyChanges(root);
+
+        // Save the id
+        Integer id = (Integer) company.get("ID");
+
+        // Verify the change
+        String selectString = "SELECT * FROM COMPANY LEFT JOIN DEPARTMENT "
+                + "ON COMPANY.ID = DEPARTMENT.COMPANYID WHERE COMPANY.ID = ?";
+
+        select = das.createCommand(selectString);
+        select.setParameter(1, id);
+        root = select.executeQuery();
+        assertEquals("Do-rite Pest Control", root.getDataObject("COMPANY[1]").getString("NAME"));
+
+    }
+
+    // Test that error is thrown when no key has been generated (as in a select)
+    public void testRead() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command select = das.createCommand("Select * from COMPANY");
+        select.executeQuery();
+
+        try {
+            select.getGeneratedKey();
+            fail("Should throw exception");
+        } catch (RuntimeException e) {
+            assertEquals("This method is only valid for insert commands", e.getMessage());
+        }
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
new file mode 100644
index 0000000000..a1a7b57433
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
@@ -0,0 +1,625 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.ConfigHelper;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.merge.impl.GraphMerger;
+import org.apache.tuscany.das.rdb.test.customer.AnOrder;
+import org.apache.tuscany.das.rdb.test.customer.Customer;
+import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
+import org.apache.tuscany.das.rdb.test.customer.impl.CustomerFactoryImpl;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.data.SingerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+import org.apache.tuscany.das.rdb.test.singer.SINGER;
+import org.apache.tuscany.das.rdb.test.singer.impl.SingerFactoryImpl;
+import org.apache.tuscany.sdo.api.SDOUtil;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Type;
+import commonj.sdo.helper.DataFactory;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.XMLHelper;
+import commonj.sdo.impl.HelperProvider;
+
+public class GraphMergeTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new CustomerData(getAutoConnection()).refresh();
+        new OrderData(getAutoConnection()).refresh();
+        new SingerData(getAutoConnection()).refresh();
+
+    }
+
+    public void testCreateEmptyGraph() throws Exception {
+        String typeUri = "http:///org.apache.tuscany.das.rdb.test/customer.xsd";
+        HelperContext context = HelperProvider.getDefaultContext();
+        CustomerFactory.INSTANCE.register(context);
+        ConfigHelper helper = new ConfigHelper();
+        helper.setDataObjectModel(typeUri);
+        DataObject graph = new GraphMerger().emptyGraph(helper.getConfig());
+        assertEquals(0, graph.getList("Customer").size());
+        assertEquals(0, graph.getList("AnOrder").size());
+
+    }
+
+    public void testCreateEmptyGraphAndAddCustomer() throws Exception {
+        String typeUri = "http:///org.apache.tuscany.das.rdb.test/customer.xsd";
+        HelperContext context = HelperProvider.getDefaultContext();
+        CustomerFactory.INSTANCE.register(context);
+        ConfigHelper helper = new ConfigHelper();
+        helper.setDataObjectModel(typeUri);
+        helper.addTable("CUSTOMER", "Customer");
+        helper.addPrimaryKey("CUSTOMER.ID");
+
+        DataObject graph = new GraphMerger().emptyGraph(helper.getConfig());
+        Customer c = (Customer) graph.createDataObject("Customer");
+        c.setID(4000);
+        c.setLastName("Smith");
+        c.setAddress("400 Fourth Street");
+
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+        das.applyChanges(graph);
+
+        Command cmd = das.createCommand("select * from CUSTOMER order by ID desc");
+        graph = cmd.executeQuery();
+        assertEquals(6, graph.getList("Customer").size());
+        assertEquals("Smith", graph.getDataObject("Customer[1]").getString("lastName"));
+        assertEquals("400 Fourth Street", graph.getDataObject("Customer[1]").getString("address"));
+
+    }
+
+    public void testSingleTableMerge() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command select = das.createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where ID <= ?");
+        select.setParameter(1, "3");
+        DataObject graph1 = select.executeQuery();
+        assertEquals(3, graph1.getList("CUSTOMER").size());
+
+        select.setParameter(1, "5");
+        DataObject graph2 = select.executeQuery();
+        assertEquals(5, graph2.getList("CUSTOMER").size());
+
+        GraphMerger merger = new GraphMerger();
+        merger.addPrimaryKey("CUSTOMER.ID");
+        DataObject mergedGraph = merger.merge(graph1, graph2);
+        List custList = mergedGraph.getList("CUSTOMER");
+        for(int i=0; i<custList.size(); i++) {
+        	DataObject currCust = (DataObject)custList.get(i);
+        }
+        assertEquals(5, mergedGraph.getList("CUSTOMER").size());
+    }
+
+    public void testSingleTableMerge2() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command select = das.createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where ID <= ?");
+        select.setParameter(1, "3");
+        DataObject graph1 = select.executeQuery();
+        assertEquals(3, graph1.getList("CUSTOMER").size());
+
+        Command select2 = das.createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where ID > ?");
+        select2.setParameter(1, "3");
+        DataObject graph2 = select2.executeQuery();
+        assertEquals(2, graph2.getList("CUSTOMER").size());
+
+        GraphMerger merger = new GraphMerger();
+        merger.addPrimaryKey("CUSTOMER.ID");
+        DataObject mergedGraph = merger.merge(graph1, graph2);
+        List custList = mergedGraph.getList("CUSTOMER");
+        for(int i=0; i<custList.size(); i++) {
+        	DataObject currCust = (DataObject)custList.get(i);
+        }
+        assertEquals(5, mergedGraph.getList("CUSTOMER").size());
+    }
+
+    public void testSingleTableMergeThreeGraphs() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command select = das.createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where ID <= ?");
+        select.setParameter(1, "3");
+        DataObject graph1 = select.executeQuery();
+        assertEquals(3, graph1.getList("CUSTOMER").size());
+
+        select.setParameter(1, "4");
+        DataObject graph2 = select.executeQuery();
+        assertEquals(4, graph2.getList("CUSTOMER").size());
+
+        select.setParameter(1, "5");
+        DataObject graph3 = select.executeQuery();
+        assertEquals(5, graph3.getList("CUSTOMER").size());
+
+        GraphMerger merger = new GraphMerger();
+        merger.addPrimaryKey("CUSTOMER.ID");
+        List graphs = new ArrayList();
+        graphs.add(graph1);
+        graphs.add(graph2);
+        graphs.add(graph3);
+        DataObject mergedGraph = merger.merge(graphs);
+
+        assertEquals(5, mergedGraph.getList("CUSTOMER").size());
+
+    }
+
+    public void testMultiTableMerge2() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
+        // Read some customers and related orders
+        Command select = das.createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON "
+                + "CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
+
+        select.setParameter(1, new Integer(1));
+        DataObject graph1 = select.executeQuery();
+
+        DataObject customer = (DataObject) graph1.getList("CUSTOMER").get(0);
+        assertEquals(2, customer.getList("orders").size());
+
+        select.setParameter(1, new Integer(2));
+        DataObject graph2 = select.executeQuery();
+        DataObject customer2 = (DataObject) graph2.getList("CUSTOMER").get(0);
+        assertEquals(1, graph2.getList("CUSTOMER").size());
+        assertEquals(1, customer2.getList("orders").size());
+        assertEquals(2, customer2.getInt("ID"));
+
+        GraphMerger merger = new GraphMerger();
+        merger.addPrimaryKey("CUSTOMER.ID");
+        merger.addPrimaryKey("ANORDER.ID");
+        DataObject mergedGraph = merger.merge(graph1, graph2);
+
+        assertEquals(3, mergedGraph.getList("ANORDER").size());
+        assertEquals(2, mergedGraph.getList("CUSTOMER").size());
+
+        DataObject mergedCustomer = (DataObject) mergedGraph.getList("CUSTOMER").get(1);
+        assertEquals(2, mergedCustomer.getInt("ID"));
+        assertEquals(1, mergedCustomer.getList("orders").size());
+        DataObject mergedOrder = (DataObject) mergedCustomer.getList("orders").get(0);
+        assertEquals(4, mergedOrder.getInt("ID"));
+
+    }
+
+    public void testMultiTableAppendSingleTable2() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
+        // Read some customers and related orders
+        Command select = das.createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON "
+                + "CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
+
+        select.setParameter(1, new Integer(1));
+        DataObject graph1 = select.executeQuery();
+
+        DataObject customer = (DataObject) graph1.getList("CUSTOMER").get(0);
+        assertEquals(2, customer.getList("orders").size());
+
+        DAS das2 = DAS.FACTORY.createDAS(getConnection());
+        Command select2 = das2.createCommand("select * from ANORDER");
+        DataObject graph2 = select2.executeQuery();
+        assertEquals(4, graph2.getList("ANORDER").size());
+
+        GraphMerger merger = new GraphMerger();
+        merger.addPrimaryKey("CUSTOMER.ID");
+        merger.addPrimaryKey("ANORDER.ID");
+        DataObject mergedGraph = merger.merge(graph1, graph2);
+        assertEquals(4, mergedGraph.getList("ANORDER").size());
+        assertEquals(1, mergedGraph.getList("CUSTOMER").size());
+    }
+
+    /**
+     * Mix dynamic DO from query result with static DO from customer.xsd. As long as the type and
+     * property names are matching for both, merge can happen - fixing bug 1827- pk hashmap was not
+     * considering type and property names before.
+     * @throws Exception
+     */
+    public void testMergeUpdateSingleTable() throws Exception {
+    	//existing records
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfigProps.xml"), getConnection());
+    	DataObject root = das.getCommand("all customers").executeQuery();
+    	DataObject firstCustomer = root.getDataObject("Customer[ID=1]");
+
+    	if(firstCustomer != null)
+    		firstCustomer.delete();//DAS will not automatic createOrReplace , so do delete here and later doing a create
+
+    	//create new customer using static SDO - say a service is doing it
+    	String typeUri = "http:///org.apache.tuscany.das.rdb.test/customer.xsd";
+        HelperContext context = HelperProvider.getDefaultContext();
+        CustomerFactory.INSTANCE.register(context);
+        ConfigHelper helper = new ConfigHelper();
+        helper.setDataObjectModel(typeUri);
+        helper.addTable("CUSTOMER", "Customer");
+        helper.addPrimaryKey("CUSTOMER.ID", "ID");
+
+        GraphMerger gm = new GraphMerger(helper.getConfig());
+        DataObject graph = gm.emptyGraph();
+        Customer c = (Customer) graph.createDataObject("Customer");
+        c.setID(1);
+        c.setLastName("WilliamsNew");
+        c.setAddress("400 Fourth Street");
+
+        gm.addPrimaryKey("CUSTOMER.ID");
+
+        DataObject root1 = gm.merge(root, ((DataObject)c).getRootObject(), false);
+        das.applyChanges(root1);
+
+        root = das.getCommand("all customers").executeQuery();
+        firstCustomer = root.getDataObject("Customer[ID=1]");
+        assertNotNull(firstCustomer);
+        assertEquals("WilliamsNew", firstCustomer.getString("lastName"));
+    }
+
+    /**
+     * Support merge(StaticDO1, StaticDO2, noChangeSummary) when both are not contained in "DataGraphRoot" and DataGraph (and not have changeSummary). When
+     * no existing change summary, will be used for INSERT
+     * @throws Exception
+     */
+    public void testMergeStaticDOs() throws Exception {
+   	 // Populate the meta data for the test (SINGER) model xsd - WAY ONE
+      	 /*String TEST_MODEL = "/SINGER.xsd";
+       	 String TEST_NAMESPACE = "http:///org.apache.tuscany.das.rdb.test/SINGER.xsd";
+
+        URL url = getClass().getResource(TEST_MODEL);
+        InputStream inputStream = url.openStream();
+        XSDHelper.INSTANCE.define(inputStream, url.toString());
+        inputStream.close();
+
+        Type singerType = TypeHelper.INSTANCE.getType(TEST_NAMESPACE, "SINGER");
+        DataObject SINGER = DataFactory.INSTANCE.create(singerType);
+        SINGER.set("ID", new Integer(100));
+        SINGER.set("NAME", "Singer100"); */
+
+   	// Populate the meta data for the test (SINGER) using generated classes - WAY TWO
+        SINGER singerStaticDO1 = SingerFactoryImpl.INSTANCE.createSINGER();
+        singerStaticDO1.setID(100);
+        singerStaticDO1.setNAME("Singer100");
+
+        SINGER singerStaticDO2 = SingerFactoryImpl.INSTANCE.createSINGER();
+        singerStaticDO2.setID(200);
+        singerStaticDO2.setNAME("Singer200");
+
+        GraphMerger gm = new GraphMerger();
+        gm.addPrimaryKey("SINGER.ID");
+
+        DataObject songs = gm.merge((DataObject)singerStaticDO1, (DataObject)singerStaticDO2, false);
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        das.applyChanges(songs);
+        //printSingerData();
+        Command cmd = das.createCommand("SELECT ID, NAME FROM SINGER");
+    	DataObject root = cmd.executeQuery();
+    	assertNotNull(root.getDataObject("SINGER[ID=100]"));
+    	assertEquals("Singer100", root.getDataObject("SINGER[ID=100]").getString("NAME"));
+    	assertNotNull(root.getDataObject("SINGER[ID=200]"));
+    	assertEquals("Singer200", root.getDataObject("SINGER[ID=200]").getString("NAME"));
+   }
+
+    /*Internal utility to create a property in a dynamic DO*/
+    private void specifyProperty(DataObject containingTypeDO, String nameString, Type type, boolean isMany) {
+        DataObject subordinateProperty = containingTypeDO.createDataObject("property");
+        subordinateProperty.set("name", nameString);
+        subordinateProperty.set("type", type);
+        subordinateProperty.setBoolean("many", isMany);
+    }
+
+    /*Internal utility to form Dynamic DO*/
+    private DataObject formDynamicDO(String dynamicRootType) {
+    	String DYNAMIC_TYPES_URI = "http://www.example.com/dynamicTypesFromSchemaSimple";
+    	String DYNAMIC_ROOT_TYPE_0 = dynamicRootType;
+    	String COMMONJ_SDO = "commonj.sdo";
+
+    	HelperContext hcDO = SDOUtil.createHelperContext();
+
+        TypeHelper thDO = hcDO.getTypeHelper();
+        DataFactory dfDO = hcDO.getDataFactory();
+
+        // create a container object type
+        DataObject containerTypeDO = dfDO.create("commonj.sdo", "Type");
+        containerTypeDO.set("uri", DYNAMIC_TYPES_URI);
+        containerTypeDO.set("name", DYNAMIC_ROOT_TYPE_0);
+        containerTypeDO.set("sequenced", Boolean.TRUE);
+
+        specifyProperty(containerTypeDO, "NAME", thDO.getType(COMMONJ_SDO, "String"), false);
+        specifyProperty(containerTypeDO, "ID", thDO.getType(COMMONJ_SDO, "Int"), false);
+
+        Type containerType = thDO.define(containerTypeDO);
+        assertNotNull(containerType);
+
+        DataObject doFromApiAndDynTyp = dfDO.create(containerType);
+        return doFromApiAndDynTyp;
+    }
+
+    /**merge(DynamicDO1, DynamicDO2, noChangeSummary). When no change summary associated in a DataGraph, treated for INSERT
+     *
+     * @throws Exception
+     */
+    public void testMergeDynamicDOs() throws Exception {
+    	DataObject doFromApiAndDynTyp1 = formDynamicDO("SINGER");
+        assertNotNull(doFromApiAndDynTyp1);
+        doFromApiAndDynTyp1.setString("NAME", "DynamicSinger1");
+        doFromApiAndDynTyp1.setInt("ID", 100);
+
+        DataObject doFromApiAndDynTyp2 = formDynamicDO("SINGER");
+        assertNotNull(doFromApiAndDynTyp2);
+        doFromApiAndDynTyp2.setString("NAME", "DynamicSinger2");
+        doFromApiAndDynTyp2.setInt("ID", 200);
+
+        GraphMerger gm = new GraphMerger();
+        gm.addPrimaryKey("SINGER.ID");
+
+        DataObject dos = gm.merge(doFromApiAndDynTyp1, doFromApiAndDynTyp2, false);
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        das.applyChanges(dos);
+        //printSingerData();
+        Command cmd = das.createCommand("SELECT ID, NAME FROM SINGER");
+    	DataObject root = cmd.executeQuery();
+    	assertNotNull(root.getDataObject("SINGER[ID=100]"));
+    	assertEquals("DynamicSinger1", root.getDataObject("SINGER[ID=100]").getString("NAME"));
+    	assertNotNull(root.getDataObject("SINGER[ID=200]"));
+    	assertEquals("DynamicSinger2", root.getDataObject("SINGER[ID=200]").getString("NAME"));
+    }
+
+    /**
+     * merge(StaticDO, DynamicDO, noChangeSummary). As no change summary, used for INSERT
+     * @throws Exception
+     */
+    public void testMergeStaticAndDynamicDOs() throws Exception {
+    	DataObject singerDynamicDO1 = formDynamicDO("SINGER");
+        assertNotNull(singerDynamicDO1);
+        singerDynamicDO1.setString("NAME", "Singer100");
+        singerDynamicDO1.setInt("ID", 100);
+
+    	SINGER singerStaticDO1 = SingerFactoryImpl.INSTANCE.createSINGER();
+        singerStaticDO1.setID(200);
+        singerStaticDO1.setNAME("Singer200");
+
+        GraphMerger gm = new GraphMerger();
+        gm.addPrimaryKey("SINGER.ID");
+
+        DataObject singers = gm.merge((DataObject)singerStaticDO1, singerDynamicDO1, false);
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        das.applyChanges(singers);
+        //printSingerData();
+        Command cmd = das.createCommand("SELECT ID, NAME FROM SINGER");
+    	DataObject root = cmd.executeQuery();
+    	assertNotNull(root.getDataObject("SINGER[ID=100]"));
+    	assertEquals("Singer100", root.getDataObject("SINGER[ID=100]").getString("NAME"));
+    	assertNotNull(root.getDataObject("SINGER[ID=200]"));
+    	assertEquals("Singer200", root.getDataObject("SINGER[ID=200]").getString("NAME"));
+    }
+
+    /**
+     * Query result can carry ChangeSummary of CUD, Dynamic DO will be a new Object (CREATE)
+     * @throws Exception
+     */
+    public void testMergeQueryResultAndDynamicDOs() throws Exception {
+    	DataObject singerDynamicDO1 = formDynamicDO("SINGER");
+        assertNotNull(singerDynamicDO1);
+        singerDynamicDO1.setString("NAME", "Singer100");
+        singerDynamicDO1.setInt("ID", 100);
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command cmd = das.createCommand("SELECT ID, NAME FROM SINGER");
+        DataObject root = cmd.executeQuery();
+
+        DataObject secondSinger = root.getDataObject("SINGER[ID=2]");
+        secondSinger.setString("NAME", "JaneSecond");//change summary registers Update change
+
+        DataObject thirdSinger = root.getDataObject("SINGER[ID=3]");
+        thirdSinger.delete();//change summary registers Delete change
+
+        GraphMerger gm = new GraphMerger();
+        gm.addPrimaryKey("SINGER.ID");
+
+        DataObject singers = gm.merge(root, singerDynamicDO1, false);//merge with primary DO having change summary and secondary DO without one.
+        //as false is passed, secondary DO will be treated as INSERT in primaryChangeSummary
+
+        das.applyChanges(singers);
+        //printSingerData();
+    	root = cmd.executeQuery();
+    	assertNotNull(root.getDataObject("SINGER[ID=100]"));
+    	assertEquals("Singer100", root.getDataObject("SINGER[ID=100]").getString("NAME"));
+    	assertNotNull(root.getDataObject("SINGER[ID=2]"));
+    	assertEquals("JaneSecond", root.getDataObject("SINGER[ID=2]").getString("NAME"));
+    	assertNull(root.getDataObject("SINGER[ID=3]"));
+    }
+
+    /**
+     * Query result can carry ChangeSummary of CUD, Static DO will be a new Object (CREATE)
+     * @throws Exception
+     */
+    public void testMergeQueryResultAndStaticDOs() throws Exception {
+    	SINGER singerStaticDO1 = SingerFactoryImpl.INSTANCE.createSINGER();
+        singerStaticDO1.setID(100);
+        singerStaticDO1.setNAME("Singer100");
+
+        GraphMerger gm = new GraphMerger();
+        gm.addPrimaryKey("SINGER.ID");
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command cmd = das.createCommand("SELECT ID, NAME FROM SINGER");
+        DataObject root = cmd.executeQuery();
+
+        DataObject secondSinger = root.getDataObject("SINGER[ID=2]");
+        secondSinger.setString("NAME", "JaneSecond");//Change summary will register Update
+
+        DataObject thirdSinger = root.getDataObject("SINGER[ID=3]");
+        thirdSinger.delete();//change summary will register Delete
+
+        DataObject singers = gm.merge(root, (DataObject)singerStaticDO1, false);//due to false, secondary DO will be treated as INSERT in primary change summary
+
+        das.applyChanges(singers);
+        //printSingerData();
+    	root = cmd.executeQuery();
+    	assertNotNull(root.getDataObject("SINGER[ID=100]"));
+    	assertEquals("Singer100", root.getDataObject("SINGER[ID=100]").getString("NAME"));
+    	assertNotNull(root.getDataObject("SINGER[ID=2]"));
+    	assertEquals("JaneSecond", root.getDataObject("SINGER[ID=2]").getString("NAME"));
+    	assertNull(root.getDataObject("SINGER[ID=3]"));
+    }
+
+    private void printSongData() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConnection());
+    	Command cmd = das.createCommand("SELECT ID, TITLE, SINGERID FROM SONG");
+    	DataObject root = cmd.executeQuery();
+    	System.out.println("**********SONG*************************");
+    	System.out.println(XMLHelper.INSTANCE.save(root, "song", "song"));
+    	System.out.println("**********************************************");
+    }
+
+    private void printSingerData() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConnection());
+    	Command cmd = das.createCommand("SELECT ID, NAME FROM SINGER");
+    	DataObject root = cmd.executeQuery();
+    	System.out.println("**************SINGER************************");
+    	System.out.println(XMLHelper.INSTANCE.save(root, "singer", "singer"));
+    	System.out.println("**********************************************");
+    }
+
+    /**
+     * Mix all 3 - query result carrying change summary, static and dynamic DO
+     * @throws Exception
+     */
+    public void testMergeListQueryResultStaticAndDynamic() throws Exception {
+    	SINGER singerStaticDO1 = SingerFactoryImpl.INSTANCE.createSINGER();
+        singerStaticDO1.setID(200);
+        singerStaticDO1.setNAME("Singer200");
+
+        GraphMerger gm = new GraphMerger();
+        gm.addPrimaryKey("SINGER.ID");
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command cmd = das.createCommand("SELECT ID, NAME FROM SINGER");
+        DataObject root = cmd.executeQuery();
+        DataObject firstSinger = root.getDataObject("SINGER[ID=1]");
+        firstSinger.setString("NAME", "JohnNew");//change summary will register Update
+
+        DataObject secondSinger = root.getDataObject("SINGER[ID=2]");
+        secondSinger.delete();//change summary will register Delete
+
+        DataObject singerDynamicDO1 = formDynamicDO("SINGER");
+        assertNotNull(singerDynamicDO1);
+        singerDynamicDO1.setString("NAME", "Singer100");
+        singerDynamicDO1.setInt("ID", 100);
+
+        ArrayList singersToMerge = new ArrayList();
+        singersToMerge.add((DataObject)singerStaticDO1);
+        singersToMerge.add(root);
+        singersToMerge.add(singerDynamicDO1);
+
+        //merge will internally shuffle DOs to detect primary having change summary. so root will be designated as Primary
+        DataObject singers = gm.merge(singersToMerge, false);
+
+    	das.applyChanges(singers);
+        //printSingerData();
+    	root = cmd.executeQuery();
+    	assertNotNull(root.getDataObject("SINGER[ID=100]"));
+    	assertEquals("Singer100", root.getDataObject("SINGER[ID=100]").getString("NAME"));
+    	assertNotNull(root.getDataObject("SINGER[ID=200]"));
+    	assertEquals("Singer200", root.getDataObject("SINGER[ID=200]").getString("NAME"));
+    	assertNotNull(root.getDataObject("SINGER[ID=1]"));
+    	assertEquals("JohnNew", root.getDataObject("SINGER[ID=1]").getString("NAME"));
+    	assertNull(root.getDataObject("SINGER[ID=2]"));
+    }
+
+    /**
+     * There is no much meaning to nested merges as the secondary DOs are at most treated for INSERTs.
+     * @throws Exception
+     */
+    public void testMergePrimaryQuerySecondaryStaticNested() throws Exception {
+    	String typeUri = "http:///org.apache.tuscany.das.rdb.test/customer.xsd";
+        HelperContext context = HelperProvider.getDefaultContext();
+        CustomerFactory.INSTANCE.register(context);
+
+    	AnOrder anOrderStaticDO1 = CustomerFactoryImpl.INSTANCE.createAnOrder();
+    	anOrderStaticDO1.setID(100);
+    	anOrderStaticDO1.setProduct("100 prods");
+    	anOrderStaticDO1.setQuantity(100);
+    	anOrderStaticDO1.setCustomer_ID(1);
+
+        GraphMerger gm = new GraphMerger();
+        gm.addPrimaryKey("Customer.ID");
+        gm.addPrimaryKey("AnOrder.ID");
+
+        ConfigHelper helper = new ConfigHelper();
+        helper.setDataObjectModel(typeUri);
+        helper.addTable("CUSTOMER", "Customer");
+        helper.addTable("ANORDER", "AnOrder");
+        MappingWrapper mappingWrapper = new MappingWrapper(helper.getConfig());
+
+        helper.addColumn(mappingWrapper.getTable("CUSTOMER"), "ID", "ID");
+        helper.addColumn(mappingWrapper.getTable("CUSTOMER"), "LASTNAME", "lastName");
+        helper.addColumn(mappingWrapper.getTable("CUSTOMER"), "ADDRESS", "address");
+
+        helper.addColumn(mappingWrapper.getTable("ANORDER"), "ID", "ID");
+        helper.addColumn(mappingWrapper.getTable("ANORDER"), "PRODUCT", "Product");
+        helper.addColumn(mappingWrapper.getTable("ANORDER"), "QUANTITY", "Quantity");
+        helper.addColumn(mappingWrapper.getTable("ANORDER"), "CUSTOMER_ID", "Customer_ID");
+
+        helper.addRelationship("CUSTOMER.ID", "ANORDER.CUSTOMER_ID", "orders");
+
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+
+        Command cmd = das.createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON "
+                + "CUSTOMER.ID = ANORDER.CUSTOMER_ID");
+        DataObject root = cmd.executeQuery();
+
+        DataObject result = gm.merge(root, (DataObject)anOrderStaticDO1, false);
+        assertEquals(2, result.getDataObject("Customer[ID=1]").getList("orders").size()); //because only CREATE part
+        //is considered for AnOrder, update part for relationship is not considered
+        das.applyChanges(result);
+
+        context = HelperProvider.getDefaultContext();
+        CustomerFactory.INSTANCE.register(context);
+
+        root = cmd.executeQuery();
+        DataObject firstCustomer = root.getDataObject("Customer[ID=1]");
+        List firstCustOrders = firstCustomer.getList("orders");
+        assertEquals(3, root.getDataObject("Customer[ID=1]").getList("orders").size());//as now snapshot from DB
+    }
+
+    /**
+     * Show that when structure coming from Query is partial and the secondary is complete DO structure based on model xsd,
+     * on-the-fly changes to structure are not allowed and merge does not happen
+     * @throws Exception
+     */
+    public void testMergePartialQueryAndStatic() throws Exception {
+    	SINGER singerStaticDO1 = SingerFactoryImpl.INSTANCE.createSINGER();
+    	singerStaticDO1.setID(100);
+    	singerStaticDO1.setNAME("Singer100");
+
+        GraphMerger gm = new GraphMerger();
+        gm.addPrimaryKey("SINGER.ID");
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command cmd = das.createCommand("SELECT ID FROM SINGER WHERE ID=1");
+        DataObject root = cmd.executeQuery();
+
+        try {
+	        gm.merge(root, (DataObject)singerStaticDO1);
+	        fail("Expected exception!");
+        } catch(RuntimeException e) {
+        	assertEquals("Graph structures do not match,", e.getMessage().substring(0, 30));
+        }
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java
new file mode 100644
index 0000000000..e52684a067
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java
@@ -0,0 +1,112 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.util.Iterator;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.ConfigHelper;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.Relationship;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+
+public class ImpliedRelationshipTests extends DasTest {
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new CustomerData(getAutoConnection()).refresh();
+        new OrderData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Ensure that an implied relationship is not created when a defined one already exists
+     * 
+     * @throws Exception
+     */
+    public void testRelationshipAlreadyDefined() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        Relationship r = helper.addRelationship("CUSTOMER.ID", "ANORDER.CUSTOMER_ID");
+        r.setName("definedRelationship");
+
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+        Command select = das.createCommand("select * from CUSTOMER left join ANORDER "
+                + "ON CUSTOMER.ID = ANORDER.CUSTOMER_ID");
+
+        DataObject root = select.executeQuery();
+        DataObject cust = root.getDataObject("CUSTOMER[1]");
+        Iterator i = cust.getType().getProperties().iterator();
+        while (i.hasNext()) {
+            Property p = (Property) i.next();
+            if (!p.getType().isDataType()) {
+                assertEquals(p.getName(), "definedRelationship");
+            }
+        }
+    }
+
+    /**
+     * Add a new Order to a list of Customers without defining any config information
+     * 
+     * @throws Exception
+     */
+    public void testAddNewOrder() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+
+        Command select = das.createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER "
+                + "ON CUSTOMER.ID = ANORDER.CUSTOMER_ID");
+
+        DataObject root = select.executeQuery();
+
+        DataObject cust = root.getDataObject("CUSTOMER[1]");
+
+        // Save ID and Order Count
+        int custID = cust.getInt("ID");
+        int custOrderCount = cust.getList("ANORDER").size();
+
+        // Create a new Order and add to customer1
+        DataObject order = root.createDataObject("ANORDER");
+
+        order.set("ID", new Integer(99));
+        order.set("PRODUCT", "The 99th product");
+        order.set("QUANTITY", new Integer(99));
+        cust.getList("ANORDER").add(order);
+
+        assertEquals(custOrderCount + 1, cust.getList("ANORDER").size());
+
+        // Build apply changes command
+        das.applyChanges(root);
+
+        // verify cust1 relationship updates
+        select = das.createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID "
+                 + "where CUSTOMER.ID = ?");
+
+        select.setParameter(1, new Integer(custID));
+        root = select.executeQuery();
+
+        assertEquals(custOrderCount + 1, root.getList("CUSTOMER[1]/ANORDER").size());
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java
new file mode 100644
index 0000000000..b2aa8a8691
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java
@@ -0,0 +1,123 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.sql.Timestamp;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.DogData;
+import org.apache.tuscany.das.rdb.test.data.KennelData;
+import org.apache.tuscany.das.rdb.test.data.OwnerData;
+import org.apache.tuscany.das.rdb.test.data.OwnerDogData;
+import org.apache.tuscany.das.rdb.test.data.VisitData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+import org.apache.tuscany.das.rdb.test.framework.TestData;
+
+import commonj.sdo.DataObject;
+
+public class KennelTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new DogData(getAutoConnection()).refresh();
+        new OwnerData(getAutoConnection()).refresh();
+        new OwnerDogData(getAutoConnection()).refresh();
+        new KennelData(getAutoConnection()).refresh();
+        new VisitData(getAutoConnection()).refresh();
+                
+
+    }
+
+    public void testSimple() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+
+        // Build the select command
+        Command selectCommand = das.createCommand("select * from DOG");
+
+        // Get the graph
+        DataObject root = selectCommand.executeQuery();
+
+        assertEquals(3, root.getList("DOG").size());
+
+    }
+    
+    public void testSimple2() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+
+        // Build the select command
+        Command selectCommand = das.createCommand("select * from OWNER");
+
+        // Get the graph
+        DataObject root = selectCommand.executeQuery();
+
+        assertEquals(3, root.getList("OWNER").size());
+
+    }
+    
+    public void testSimple3() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+
+        // Build the select command
+        Command selectCommand = das.createCommand("select * from OWNER, DOG "
+                + "where DOG.OWNER_ID = OWNER.ID and OWNER.NAME = 'Fanny'");
+
+        // Get the graph
+        DataObject root = selectCommand.executeQuery();
+        
+        //Get Fanny
+        DataObject fanny = root.getDataObject("OWNER[1]");
+        assertEquals("Fido", fanny.getString("DOG[1]/NAME"));
+
+    }
+
+    public void testSimple4() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+
+        // Build the select command
+        Command selectCommand = das.createCommand("select * from KENNEL");
+
+        // Get the graph
+        DataObject root = selectCommand.executeQuery();
+        
+        assertEquals(3, root.getList("KENNEL").size());
+ 
+    }
+    
+    public void testSimple5() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+
+        // Build the select command
+        Command selectCommand = das.createCommand("select * from VISIT");
+
+        // Get the graph
+        DataObject root = selectCommand.executeQuery();
+        
+        assertEquals(3, root.getList("VISIT").size());
+        assertEquals(TestData.getTimestamp("2006-10-20 00:00:00.0"), (Timestamp)root.get("VISIT[1]/CHECK_IN"));
+ 
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/LOBTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/LOBTests.java
new file mode 100644
index 0000000000..c186ea4ad6
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/LOBTests.java
@@ -0,0 +1,96 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.DocumentsImagesData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class LOBTests extends DasTest {
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new DocumentsImagesData(getAutoConnection()).refresh();
+    }
+    
+    protected void tearDown() throws Exception {
+    	super.tearDown();
+    }
+    
+    public void testReadWriteBlob() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConnection());
+    	
+    	//Select image
+    	Command read = das.createCommand("SELECT PIC FROM DOCUMENTS_IMAGES WHERE id = 100");
+    	DataObject root = read.executeQuery();
+    	List result = root.getList("DOCUMENTS_IMAGES");
+    	assertEquals(1, result.size());
+    	byte[] imgArray = ((DataObject)result.get(0)).getBytes(0);
+    	assertEquals(150, imgArray.length);
+    	
+    	//insert same image
+    	Command insert = das.createCommand("INSERT INTO DOCUMENTS_IMAGES (ID, PIC) VALUES (?,?)");
+    	insert.setParameter(1, new Integer(101));
+    	insert.setParameter(2, imgArray);
+    	insert.execute();
+    	
+    	//Select again
+    	Command readNew = das.createCommand("SELECT PIC FROM DOCUMENTS_IMAGES WHERE id = 101");
+    	root = readNew.executeQuery();
+    	result = root.getList("DOCUMENTS_IMAGES");
+    	assertEquals(1, result.size());
+    	imgArray = ((DataObject)result.get(0)).getBytes(0);
+    	assertEquals(150, imgArray.length);
+    }
+    
+    public void testReadWriteClob() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConnection());
+    	
+    	//Select image
+    	Command read = das.createCommand("SELECT TEXT FROM DOCUMENTS_IMAGES WHERE id = 100");
+    	DataObject root = read.executeQuery();
+    	List result = root.getList("DOCUMENTS_IMAGES");
+    	assertEquals(1, result.size());
+    	Object txtObj = ((DataObject)result.get(0)).get(0);
+    	assertTrue(txtObj instanceof java.sql.Clob);
+    	java.sql.Clob txtClob = (java.sql.Clob)txtObj;
+    	assertEquals(19, txtClob.length());
+    	
+    	//insert same image
+    	Command insert = das.createCommand("INSERT INTO DOCUMENTS_IMAGES (ID, TEXT) VALUES (?,?)");
+    	insert.setParameter(1, new Integer(101));
+    	insert.setParameter(2, txtClob);
+    	insert.execute();
+    	
+    	//Select again
+    	Command readNew = das.createCommand("SELECT TEXT FROM DOCUMENTS_IMAGES WHERE id = 101");
+    	root = readNew.executeQuery();
+    	result = root.getList("DOCUMENTS_IMAGES");
+    	assertEquals(1, result.size());
+    	txtObj = ((DataObject)result.get(0)).get(0);    	
+    	assertTrue(txtObj instanceof java.sql.Clob);
+    	txtClob = (java.sql.Clob)txtObj;
+    	assertEquals(19, txtClob.length());
+    }    
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MissingPKTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MissingPKTests.java
new file mode 100644
index 0000000000..f12e383cae
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MissingPKTests.java
@@ -0,0 +1,350 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.BookData;
+import org.apache.tuscany.das.rdb.test.data.DogData;
+import org.apache.tuscany.das.rdb.test.data.MultiSchemaData;
+import org.apache.tuscany.das.rdb.test.data.OrderDetailsData;
+import org.apache.tuscany.das.rdb.test.data.OrderDetailsDescriptionData;
+import org.apache.tuscany.das.rdb.test.data.OwnerData;
+import org.apache.tuscany.das.rdb.test.data.OwnerDogData;
+import org.apache.tuscany.das.rdb.test.data.PartData;
+import org.apache.tuscany.das.rdb.test.data.SingerData;
+import org.apache.tuscany.das.rdb.test.data.SongData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class MissingPKTests  extends DasTest {
+    protected void setUp() throws Exception {
+        super.setUp();
+        new PartData(getAutoConnection()).refresh();
+        new DogData(getAutoConnection()).refresh();
+        new OwnerData(getAutoConnection()).refresh();
+        new OwnerDogData(getAutoConnection()).refresh();
+        new OrderDetailsData(getAutoConnection()).refresh();
+        new OrderDetailsDescriptionData(getAutoConnection()).refresh();
+        new MultiSchemaData(getAutoConnection()).refresh();
+        new BookData(getAutoConnection()).refresh();
+        new SingerData(getAutoConnection()).refresh();
+        new SongData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    //join with both tables PKs present in SELECT, PK data in child is null
+    public void testNullDataInPK() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPK.xml"), getConnection());
+    	Command select = das.getCommand("testNullDataInPK");
+    	try{
+    		select.executeQuery();
+    		fail("Expected exception");
+    	}catch(RuntimeException e){
+    		if(e.getMessage().
+    				indexOf("in query does not include Primary Key "+
+    						"column or has null value in it, can not proceed!") >0){
+    			assertTrue(true);//expected failure
+    		}
+    	}
+    }
+
+    //join with both tables PKs present in SELECT, child row is complete null, outer join
+    public void testOuterJoin() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPK.xml"), getConnection());
+    	Command select = das.getCommand("testOuterJoin");
+    	DataObject root = select.executeQuery();
+    	List singers = root.getList("SINGER");
+    	List songs = root.getList("SONG");//as there is no relationship (explicit/implicit)
+    	assertNotNull(singers);
+    	assertEquals(1, singers.size());
+    	assertNotNull(songs);
+    	assertEquals(0, songs.size());
+    }
+
+    //join with both tables' PKs present in SELECT
+    public void test11() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPK.xml"), getConnection());
+    	Command select = das.getCommand("test11");
+    	DataObject root = select.executeQuery();
+    	List owners = root.getList("OWNER");
+    	List dogs = root.getList("DOG");//as there is no relationship (explicit/implicit)
+    	assertNotNull(owners);
+    	assertNotNull(dogs);
+    	for(int i=0; i<owners.size(); i++){
+    		DataObject dobj = (DataObject)owners.get(i);
+    	}
+    	assertEquals(3, owners.size());
+    	assertEquals(3, dogs.size());
+    }
+
+    //join with parent table's PK missing in SELECT
+    public void test22() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPK.xml"), getConnection());
+    	Command select = das.getCommand("test22");
+    	try{
+    		select.executeQuery();
+    		fail("Expected exception");
+    	}catch(RuntimeException e){
+    		if(e.getMessage().
+    				indexOf("in query does not include Primary Key "+
+    						"column or has null value in it, can not proceed!") >0){
+    			assertTrue(true);//expected failure
+    		}
+    	}
+    }
+
+    //join with child table's PK missing in SELECT
+    public void test33() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPK.xml"), getConnection());
+    	Command select = das.getCommand("test33");
+    	try{
+    		select.executeQuery();
+    		fail("Expected exception");
+    	}catch(RuntimeException e){
+    		if(e.getMessage().
+    				indexOf("in query does not include Primary Key "+
+    						"column or has null value in it, can not proceed!") >0){
+    			assertTrue(true);//expected failure
+    		}
+    	}
+    }
+
+    //join with both tables' PK missing in SELECT
+    public void test44() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPK.xml"), getConnection());
+    	Command select = das.getCommand("test44");
+    	try{
+    		select.executeQuery();
+    		fail("Expected exception");
+    	}catch(RuntimeException e){
+    		if(e.getMessage().
+    				indexOf("in query does not include Primary Key "+
+    						"column or has null value in it, can not proceed!") >0){
+    			assertTrue(true);//expected failure
+    		}
+    	}
+    }
+
+    //join with both tables' PK present in SELECT (use relationship)
+    public void test11_rel() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPKREL.xml"), getConnection());
+    	Command select = das.getCommand("test11");
+    	DataObject root = select.executeQuery();
+    	List owners = root.getList("OWNER");
+    	assertNotNull(owners);
+    	assertEquals(3, owners.size());
+
+    	if(owners != null){
+    		for(int i=0; i<owners.size(); i++){
+    			List dogs = ((DataObject)owners.get(i)).getList("owns"); //use relationship
+    	    	assertNotNull(dogs);
+
+    	    	if( (((DataObject)owners.get(i)).getInt("ID") == 1 ) &&
+    	    			dogs.size()==1){
+    	    		assertTrue(true);//expected
+    	    	}
+
+    	    	if( (((DataObject)owners.get(i)).getInt("ID") == 2 ) &&
+    	    			dogs.size()==1){
+    	    		assertTrue(true);//expected
+    	    	}
+
+    	    	if( (((DataObject)owners.get(i)).getInt("ID") == 3 ) &&
+    	    			dogs.size()==1){
+    	    		assertTrue(true);//expected
+    	    	}
+    		}
+    	}
+    }
+
+    //join with parent table's PK missing in SELECT (use relationship)
+    public void test22_rel() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPKREL.xml"), getConnection());
+    	Command select = das.getCommand("test22");
+    	try{
+    		select.executeQuery();
+    		fail("Expected exception");
+    	}catch(RuntimeException e){
+    		if(e.getMessage().
+    				indexOf("in query does not include Primary Key "+
+    						"column or has null value in it, can not proceed!") >0){
+    			assertTrue(true);//expected failure
+    		}
+    	}
+    }
+
+    //join with child table's PK missing in SELECT (use relationship)
+    public void test33_rel() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPKREL.xml"), getConnection());
+    	Command select = das.getCommand("test33");
+    	try{
+    		select.executeQuery();
+    		fail("Expected exception");
+    	}catch(RuntimeException e){
+    		if(e.getMessage().
+    				indexOf("in query does not include Primary Key "+
+    						"column or has null value in it, can not proceed!") >0){
+    			assertTrue(true);//expected failure
+    		}
+    	}
+    }
+
+    //join with both tables' PK missing in SELECT (use relationship)
+    public void test44_rel() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPKREL.xml"), getConnection());
+    	Command select = das.getCommand("test44");
+    	try{
+    		select.executeQuery();
+    		fail("Expected exception");
+    	}catch(RuntimeException e){
+    		if(e.getMessage().
+    				indexOf("in query does not include Primary Key "+
+    						"column or has null value in it, can not proceed!") >0){
+    			assertTrue(true);//expected failure
+    		}
+    	}
+    }
+
+    public void testCompoundPks() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPKREL.xml"), getConnection());
+    	Command select = das.getCommand("compound_pks");
+    	DataObject root = select.executeQuery();
+    	assertEquals(4, root.getList("ORDERDETAILS").size());
+    }
+
+    public void testCompoundPksFail() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPKREL.xml"), getConnection());
+    	Command select = das.getCommand("compound_pks_fail");
+    	try{
+    		select.executeQuery();
+    		fail("Expected exception");
+    	}catch(RuntimeException e){
+    		if(e.getMessage().
+    				indexOf("in query does not include Primary Key "+
+    						"column or has null value in it, can not proceed!") >0){
+    			assertTrue(true);//expected failure
+    		}
+    	}
+    }
+
+    public void testCompoundPksJoin() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPKREL.xml"), getConnection());
+    	Command select = das.getCommand("compound_pks_join");
+    	DataObject root = select.executeQuery();
+    	List ordDetList = root.getList("ORDERDETAILS");
+    	assertEquals(4, ordDetList.size());
+    	for(int i=0; i<ordDetList.size(); i++){
+    		DataObject curDO = (DataObject)ordDetList.get(i);
+    		List ordDetDescList = curDO.getList("orderDetailsDesc");
+    		if(curDO.getInt("ORDERID")==1 && curDO.getInt("PRODUCTID")==1 && ordDetDescList.size()==2){
+    			assertTrue(true);//expected
+    		}
+
+    		if(curDO.getInt("ORDERID")==1 && curDO.getInt("PRODUCTID")==2 && ordDetDescList.size()==2){
+    			assertTrue(true);//expected
+    		}
+
+    		if(curDO.getInt("ORDERID")==2 && curDO.getInt("PRODUCTID")==1 && ordDetDescList.size()==1){
+    			assertTrue(true);//expected
+    		}
+
+    		if(curDO.getInt("ORDERID")==2 && curDO.getInt("PRODUCTID")==2 && ordDetDescList.size()==1){
+    			assertTrue(true);//expected
+    		}
+    	}
+    }
+
+    public void testCompoundPksJoinFail() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPKREL.xml"), getConnection());
+    	Command select = das.getCommand("compound_pks_join_fail");
+    	try{
+    		select.executeQuery();
+    		fail("Expected exception");
+    	}catch(RuntimeException e){
+    		if(e.getMessage().
+    				indexOf("in query does not include Primary Key "+
+    						"column or has null value in it, can not proceed!") >0){
+    			assertTrue(true);//expected failure
+    		}
+    	}
+    }
+
+    //case when no PK defined in Config but column ID is there in table and is not in SELECT clause
+    //convention over configuration should assume it as PK and fail select
+    public void testPartFail() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPK.xml"), getConnection());
+    	Command select = das.getCommand("testPartFail");
+    	try{
+    		select.executeQuery();
+    		fail("Expected exception");
+    	}catch(RuntimeException e){
+    		if(e.getMessage().
+    				indexOf("in query does not include Primary Key "+
+    						"column or has null value in it, can not proceed!") >0){
+    			assertTrue(true);//expected failure
+    		}
+    	}
+    }
+
+    public void testMultiSchemaPKMiss() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MultiSchemaDasConfig14.xml"), getConnection());
+
+    	//Explicit compound key relationship between DASTEST1.ORDERDETAILS and DASTEST3.ORDERDETAILSDESC
+    	//ORDERID <-> ORDERID, PRODUCTID<->PRODUCTID
+    	// Read some order details and related order details descs
+        Command select = das
+                .createCommand("SELECT DASTEST1.ORDERDETAILS.ORDERID, DASTEST1.ORDERDETAILS.PRODUCTID," +
+                		"DASTEST3.ORDERDETAILSDESC.ORDERID FROM DASTEST1.ORDERDETAILS LEFT JOIN DASTEST3.ORDERDETAILSDESC " +
+                		" ON DASTEST1.ORDERDETAILS.ORDERID = DASTEST3.ORDERDETAILSDESC.ORDERID " +
+                		" AND DASTEST1.ORDERDETAILS.PRODUCTID = DASTEST3.ORDERDETAILSDESC.PRODUCTID");
+
+        try{
+    		select.executeQuery();
+    		fail("Expected exception");
+    	}catch(RuntimeException e){
+    		if(e.getMessage().
+    				indexOf("in query does not include Primary Key "+
+    						"column or has null value in it, can not proceed!") >0){
+    			assertTrue(true);//expected failure
+    		}
+    	}
+    }
+
+    public void testTypePropsDifferent() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MissingPK.xml"), getConnection());
+    	Command select = das.getCommand("get all books");
+        try{
+    		select.executeQuery();
+    		fail("Expected exception");
+    	}catch(RuntimeException e){
+    		if(e.getMessage().
+    				indexOf("in query does not include Primary Key "+
+    						"column or has null value in it, can not proceed!") >0){
+    			assertTrue(true);//expected failure
+    		}
+    	}
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MultiSchemaTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MultiSchemaTests.java
new file mode 100644
index 0000000000..ee16434236
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MultiSchemaTests.java
@@ -0,0 +1,715 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.MultiSchemaData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class MultiSchemaTests extends DasTest{
+    protected void setUp() throws Exception {        
+        super.setUp();
+       	new MultiSchemaData(getAutoConnection()).refresh();
+    }
+    
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+    
+	/**If database is present connect to it and create necessary tables, procedures, data etc.
+	 * 
+	 * Below is test database schema required. 
+	 * Schema Layout - 
+	 * Database: DASTEST
+	 * Schema: DASTEST1
+	 * 	   Tables: CUSTOMER, EMPLOYEE, CITY, ORDERDETAILS
+	 * Schema: DASTEST2
+	 * 	   Tables: CUSTOMER, ACCOUNT, CITY 
+	 * Schema: DASTEST3
+	 * 	   Tables: CUSTOMER, CUSTORDER, ORDERDETAILSDESC
+	 */
+	
+	public void testMulitiSchemaCase1() throws Exception {
+		DAS das = DAS.FACTORY.createDAS(getConfig("MultiSchemaDasConfig1.xml"), getConnection());
+		//test case 1 - CRUD when schemaName, tableName, typeName present - DASTEST1.CUSTOMER
+		//System.out.println("Result:test case 1 - CRUD when schemaName, tableName, typeName present:DASTEST1.CUSTOMER");
+		//test select
+		//System.out.println("Result:test case 1 - SELECT");
+		assertEquals(getCustomers(das).size(), 3);
+		
+		//test insert - basic
+		//System.out.println("Result:test case 1 - INSERT(execute())");
+		addCustomer(das);
+		assertEquals(getCustomers(das).size(), 4);
+		
+		//test insert - use SDO
+		//System.out.println("Result:test case 1 - INSERT(applyChanges())");
+		addSDOCustomer(das);
+		assertEquals(getCustomers(das).size(), 5);
+		
+		//test delete - basic
+		//System.out.println("Result:test case 1 - DELETE(execute())");
+		deleteCustomer(das);
+		assertEquals(getCustomers(das).size(), 4);
+		
+		//test delete - SDO
+		//System.out.println("Result:test case 1 - DELETE(applyChanges())");
+		deleteSDOCustomer(das);
+		assertEquals(getCustomers(das).size(), 3);
+		
+		//test update 
+		//System.out.println("Result:test case 1 - UPDATE");
+		changeFirstCustomerName(das);
+		assertEquals( ((DataObject)getCustomers(das).get(0)).get("LASTNAME"), "Williams");
+		//System.out.println("******************************************");
+	}
+	
+	public void testMultiSchemaCase2()throws Exception{		
+		DAS das = DAS.FACTORY.createDAS(getConfig("MultiSchemaDasConfig2.xml"), getConnection());
+		//test case 1 - CRUD when schemaName, tableName present, typeName not present - DASTEST2.ACCOUNT
+		//System.out.println("Result:test case 2 - CRUD when schemaName, tableName present, typeName not present:DASTEST2.ACCOUNT");
+		//test select
+		//System.out.println("Result:test case 2 - SELECT");
+		assertEquals(getAccounts(das).size(), 4);
+		
+		//test insert - basic
+		//System.out.println("Result:test case 2 - INSERT(execute())");
+		addAccount(das);
+		assertEquals(getAccounts(das).size(), 5);
+		
+		//test insert - SDO
+		//System.out.println("Result:test case 2 - INSERT(applyChanges())");
+		addSDOAccount(das);
+		assertEquals(getAccounts(das).size(), 6);
+		
+		//test delete - basic
+		//System.out.println("Result:test case 2 - DELETE(execute())");
+		deleteAccount(das);
+		assertEquals(getAccounts(das).size(), 5);
+		
+		//test delete - SDO
+		//System.out.println("Result:test case 2 - DELETE(applyChanges())");
+		deleteSDOAccount(das);
+		assertEquals(getAccounts(das).size(), 4);
+		
+		//test update 
+		//System.out.println("Result:test case 2 - UPDATE");
+		changeFirstAccountBalance(das);
+		assertEquals( ((DataObject)getAccounts(das).get(0)).get("BALANCE"), new Integer(45000));
+		//System.out.println("******************************************");		
+	}
+	
+	public void testMultiSchemaCase3() throws Exception{
+		DAS das = DAS.FACTORY.createDAS(getConfig("MultiSchemaDasConfig3.xml"), getConnection());
+		//test case 3 - CRUD when <Table> is not there in config - DASTEST1.CITY
+		//System.out.println("Result:test case 3 - CRUD when <Table> is not there in config:DASTEST1.CITY");
+		//test select
+		//System.out.println("Result:test case 3 - SELECT");
+		assertEquals(getCities(das).size(), 2);
+		
+		//test insert - basic
+		//System.out.println("Result:test case 3 - INSERT(execute())");
+		addCity(das);
+		assertEquals(getCities(das).size(), 3);
+		
+		//test insert - SDO
+		//System.out.println("Result:test case 3 - INSERT(applyChanges())");
+		assertEquals(addSDOCity(das),"Expected failure to insert");
+		assertEquals(getCities(das).size(), 3);
+		
+		//test delete - basic
+		//System.out.println("Result:test case 3 - DELETE(execute())");
+		deleteCity(das);
+		assertEquals(getCities(das).size(), 2);
+		
+		//test delete - SDO
+		//System.out.println("Result:test case 3 - DELETE(applyChanges())");
+		assertEquals(deleteSDOCity(das), "Expected failure to delete");
+		assertEquals(getCities(das).size(), 2);
+		
+		//test update 
+		//System.out.println("Result:test case 3 - UPDATE");
+		assertEquals(changeFirstCityName(das), "Expected failure to update");
+		//System.out.println("******************************************");
+	}
+	
+	public void testMultiSchemaCase4() throws Exception{		
+		//System.out.println("Result:test case 4 - with multi schema support ON, have table with no schemaName"); 
+		try{
+		//get das handle for invalid config
+			DAS das = DAS.FACTORY.createDAS(getConfig("MultiSchemaInvalidDasConfig.xml"), getConnection());
+    	}catch(Exception e){
+    		//No schemaName provided for tableName CUSTORDER when schemaNameSupport is ON
+   			assertEquals("No schemaName provided for tableName CUSTORDER when schemaNameSupport is ON", 
+    					e.getMessage());
+    	}
+    	
+		//System.out.println("******************************************");
+	}
+	
+	public void testMultiSchemaCase5() throws Exception{
+		DAS das = DAS.FACTORY.createDAS(getConfig("MultiSchemaDasConfig5.xml"), getConnection());
+		
+		//test case 5 - SELECT when CUSTOMER.ID is present in DASTEST1 and DASTEST2
+		//and DASTEST2.CUSTOMER <Table> not in config
+		//System.out.println("Result:test case 5 - SELECT when CUSTOMER.ID is present in DASTEST1 and DASTEST2 and"+
+			//	" DASTEST2.CUSTOMER <Table> not in config");
+		DataObject root = getCustomersFrom2SchemasWithOneSchemaNotInConfig(das);
+		assertEquals(root.getList("DASTEST1_CUSTOMER").size(), 3);
+		assertEquals(root.getList("DASTEST2.CUSTOMER").size(), 3);
+		//System.out.println("******************************************");
+	}
+
+	public void testMultiSchemaCase6()throws Exception{
+		DAS das = DAS.FACTORY.createDAS(getConfig("MultiSchemaDasConfig6.xml"), getConnection());
+		//test case 6 - SELECT when CUSTOMER.ID is present in DASTEST1 and DB2ADMIN - and both <table> entries are in Config
+		//System.out.println("Result:test case 6 - SELECT when CUSTOMER.ID is present in DASTEST1 and DB2ADMIN, and both <table> in config");
+		//test select
+		//System.out.println("Result:test case 6 - SELECT");
+		DataObject root = getCustomersFrom2SchemasBothSchemaInConfig(das);
+		assertEquals(root.getList("DASTEST1_CUSTOMER").size(),3);
+		assertEquals(root.getList("DASTEST3_CUSTOMER").size(),3);
+		//System.out.println("******************************************");
+	}
+
+	public void testMultiSchemaCase7()throws Exception{
+		DAS das = DAS.FACTORY.createDAS(getConfig("MultiSchemaDasConfig7.xml"), getConnection());
+		//test case 7 - SELECT when CITY.INDX is present in DASTEST1 and DASTEST2 and no enrty for
+		//any <Table> in config
+		//System.out.println("Result:test case 7 - SELECT when CITY.INDX is present in DASTEST1 and DASTEST2, and no <table> in config");
+		//test select
+		//System.out.println("Result:test case 7 - SELECT");
+		DataObject root = getCitiesFrom2SchemasNoneInConfig(das);
+		assertEquals(root.getList("DASTEST1.CITY").size(), 2);
+		assertEquals(root.getList("DASTEST2.CITY").size(), 2);
+		//System.out.println("******************************************");
+	}
+	
+	public void testMultiSchemaCase8()throws Exception{
+		DAS das = DAS.FACTORY.createDAS(getConfig("MultiSchemaDasConfig8.xml"), getConnection());
+
+		//test case 8 - SELECT using ResultDescriptor - DASTEST2.ACCOUNT
+		//System.out.println("Result:test case 8 - SELECT using ResultDescriptor:DASTEST2.ACCOUNT");
+		assertEquals(getAccountRSDesc(das).size(), 4);
+		//System.out.println("******************************************");
+	}
+	
+	public void testMultiSchemaCase9()throws Exception{
+		DAS das = DAS.FACTORY.createDAS(getConfig("MultiSchemaDasConfig9.xml"), getConnection());
+		//test case 9, 11 - Implied relationship , PK when both tables in same schema DASTEST2.CUSTOMER, DASTEST2.ACCOUNT
+		//System.out.println("Result:test case 9, 11 - Implied relationship when both tables in same schema DASTEST2.CUSTOMER, DASTEST2.ACCOUNT");
+		DataObject root = getSingleSchemaCustomersAccounts(das);
+		assertEquals(root.getList("DASTEST2.CUSTOMER").size(), 2);
+		assertEquals(root.getList("DASTEST2.ACCOUNT").size(), 4);
+		//System.out.println("******************************************");
+	}	
+	
+	private static Date kbday;
+    private static Date tbday;
+    private static DateFormat myformat = new SimpleDateFormat("yyyy.MM.dd");
+	static {
+        try {
+            kbday = myformat.parse("1957.09.27");
+            tbday = myformat.parse("1966.12.20");
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+	
+    public void testMultiSchemaCase12()throws Exception{
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MultiSchemaDasConfig12.xml"), getConnection());
+    	//test case 12 - use converter with multi-schema ON:DASTEST1.EMPLOYEE
+    	//System.out.println("Result:test case 12 - converter on DASTEST1.EMPLOYEE.LASTNAME");
+        Command read = das.getCommand("testArbitraryConverter");
+        // Read
+        DataObject root = read.executeQuery();
+
+        // Verify
+        assertEquals(kbday,root.getDate("DASTEST1.EMPLOYEE[1]/LASTNAME"));
+		
+        // Modify
+        root.setDate("DASTEST1.EMPLOYEE[1]/LASTNAME", tbday);
+        das.applyChanges(root);
+
+        // Read
+        root = read.executeQuery();
+
+        // Verify
+        assertEquals(tbday, root.getDate("DASTEST1.EMPLOYEE[1]/LASTNAME"));
+        
+        //System.out.println("******************************************");
+    }
+    
+    public void testMultiSchemaCase13()throws Exception{
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MultiSchemaDasConfig13.xml"), getConnection());
+
+    	//Explicit relationship between DASTEST1.CUSTOMER and DASTEST2.ACCOUNT
+    	//System.out.println("Result:test case13 - Explicit relationship when both tables in different schema DASTEST1.CUSTOMER, DASTEST2.ACCOUNT");
+        // Read some customers and related accounts
+        Command select = das
+                .createCommand("SELECT * FROM DASTEST1.CUSTOMER LEFT JOIN DASTEST2.ACCOUNT "+
+                		" ON DASTEST1.CUSTOMER.ID = DASTEST2.ACCOUNT.CUSTOMER_ID");
+
+        DataObject root = select.executeQuery();
+
+        DataObject cust1 = root.getDataObject("DASTEST1_CUSTOMER[1]");
+        DataObject cust2 = root.getDataObject("DASTEST1_CUSTOMER[2]");
+
+        // Save IDs
+        Integer cust1ID = (Integer) cust1.get("ID");
+        Integer cust2ID = (Integer) cust2.get("ID");
+        
+        //System.out.println("cust 1 ID :"+cust1ID);
+        //System.out.println("cust 2 ID :"+cust2ID);
+        // save account count
+        Integer cust1AccountCount = new Integer(cust1.getList("accounts").size());
+        Integer cust2AccountCount = new Integer(cust2.getList("accounts").size());
+
+        // Move an account to cust1 from cust2
+        DataObject account = (DataObject) cust2.getList("accounts").get(0);
+        cust1.getList("accounts").add(account);
+
+        // Flush changes
+        das.applyChanges(root);
+
+        // verify cust1 relationship updates
+        select = das
+                .createCommand("SELECT * FROM DASTEST1.CUSTOMER LEFT JOIN DASTEST2.ACCOUNT ON "
+                        + "DASTEST1.CUSTOMER.ID = DASTEST2.ACCOUNT.CUSTOMER_ID where DASTEST1.CUSTOMER.ID = ?");
+        select.setParameter(1, cust1ID);
+
+        root = select.executeQuery();
+        assertEquals((cust1AccountCount.intValue() + 1), root.getList("DASTEST1_CUSTOMER[1]/accounts").size());
+
+        // verify cust2 relationship updates
+        select.setParameter(1, cust2ID);
+        root = select.executeQuery();
+        assertEquals((cust2AccountCount.intValue() - 1),root.getList("DASTEST1_CUSTOMER[1]/accounts").size());
+        //System.out.println("******************************************");        
+    }
+    
+    //steer away from implied relationships - we dont support multi schema there!!!
+    public void testMultiSchemaCase14()throws Exception{
+    	DAS das = DAS.FACTORY.createDAS(getConfig("MultiSchemaDasConfig14.xml"), getConnection());
+
+    	//Explicit compound key relationship between DASTEST1.ORDERDETAILS and DASTEST3.ORDERDETAILSDESC
+    	//ORDERID <-> ORDERID, PRODUCTID<->PRODUCTID
+    	//System.out.println("Result:test case14 - Explicit compound key relationship when both " +
+    		//	"tables in different schema DASTEST1.ORDERDETAILS, DASTEST3.ORDERDETAILSDESC");
+
+    	// Read some order details and related order details descs
+        Command select = das
+                .createCommand("SELECT * FROM DASTEST1.ORDERDETAILS LEFT JOIN DASTEST3.ORDERDETAILSDESC " +
+                		" ON DASTEST1.ORDERDETAILS.ORDERID = DASTEST3.ORDERDETAILSDESC.ORDERID " +
+                		" AND DASTEST1.ORDERDETAILS.PRODUCTID = DASTEST3.ORDERDETAILSDESC.PRODUCTID");
+
+        DataObject root = select.executeQuery();
+
+        DataObject ordDet1 = root.getDataObject("DASTEST1.ORDERDETAILS[1]");
+        DataObject ordDet2 = root.getDataObject("DASTEST1.ORDERDETAILS[2]");
+
+        // Save IDs
+        Integer ord1ID = (Integer) ordDet1.get("ORDERID");
+        Integer prod1ID = (Integer) ordDet1.get("PRODUCTID");
+        
+        Integer ord2ID = (Integer) ordDet2.get("ORDERID");
+        Integer prod2ID = (Integer) ordDet2.get("PRODUCTID");
+        
+        // save order count
+        Integer order1DetDescCount = new Integer(ordDet1.getList("orderDetailsDesc").size());
+        Integer order2DetDescCount = new Integer(ordDet2.getList("orderDetailsDesc").size());
+
+        // Move an order detail desc to ord det1 from ord det2
+        DataObject orderDetailsDesc = (DataObject) ordDet2.getList("orderDetailsDesc").get(0);
+        ordDet1.getList("orderDetailsDesc").add(orderDetailsDesc);
+
+        // Flush changes
+        das.applyChanges(root);
+
+        // verify ord det1 relationship updates
+        select = das
+        .createCommand("SELECT * FROM DASTEST1.ORDERDETAILS LEFT JOIN DASTEST3.ORDERDETAILSDESC " +
+        		" ON DASTEST1.ORDERDETAILS.ORDERID = DASTEST3.ORDERDETAILSDESC.ORDERID " +
+        		" AND DASTEST1.ORDERDETAILS.PRODUCTID = DASTEST3.ORDERDETAILSDESC.PRODUCTID " +
+        		" where DASTEST1.ORDERDETAILS.ORDERID = ? AND DASTEST1.ORDERDETAILS.PRODUCTID = ?");
+        select.setParameter(1, ord1ID);
+        select.setParameter(2, prod1ID);
+
+        root = select.executeQuery();
+        assertEquals((order1DetDescCount.intValue() + 1),
+        		root.getList("DASTEST1.ORDERDETAILS[1]/orderDetailsDesc").size());
+
+        // verify ord det2 relationship updates
+        select.setParameter(1, ord2ID);
+        select.setParameter(2, prod2ID);
+        
+        root = select.executeQuery();
+        assertEquals((order2DetDescCount.intValue() - 1),
+        		root.getList("DASTEST1.ORDERDETAILS[1]/orderDetailsDesc").size());    	
+    }
+    
+	/**
+	 * Display result
+	 * @param list 
+	 * @param numCols - number of columns in each row
+	 */
+	public static void printList(List list, int numCols){
+		if(list != null) 
+			System.out.println("list size:"+list.size());
+		
+		for(int i=0; i<list.size(); i++){
+			for(int j=0; j<numCols; j++){
+				System.out.print("   col"+(j+1)+":"+(((DataObject)list.get(i)).getString(j)) );
+			}
+			System.out.println();
+		}
+	}
+	
+	public static void printMultiSchemaList(DataObject root, String[] lists, String[] cols){
+		if(lists != null && cols != null){
+			if(lists.length != cols.length) return;
+			
+			for(int ii=0; ii<lists.length; ii++){
+				List list = root.getList(lists[ii]);
+				printList(list, Integer.parseInt(cols[ii]));
+			}
+		}
+	}	
+	
+	/**********START TEST CASE 1***********************************************/
+	/**
+	 * select
+	 * @return
+	 */
+    public final List getCustomers(DAS das) {
+
+        Command read = das.getCommand("SelectDASTEST1CUSTOMER");
+        DataObject root = read.executeQuery();        
+        return root.getList("DASTEST1_CUSTOMER");
+    }
+    /**
+     * insert
+     *
+     */
+     public final void addCustomer(DAS das){
+    	Command insert = das.getCommand("InsertDASTEST1CUSTOMER");
+        insert.execute();
+    }
+
+     public final void addSDOCustomer(DAS das){
+        Command read = das.getCommand("SelectDASTEST1CUSTOMER");
+        DataObject root = read.executeQuery();
+
+        DataObject newCustomer = root.createDataObject("DASTEST1_CUSTOMER");
+
+        newCustomer.setInt("ID", 5);
+        newCustomer.setString("LASTNAME", "PennyDAS");
+        newCustomer.setString("ADDRESS", "HSRDAS");
+
+        das.applyChanges(root);
+        root = read.executeQuery();
+    }
+        
+    /**
+     * delete
+     *
+     */
+    public final void deleteCustomer(DAS das){
+    	Command delete = das.getCommand("DeleteDASTEST1CUSTOMER");
+        delete.execute();	
+    }
+
+    public final void deleteSDOCustomer(DAS das) {
+        Command readAll = das.getCommand("SelectDASTEST1CUSTOMER");
+        DataObject root = readAll.executeQuery();
+
+        List allCustomers = root.getList("DASTEST1_CUSTOMER");
+
+        DataObject lastCustomer = (DataObject)allCustomers.get(allCustomers.size()-1);
+        if(lastCustomer != null){
+        	//System.out.println("Deleting customer named: " + lastCustomer.getString("LASTNAME"));
+        	lastCustomer.delete();
+        }
+
+        das.applyChanges(root);
+    }
+    
+    /**
+     * update
+     *
+     */
+    public final void changeFirstCustomerName(DAS das) {
+        Command readAll = das.getCommand("SelectDASTEST1CUSTOMER");
+        DataObject root = readAll.executeQuery();
+
+        DataObject firstCustomer = root.getDataObject("DASTEST1_CUSTOMER[1]");
+        firstCustomer.set("LASTNAME", "Williams");
+        
+        das.applyChanges(root);
+    }
+    /**********END TEST CASE 1***********************************************/
+    
+	/**********START TEST CASE 2***********************************************/
+	/**
+	 * select
+	 * @return
+	 */
+    public final List  getAccounts(DAS das){
+        Command read = das.getCommand("SelectDASTEST2ACCOUNT");
+        DataObject root = read.executeQuery();        
+        return root.getList("DASTEST2.ACCOUNT");
+    }
+    /**
+     * insert
+     *
+     */
+     public final void addAccount(DAS das){
+    	Command insert = das.getCommand("InsertDASTEST2ACCOUNT");
+        insert.execute();
+    }
+     
+    public final void addSDOAccount(DAS das){
+        Command read = das.getCommand("SelectDASTEST2ACCOUNT");
+        DataObject root = read.executeQuery();
+        
+        List custList = root.getList("DASTEST1_CUSTOMER");
+        DataObject curCust = null;
+        for(int i=0; i<custList.size(); i++){
+        	curCust = (DataObject)custList.get(i);
+        	if(curCust.getInt("ID") == 2) {
+        		break;
+        	}
+        }
+        
+        List acctList = null;
+        if(curCust != null){
+        	acctList = curCust.getList("accounts");
+        	
+        	DataObject newAccount = root.createDataObject("DASTEST2.ACCOUNT");
+            newAccount.setInt("ACCOUNT_ID", 60);
+            //newAccount.setInt("CUSTOMER_ID", 2); - taken from parent, so dont set here,else will throw exception
+            newAccount.setInt("BALANCE",104);
+            
+            acctList.add(newAccount);
+            das.applyChanges(root);  
+        }        	
+    }
+        
+    /**
+     * delete
+     *
+     */
+    public final void deleteAccount(DAS das){
+    	Command delete = das.getCommand("DeleteDASTEST2ACCOUNT");
+        delete.execute();	
+    }
+
+    public final void deleteSDOAccount(DAS das) {
+        Command readAll = das.getCommand("SelectDASTEST2ACCOUNT");
+        DataObject root = readAll.executeQuery();
+
+        List custList = root.getList("DASTEST1_CUSTOMER");
+        
+        DataObject curCust = null;
+        for(int i=0; i<custList.size(); i++){
+        	curCust = (DataObject)custList.get(i);
+        	if(curCust.getInt("ID") == 2) {
+        		break;
+        	}
+        }
+        
+        List acctList = null;
+        if(curCust != null){
+        	acctList = curCust.getList("accounts");
+        	if(acctList != null){
+            	((DataObject)acctList.get(acctList.size()-1)).delete();
+            }
+        }        
+
+        das.applyChanges(root);
+    }
+    
+    /**
+     * update
+     *
+     */
+    public final void changeFirstAccountBalance(DAS das) {
+        Command readAll = das.getCommand("SelectDASTEST2ACCOUNT");
+        DataObject root = readAll.executeQuery();
+
+        DataObject firstAccount = root.getDataObject("DASTEST2.ACCOUNT[1]");
+        firstAccount.set("BALANCE", new Integer(45000));
+        
+        das.applyChanges(root);
+    }
+    /**********END TEST CASE 2***********************************************/
+    
+	/**********START TEST CASE 3***********************************************/
+	/**
+	 * select
+	 * @return
+	 */
+    public final List  getCities(DAS das){
+        Command read = das.getCommand("SelectDASTEST1CITY");
+        DataObject root = read.executeQuery();        
+        return root.getList("DASTEST1.CITY");
+    }
+    /**
+     * insert
+     *
+     */
+     public final void addCity(DAS das){
+    	Command insert = das.getCommand("InsertDASTEST1CITY");
+        insert.execute();
+    }
+     
+    public final String addSDOCity(DAS das){
+        Command read = das.getCommand("SelectDASTEST1CITY");
+        DataObject root = read.executeQuery();
+
+        DataObject newCity = root.createDataObject("DASTEST1.CITY");
+        newCity.setInt("INDX", 3);
+        newCity.setString("NAME", "San Jose");
+
+        try{
+        das.applyChanges(root);
+        }catch(Exception e){
+        	if(e.getMessage().equals("Table DASTEST1.CITY was changed in the DataGraph but is not present in the Config")){
+        		//ignore
+        		return "Expected failure to insert";
+        	}
+        	else{
+        		throw new RuntimeException(e);
+        	}
+        }
+        return null;
+    }
+        
+    /**
+     * delete
+     *
+     */
+    public final void deleteCity(DAS das){
+    	Command delete = das.getCommand("DeleteDASTEST1CITY");
+        delete.execute();	
+    }
+
+    public final String deleteSDOCity(DAS das) {
+        Command readAll = das.getCommand("SelectDASTEST1CITY");
+        DataObject root = readAll.executeQuery();
+
+        List allCities = root.getList("DASTEST1.CITY");
+
+        DataObject lastCity = (DataObject)allCities.get(allCities.size()-1);
+        if(lastCity != null){
+        	//System.out.println("Deleting city: " + lastCity.getString("NAME"));
+        	lastCity.delete();
+        }
+
+        try{
+            das.applyChanges(root);
+        }catch(Exception e){
+        	if(e.getMessage().equals("Table DASTEST1.CITY was changed in the DataGraph but is not present in the Config")){
+        		//ignore
+        		return "Expected failure to delete";
+        	}
+        	else{
+        		throw new RuntimeException(e);
+        	}
+        }
+        return null;
+    }
+    
+    /**
+     * update
+     *
+     */
+    public final String changeFirstCityName(DAS das) {
+        Command readAll = das.getCommand("SelectDASTEST1CITY");
+        DataObject root = readAll.executeQuery();
+
+        DataObject firstCity = root.getDataObject("DASTEST1.CITY[1]");
+        firstCity.set("NAME", "New York");
+        
+        try{
+        	das.applyChanges(root);
+        }catch(Exception e){
+        	if(e.getMessage().equals("Table DASTEST1.CITY was changed in the DataGraph but is not present in the Config")){
+        		//ignore
+        		return "Expected failure to update";
+        	}
+        	else{
+        		throw new RuntimeException(e);
+        	}        	
+        }
+        return null;
+    }
+    /**********END TEST CASE 3***********************************************/
+    /**********START TEST CASE 5***********************************************/    
+    public final DataObject getCustomersFrom2SchemasWithOneSchemaNotInConfig(DAS das) {
+        Command read = das.getCommand("Select2SchemasWithOneSchemaNotInConfig");
+        DataObject root = read.executeQuery();
+        return root;
+    }
+    /**********END TEST CASE 5***********************************************/    
+
+    /**********START TEST CASE 6***********************************************/    
+
+    public final DataObject getCustomersFrom2SchemasBothSchemaInConfig(DAS das) {
+
+        Command read = das.getCommand("Select2IDsBothInConfig");
+        DataObject root = read.executeQuery();
+        return root;
+    }
+    
+    /**********END TEST CASE 6***********************************************/ 
+    /**********START TEST CASE 7***********************************************/
+    public final DataObject getCitiesFrom2SchemasNoneInConfig(DAS das){
+    	Command read = das.getCommand("Select2CitiesNoneInConfig");
+        DataObject root = read.executeQuery();
+        return root;    	
+    }
+    /**********END TEST CASE 7***********************************************/
+    /**********START TEST CASE 8***********************************************/    
+    
+    public final List  getAccountRSDesc(DAS das){
+    	Command read = das.getCommand("ResultDescriptorAccountSelect");
+        DataObject root = read.executeQuery();        
+        return root.getList("DASTEST2.ACCOUNT");
+    }
+    /**********END TEST CASE 8***********************************************/
+
+    /**********START TEST CASE 9***********************************************/    
+
+    public final DataObject getSingleSchemaCustomersAccounts(DAS das){
+        Command read = das.getCommand("ImpliedRelationshipSelect");
+        DataObject root = read.executeQuery();
+        return root;
+    }
+    /**********END TEST CASE 9***********************************************/    
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NamedParameterTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NamedParameterTests.java
new file mode 100644
index 0000000000..88e9b201ea
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NamedParameterTests.java
@@ -0,0 +1,241 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.ConfigHelper;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.ConfigFactory;
+import org.apache.tuscany.das.rdb.config.Parameter;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class NamedParameterTests  extends DasTest {
+    protected void setUp() throws Exception {    
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+    }
+    
+    protected void tearDown() throws Exception {
+    	super.tearDown();
+    }
+ 
+    /**
+     * Test passing <Parameters><Parameter></Paramerers> to create/update/delete
+     * through config, with duplicate indexes
+     * @throws Exception
+     */
+    public void testCUDNamedParameters() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("namedParameter.xml"), getConnection());
+        // Read customer 1
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+        assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
+
+        // Modify customer
+        DataObject customer = (DataObject) root.get("CUSTOMER[1]");
+        customer.set("LASTNAME", "Pavick");
+        customer.set("ADDRESS", "Pavick's Address");
+        // Build apply changes command
+        try{
+        	das.applyChanges(root);
+        	fail("Expected exception");
+        }catch(RuntimeException e){
+        	assertTrue(e.getMessage().startsWith("Parameters with improper indexes!"));
+        }
+        
+        //create
+        root = select.executeQuery();
+        DataObject newCustomer = root.createDataObject("CUSTOMER");
+        newCustomer.setInt("ID", 6);
+        newCustomer.setString("LASTNAME", "Louise");
+        newCustomer.setString("ADDRESS", "U.K.");
+        try{
+        	das.applyChanges(root);
+        	fail("Expected exception");
+        }catch(RuntimeException e){
+        	assertTrue(e.getMessage().startsWith("Parameters with duplicate indexes!"));
+        }
+        
+        //delete
+        root = select.executeQuery();
+        DataObject toBeDeleted = root.getDataObject("CUSTOMER[1]");
+        toBeDeleted.setString("LASTNAME", "Pavick");
+        toBeDeleted.delete();
+        das.applyChanges(root);
+        root = select.executeQuery();
+        assertEquals(null, root.getDataObject("CUSTOMER[1]"));
+        
+    }
+        
+    /**
+     * Test passing <Parameter>List to Command through config
+     * @throws Exception
+     */    
+    public void testCommandNamedParameters() throws Exception {
+    	DAS das = DAS.FACTORY.createDAS(getConfig("namedParameter.xml"), getConnection());
+    	//select
+    	Command select = das.getCommand("getCustomer");
+    	select.setParameter("ID", new Integer(1));
+    	DataObject root = select.executeQuery();
+    	List customers = root.getList("CUSTOMER");
+    	assertEquals(1, customers.size());
+    	DataObject customer = (DataObject)customers.get(0);
+    	assertEquals("Williams", customer.get("LASTNAME"));
+    	
+    	//insert - command in config has <Parameter>
+    	Command insert = das.getCommand("createCustomer");
+    	//see order is not maintained, but config depicts it through index attrb
+    	//if index is missing , auto increment logic will be followed
+    	insert.setParameter("LASTNAME", "Louise");
+    	insert.setParameter("ADDRESS", "TPO");
+    	insert.setParameter("ID", new Integer(6));
+    	insert.execute();
+    	select.setParameter("ID", new Integer(6));
+    	root = select.executeQuery();
+    	customers = root.getList("CUSTOMER");
+    	assertEquals(1, customers.size());
+    	customer = (DataObject)customers.get(0);
+    	assertEquals("Louise", customer.get("LASTNAME"));
+    	
+    	//insert - command in config has no <Parameter>
+    	Command insertNoParam = das.getCommand("createCustomerNoParam");
+    	//if param/index is missing in cfg, auto increment logic will be followed
+    	insertNoParam.setParameter("ID", new Integer(7));
+    	insertNoParam.setParameter("LASTNAME", "Louise7");
+    	insertNoParam.setParameter("ADDRESS", "TPO7");
+    	insertNoParam.execute();
+    	select.setParameter("ID", new Integer(7));
+    	root = select.executeQuery();
+    	customers = root.getList("CUSTOMER");
+    	assertEquals(1, customers.size());
+    	customer = (DataObject)customers.get(0);
+    	assertEquals("Louise7", customer.get("LASTNAME"));    	
+    	
+    	//update
+    	Command update = das.getCommand("updateCustomer");
+    	update.setParameter("LASTNAME", "NoLouise");
+    	update.setParameter("ID", new Integer(6));
+    	update.execute();
+    	select.setParameter("ID", new Integer(6));
+    	root = select.executeQuery();
+    	customers = root.getList("CUSTOMER");
+    	assertEquals(1, customers.size());
+    	customer = (DataObject)customers.get(0);
+    	assertEquals("NoLouise", customer.get("LASTNAME"));
+    	
+    	//update - no param in config
+    	Command updateNoParam = das.getCommand("updateCustomerNoParam");
+    	updateNoParam.setParameter("LASTNAME", "YesLouise");
+    	updateNoParam.setParameter("ID", new Integer(6));
+    	updateNoParam.execute();
+    	select.setParameter("ID", new Integer(6));
+    	root = select.executeQuery();
+    	customers = root.getList("CUSTOMER");
+    	assertEquals(1, customers.size());
+    	customer = (DataObject)customers.get(0);
+    	assertEquals("YesLouise", customer.get("LASTNAME"));
+    	
+    	//delete
+    	Command delete = das.getCommand("deleteCustomer");
+    	delete.setParameter("ID", new Integer(6));
+    	delete.execute();
+    	select.setParameter("ID", new Integer(6));
+    	root = select.executeQuery();
+    	customers = root.getList("CUSTOMER");
+    	assertEquals(0, customers.size());
+
+    	//delete - cfg command with no param
+    	Command deleteNoParam = das.getCommand("deleteCustomerNoParam");
+    	deleteNoParam.setParameter("ID", new Integer(7));
+    	deleteNoParam.execute();
+    	select.setParameter("ID", new Integer(7));
+    	root = select.executeQuery();
+    	customers = root.getList("CUSTOMER");
+    	assertEquals(0, customers.size());    	
+    }
+    
+    /**
+     * Test passing <Parameter>List to Command through program
+     * @throws Exception
+     */    
+    public void testProgrammaticCommandNamedParameters() throws Exception {
+    	ConfigHelper helper = new ConfigHelper();    	
+	    //Command insertAdhoc = das.createCommand("insert into CUSTOMER values (?, ?, ?)");
+    	org.apache.tuscany.das.rdb.config.Command insertAdhoc = ConfigFactory.INSTANCE.createCommand();
+    	insertAdhoc.setKind("insert");
+    	insertAdhoc.setSQL("insert into CUSTOMER values (?, ?, ?)");
+    	insertAdhoc.setName("insertCustomer");
+	    Parameter parameter1 = ConfigFactory.INSTANCE.createParameter();
+		parameter1.setName("ID");
+		Parameter parameter2 = ConfigFactory.INSTANCE.createParameter();
+		parameter2.setName("LASTNAME");
+		Parameter parameter3 = ConfigFactory.INSTANCE.createParameter();
+		parameter3.setName("ADDRESS");
+		insertAdhoc.getParameter().add(parameter1);
+		insertAdhoc.getParameter().add(parameter2);
+		insertAdhoc.getParameter().add(parameter3);
+		Config cfg = helper.getConfig();
+		cfg.getCommand().add(insertAdhoc);
+		DAS das = DAS.FACTORY.createDAS(cfg, getConnection());
+		
+		//setup is over, now set values in params and execute
+		Command insert = das.getCommand("insertCustomer");
+		insert.setParameter("ID", new Integer(6));
+		insert.setParameter("LASTNAME", "Anthony");
+		insert.setParameter("ADDRESS", "IND");
+		insert.execute();
+		
+		Command select = das.createCommand("select * from CUSTOMER where ID = ?");
+    	select.setParameter("ID", new Integer(6));
+    	DataObject root = select.executeQuery();
+    	List customers = root.getList("CUSTOMER");
+    	assertEquals(1, customers.size());
+    	DataObject customer = (DataObject)customers.get(0);
+    	assertEquals("Anthony", customer.get("LASTNAME"));
+    }
+    
+    /**
+     * Test set/getParameter(name) on Command
+     * @throws Exception
+     */    
+    public void testNamedParameters() throws Exception {
+	    DAS das = DAS.FACTORY.createDAS(getConnection());
+	    Command insertAdhoc = das.createCommand("insert into CUSTOMER values (?, ?, ?)");
+	    insertAdhoc.setParameter("ID", new Integer(6));
+	    insertAdhoc.setParameter("LASTNAME", "MyLastName");
+	    insertAdhoc.setParameter("ADDRESS", "MyLastAddress");
+	    assertEquals("MyLastAddress", insertAdhoc.getParameter("ADDRESS"));
+	    insertAdhoc.execute();
+	    
+	    Command select = das.createCommand("select * from CUSTOMER where ID = ?");
+    	select.setParameter("ID", new Integer(6));
+    	DataObject root = select.executeQuery();
+    	List customers = root.getList("CUSTOMER");
+    	assertEquals(1, customers.size());
+    	DataObject customer = (DataObject)customers.get(0);
+    	assertEquals("MyLastName", customer.get("LASTNAME"));	    
+    	
+    }    
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
new file mode 100644
index 0000000000..00a417da8d
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
@@ -0,0 +1,163 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.sql.SQLException;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.ConfigHelper;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.ConfigFactory;
+import org.apache.tuscany.das.rdb.exception.OptimisticConcurrencyException;
+import org.apache.tuscany.das.rdb.test.data.BookData;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class OCCTests extends DasTest {
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new BookData(getAutoConnection()).refresh();
+        new CustomerData(getAutoConnection()).refresh();
+    }
+
+    public void testAutomaticOCC() throws SQLException {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Read customer with particular ID
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+
+        // Explicitly update the DB to force a collision
+        Command update = das.createCommand("update CUSTOMER set LASTNAME = 'Smith' where ID = 1");
+        update.execute();
+        
+        DataObject customer = root.getDataObject("CUSTOMER[1]");
+
+        // Modify customer
+        customer.set("LASTNAME", "Pavick");
+
+        // Build apply changes command
+        try {
+            das.applyChanges(root);
+            fail("An OCCException should be thrown");
+        } catch (OptimisticConcurrencyException ex) {
+            if (!ex.getMessage().equals("An update collision occurred")) {
+                throw ex;
+            }
+        }
+      
+    }
+    
+    public void testSimpleOCC() throws SQLException  {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("BooksConfig.xml"), getConnection());
+        // Read a book instance
+        Command select = das.getCommand("select book 1");
+        DataObject root = select.executeQuery();
+        DataObject book = root.getDataObject("BOOK[1]");
+        // Change a field to mark the instance 'dirty'
+        book.setInt("QUANTITY", 2);
+
+        // Explicitly change OCC column in database to force collision
+        Command update = das.getCommand("update book 1");
+        update.setParameter(1, new Integer(100));
+        update.execute();
+
+        // Try to apply changes and catch the expected An update collision occurred
+        try {
+            das.applyChanges(root);
+            fail("An OCCException should be thrown");
+        } catch (OptimisticConcurrencyException ex) {
+            if (!ex.getMessage().equals("An update collision occurred")) {
+                throw ex;
+            }
+        }
+    }
+
+    public void testManagedOCC() throws SQLException  {
+        DAS das = DAS.FACTORY.createDAS(getConfig("ManagedBooksConfig.xml"), getConnection());
+        Command select = das.getCommand("select book 1");
+        DataObject root = select.executeQuery();
+        DataObject book = root.getDataObject("BOOK[1]");
+        // Change a field to mark the instance 'dirty'
+        book.setInt("QUANTITY", 2);
+        int occValue = book.getInt("OCC");
+        das.applyChanges(root);
+
+        root = select.executeQuery();
+        book = root.getDataObject("BOOK[1]");
+        assertEquals(occValue + 1, book.getInt("OCC"));
+    }
+
+    public void testManagedOCCFailure() throws SQLException  {
+        DAS das = DAS.FACTORY.createDAS(getConfig("ManagedBooksConfig.xml"), getConnection());
+        // Read a book instance
+        Command select = das.getCommand("select book 1");
+        DataObject root = select.executeQuery();
+        DataObject book = root.getDataObject("BOOK[1]");
+        // Change a field to mark the instance 'dirty'
+        book.setInt("QUANTITY", 2);
+
+        DAS das2 = DAS.FACTORY.createDAS(getConfig("ManagedBooksConfig.xml"), getConnection());
+        // Read a book instance
+        Command select2 = das2.getCommand("select book 1");
+        DataObject root2 = select2.executeQuery();
+        DataObject book2 = root2.getDataObject("BOOK[1]");
+        // Change a field to mark the instance 'dirty'
+        book2.setInt("QUANTITY", 5);
+        das2.applyChanges(root2);
+
+        // Try to apply changes and catch the expecetd An update collision occurred
+        try {
+            das.applyChanges(root);
+            fail("An OCCException should be thrown");
+        } catch (OptimisticConcurrencyException ex) {
+            if (!ex.getMessage().equals("An update collision occurred")) {
+                throw ex;
+            }
+        }
+    }
+
+    public void testProvidedConfig() throws SQLException  {
+        // Create config programmatically
+        Config config = ConfigFactory.INSTANCE.createConfig();
+        ConfigHelper helper = new ConfigHelper(config);
+        helper.addPrimaryKey("BOOK.BOOK_ID");
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+
+        // Read a book instance
+        Command select = das.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
+        DataObject root = select.executeQuery();
+        DataObject book = root.getDataObject("BOOK[1]");
+        // Change a field to mark the instance 'dirty'
+        book.setInt("QUANTITY", 2);
+
+        // Flush the change
+
+        das.applyChanges(root);
+
+        // Verify
+        root = select.executeQuery();
+        book = root.getDataObject("BOOK[1]");
+        assertEquals(2, book.getInt("QUANTITY"));
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
new file mode 100644
index 0000000000..2a58ca0fba
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
@@ -0,0 +1,174 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.CompanyData;
+import org.apache.tuscany.das.rdb.test.data.CompanyEmpData;
+import org.apache.tuscany.das.rdb.test.data.EmployeeData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class OneToOneRelationshipTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new CompanyData(getAutoConnection()).refresh();
+        new EmployeeData(getAutoConnection()).refresh();
+        new CompanyEmpData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Read Company and traverse to EOTM
+     */
+    public void test1() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyEmployeeConfig.xml"), getConnection());
+
+        Command read = das.getCommand("get companies with employee of the month");
+        DataObject root = read.executeQuery();
+        DataObject employee = root.getDataObject("COMPANY[1]/company->employee_opposite");
+
+        assertEquals("Mary Smith", employee.getString("NAME"));
+    }
+
+    /**
+     * Read Employee and traverse to Company
+     */
+    public void test2() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyEmployeeConfig.xml"), getConnection());
+
+        Command read = das.getCommand("get named employee with company");
+        read.setParameter(1, "Mary Smith");
+        DataObject root = read.executeQuery();
+        DataObject company = root.getDataObject("EMPLOYEE[1]/company->employee");
+
+        assertEquals("ACME Publishing", company.getString("NAME"));
+    }
+
+    /**
+     * Un-assign employee O' month
+     */
+    public void test3() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyEmployeeConfig.xml"), getConnection());
+
+        Command read = das.getCommand("get companies with employee of the month");
+        DataObject root = read.executeQuery();
+        DataObject company = root.getDataObject("COMPANY[1]");
+        company.setDataObject("company->employee_opposite", null);
+        assertNull(company.getDataObject("company->employee_opposite"));
+
+        //Flush changes
+        das.applyChanges(root);
+
+        //Verify
+        root = read.executeQuery();
+        company = root.getDataObject("COMPANY[1]");
+        assertNull(company.getDataObject("company->employee_opposite"));
+    }
+
+    /**
+     * Delete employee O' month
+     */
+    public void test4() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyEmployeeConfig.xml"), getConnection());
+
+        Command read = das.getCommand("get companies with employee of the month");
+        DataObject root = read.executeQuery();
+        DataObject company = root.getDataObject("COMPANY[1]");
+        DataObject employee = company.getDataObject("company->employee_opposite");
+        employee.delete();
+        assertNull(company.getDataObject("company->employee_opposite"));
+
+        //Flush changes
+        das.applyChanges(root);
+
+        //Verify
+        root = read.executeQuery();
+        company = root.getDataObject("COMPANY[1]");
+        assertNull(company.getDataObject("company->employee_opposite"));
+    }
+
+    /**
+     * Add new employee O' month
+     */
+    public void test5() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyEmployeeConfig.xml"), getConnection());
+
+        Command read = das.getCommand("get companies with employee of the month");
+        DataObject root = read.executeQuery();
+        DataObject company = root.getDataObject("COMPANY[1]");
+
+        //Create a new employee
+        DataObject employee = root.createDataObject("EMPLOYEE");
+        employee.setString("NAME", "Joe Hotshot");
+
+        //Assigne a EOTM
+        //Strangely this statement results in "Could not find relationships" error
+        //although "company.setDataObject("company->employee_opposite", null);" dos not   
+        company.setDataObject("company->employee_opposite", employee);
+
+        //Flush changes
+        das.applyChanges(root);
+
+        //Verify
+        root = read.executeQuery();
+
+        employee = root.getDataObject("COMPANY[1]/company->employee_opposite");
+
+        assertEquals("Joe Hotshot", employee.getString("NAME"));
+
+    }
+
+    public void testRestrictedOneToOneRelationship() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("OneToOneRestrictedConfig.xml"), getConnection());
+
+        Command read = das.getCommand("get named employee with company");
+        read.setParameter(1, "Mary Smith");
+        DataObject root = read.executeQuery();
+        DataObject mary = root.getDataObject("EMPLOYEE[1]");
+        DataObject company = mary.getDataObject("company");
+
+        DataObject bob = root.createDataObject("EMPLOYEE");
+        bob.setString("NAME", "bob");
+        bob.setString("SN", "E0005");
+        bob.setInt("MANAGER", 0);
+
+        bob.setDataObject("company", company);
+
+        try {
+            das.applyChanges(root);
+            fail("Relationship modification should not be allowed.");
+        } catch (RuntimeException ex) {
+            assertEquals("Can not modify a one to one relationship that is key restricted", ex.getMessage());
+        }
+        assertEquals("ACME Publishing", company.getString("NAME"));
+
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java
new file mode 100644
index 0000000000..53cd02778b
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java
@@ -0,0 +1,124 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.CityData;
+import org.apache.tuscany.das.rdb.test.data.StateData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class OperationOrderingTests extends DasTest {
+
+    public OperationOrderingTests() {
+        super();
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        CityData city = new CityData(getAutoConnection());
+        StateData state = new StateData(getAutoConnection());
+
+        city.doDeletes();
+        state.doDeletes();
+        state.doInserts();
+        city.doInserts();
+
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testInsert() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("cityStates.xml"), getConnection());
+        Command select = das.createCommand("Select * from STATES inner join CITIES on STATES.ID = CITIES.STATE_ID");
+        DataObject root = select.executeQuery();
+
+        int numberOfStates = root.getList("STATES").size();
+        int numberOfCities = root.getList("CITIES").size();
+
+        DataObject atlanta = root.createDataObject("CITIES");
+        atlanta.setString("NAME", "Atlanta");
+        atlanta.setInt("ID", 6);
+
+        // Create a new Company
+        DataObject georgia = root.createDataObject("STATES");
+        georgia.setInt("ID", 4);
+        georgia.setString("NAME", "GA");
+
+        georgia.getList("cities").add(atlanta);
+
+        das.applyChanges(root);
+
+        root = select.executeQuery();
+        assertEquals(numberOfCities + 1, root.getList("CITIES").size());
+        assertEquals(numberOfStates + 1, root.getList("STATES").size());
+    }
+
+    public void testDeletes() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("cityStates.xml"), getConnection());
+        Command select = das.createCommand("Select * from STATES inner join CITIES on STATES.ID = CITIES.STATE_ID");
+        DataObject root = select.executeQuery();
+
+        DataObject firstState = root.getDataObject("STATES[1]");
+        String stateName = firstState.getString("NAME");
+
+        List cityNames = new ArrayList();
+        DataObject[] citiesToDelete = new DataObject[firstState.getList("cities").size()];
+        Iterator i = firstState.getList("cities").iterator();
+        int ii=0;
+        //if we perform delete() in while, the 2nd city of the state is not deleted.
+        while (i.hasNext()) {
+            DataObject firstCity = (DataObject) i.next();
+            cityNames.add(firstCity.getString("NAME"));
+            citiesToDelete[ii] = firstCity;
+            ii++;
+        }
+        
+        for(int j=0; j<citiesToDelete.length; j++) {
+        	citiesToDelete[j].delete();
+        }
+        
+        firstState.delete();
+        das.applyChanges(root);
+
+        root = select.executeQuery();
+
+        Iterator iter = root.getList("STATES").iterator();
+        while (iter.hasNext()) {
+            DataObject state = (DataObject) iter.next();
+            assertFalse(state.getString("NAME").equals(stateName));
+        }
+
+        iter = root.getList("CITIES").iterator();
+        while (iter.hasNext()) {
+            DataObject city = (DataObject) iter.next();
+            assertFalse(cityNames.contains(city.getString("NAME")));
+        }
+
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java
new file mode 100644
index 0000000000..859cc085f6
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java
@@ -0,0 +1,134 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.sql.SQLException;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.Pager;
+import org.apache.tuscany.das.rdb.impl.PagerImpl;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class Paging extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+    }
+
+    public void testPaging() throws SQLException {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Build command to read all customers
+        Command custCommand = das.createCommand("select * from CUSTOMER order by ID");
+
+        // Create a pager with the command
+        Pager pager = new PagerImpl(custCommand, 2);
+
+        // Get and work with first page
+        DataObject root = pager.next();
+        DataObject customer1 = root.getDataObject("CUSTOMER[1]");
+        DataObject customer2 = root.getDataObject("CUSTOMER[2]");
+        assertEquals(1, customer1.getInt("ID"));
+        assertEquals(2, customer2.getInt("ID"));
+
+        // Get and work with the second page
+        root = pager.next();
+        customer1 = root.getDataObject("CUSTOMER[1]");
+        customer2 = root.getDataObject("CUSTOMER[2]");
+        assertEquals(3, customer1.getInt("ID"));
+        assertEquals(4, customer2.getInt("ID"));
+
+        // First page again
+        root = pager.previous();
+        customer1 = root.getDataObject("CUSTOMER[1]");
+        customer2 = root.getDataObject("CUSTOMER[2]");
+        assertEquals(1, customer1.getInt("ID"));
+        assertEquals(2, customer2.getInt("ID"));
+
+    }
+
+    public void testRandomPage() throws SQLException {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Build the select command
+        Command select = das.createCommand("select * from CUSTOMER order by ID");
+
+        // Create a pager
+        Pager pager = new PagerImpl(select, 2);
+
+        // Get the first page
+        DataObject root = pager.getPage(1);
+        DataObject customer1 = root.getDataObject("CUSTOMER[1]");
+        DataObject customer2 = root.getDataObject("CUSTOMER[2]");
+        assertEquals(1, customer1.getInt("ID"));
+        assertEquals(2, customer2.getInt("ID"));
+
+        // Get the second page
+        root = pager.getPage(2);
+        customer1 = root.getDataObject("CUSTOMER[1]");
+        customer2 = root.getDataObject("CUSTOMER[2]");
+        assertEquals(3, customer1.getInt("ID"));
+        assertEquals(4, customer2.getInt("ID"));
+
+        // Get the first page again
+        root = pager.getPage(1);
+        customer1 = root.getDataObject("CUSTOMER[1]");
+        customer2 = root.getDataObject("CUSTOMER[2]");
+        assertEquals(1, customer1.getInt("ID"));
+        assertEquals(2, customer2.getInt("ID"));
+    }
+    
+    
+/*    public void testLightPager() throws SQLException {
+        
+        
+        // Build the command to page with
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command select = das.createCommand("select * from CUSTOMER order by ID");
+        
+        //Create the light Pager instance
+        Pager lp = Pager.FACTORY.createLightPager(2);
+
+        // Get the first page
+        DataObject root = pager.getPage(1);
+        DataObject customer1 = root.getDataObject("CUSTOMER[1]");
+        DataObject customer2 = root.getDataObject("CUSTOMER[2]");
+        assertEquals(1, customer1.getInt("ID"));
+        assertEquals(2, customer2.getInt("ID"));
+
+        // Get the second page
+        root = pager.getPage(2);
+        customer1 = root.getDataObject("CUSTOMER[1]");
+        customer2 = root.getDataObject("CUSTOMER[2]");
+        assertEquals(3, customer1.getInt("ID"));
+        assertEquals(4, customer2.getInt("ID"));
+
+        // Get the first page again
+        root = pager.getPage(1);
+        customer1 = root.getDataObject("CUSTOMER[1]");
+        customer2 = root.getDataObject("CUSTOMER[2]");
+        assertEquals(1, customer1.getInt("ID"));
+        assertEquals(2, customer2.getInt("ID"));
+    }*/
+    
+
+}
+\ No newline at end of file
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
new file mode 100644
index 0000000000..f918309c55
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
@@ -0,0 +1,267 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.sql.SQLException;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class PartialUpdateTests extends DasTest {
+
+    public PartialUpdateTests() {
+        super();
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Update with one changed property
+     */
+    public void testPartialUpdateSingleProperty() throws SQLException {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
+
+        // Read
+        DataObject root = readCustomers.executeQuery();
+
+        DataObject customer = root.getDataObject("CUSTOMER[1]");
+        // Verify
+        assertEquals(1, customer.getInt("ID"));
+
+        Command update = das.createCommand("update CUSTOMER set LASTNAME = 'modified' where ID = 1");
+        update.execute();
+
+        customer.setString("ADDRESS", "main street");
+
+        das.applyChanges(root);
+
+        root = readCustomers.executeQuery();
+
+        // If partial update was not used, LASTNAME would not be 'modified'
+        customer = root.getDataObject("CUSTOMER[1]");
+        assertEquals(1, customer.getInt("ID"));
+        assertEquals("modified", customer.getString("LASTNAME"));
+        assertEquals("main street", customer.getString("ADDRESS"));
+    }
+
+    /**
+     * Update with all changed properties
+     */
+    public void testPartialUpdateAllProperties() throws SQLException {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
+
+        // Read
+        DataObject root = readCustomers.executeQuery();
+
+        DataObject customer = root.getDataObject("CUSTOMER[1]");
+        // Verify
+        assertEquals(1, customer.getInt("ID"));
+
+        customer.setString("LASTNAME", "lastname modified");
+        customer.setString("ADDRESS", "address modified");
+        
+        das.applyChanges(root);
+
+        root = readCustomers.executeQuery();
+
+        // If partial update was not used, LASTNAME would not be 'modified'
+        customer = root.getDataObject("CUSTOMER[1]");
+        assertEquals(1, customer.getInt("ID"));
+        assertEquals("lastname modified", customer.getString("LASTNAME"));
+        assertEquals("address modified", customer.getString("ADDRESS"));
+    }    
+    
+    /**
+     * Insert with no changed properties and no generated ID
+     * Read graph.  Add new DO and apply without seting any attributes.
+     * 
+     */
+//    public void testPartialReadInsertApply() throws Exception {
+//
+//        DAS das = DAS.FACTORY.createDAS(getConnection());
+//        // Read some customers
+//        Command select = das.createCommand("Select * from CUSTOMER");
+//        DataObject root = select.executeQuery();
+//        
+//        //Remember count
+//        int count = root.getList("CUSTOMER").size();
+//
+//        // Create a new customer
+//        root.createDataObject("CUSTOMER");
+//
+//        // Build apply changes command
+//        das.applyChanges(root);
+//
+//        // verify insert
+//        root = select.executeQuery();
+//        assertEquals(count + 1, root.getList("CUSTOMER").size());
+//
+//    }
+
+    /**
+     * Insert with no changed properties to row with generated ID
+     * Read graph.  Add new DO and apply without seting any attributes. 
+     */
+    public void testPartialInsertWithGeneratedID() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"),getConnection());
+        // Read some companies
+        Command select = das.createCommand("Select * from COMPANY");
+        DataObject root = select.executeQuery();
+        
+        //Remember count
+        int count = root.getList("COMPANY").size();
+
+        // Create a new company
+        root.createDataObject("COMPANY");
+
+        // Build apply changes command
+        das.applyChanges(root);
+
+        // verify insert
+        root = select.executeQuery();
+        assertEquals(count + 1, root.getList("COMPANY").size());
+
+    }
+    
+    /**
+     * Insert with 1 changed property that is not the ID
+     * @throws SQLException
+     */
+    public void testPartialInsertWithSinglePropertyChange() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"),getConnection());
+        // Read some company
+        Command select = das.createCommand("Select * from COMPANY");
+        DataObject root = select.executeQuery();
+        
+        //Remember count
+        int count = root.getList("COMPANY").size();
+
+        // Create a new company
+        DataObject company = root.createDataObject("COMPANY");
+        company.setString("NAME", "New company name");
+        
+        // Build apply changes command
+        das.applyChanges(root);
+
+        // verify insert
+        root = select.executeQuery();
+        assertEquals(count + 1, root.getList("COMPANY").size());
+    }
+
+    /**
+     * Insert with 1 changed property that is the ID
+     * @throws SQLException
+     */
+    public void testPartialInsertWithIdChange() throws SQLException {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command readCustomers = das.createCommand("select * from CUSTOMER");
+
+        // Read
+        DataObject root = readCustomers.executeQuery();
+
+        // Create a new customer
+        DataObject newCust = root.createDataObject("CUSTOMER");
+        newCust.set("ID", new Integer(200));
+        // Purposely do not set lastname to let it default to 'Garfugengheist'
+        // newCust.set("LASTNAME", "Gerkin" );
+
+        das.applyChanges(root);
+
+        Command readNewCust = das.createCommand("select * from CUSTOMER where ID = 200");
+        root = readNewCust.executeQuery();
+
+        // If partial insert was not used, LASTNAME would not be
+        // 'Garfugengheist'
+        newCust = root.getDataObject("CUSTOMER[1]");
+        assertEquals(200, newCust.getInt("ID"));
+        assertEquals("Garfugengheist", newCust.getString("LASTNAME"));
+        assertNull(newCust.getString("ADDRESS"));
+
+    }
+    
+    public void testPartialInsertWithAllPropertyChange() throws SQLException {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command readCustomers = das.createCommand("select * from CUSTOMER");
+
+        // Read
+        DataObject root = readCustomers.executeQuery();
+
+        // Create a new customer
+        DataObject newCust = root.createDataObject("CUSTOMER");
+        newCust.set("ID", new Integer(300));
+        newCust.set("ADDRESS", "5528 Wells Fargo Drive");
+        newCust.set("LASTNAME", "Gerkin" );
+
+        das.applyChanges(root);
+
+        Command readNewCust = das.createCommand("select * from CUSTOMER where ID = 300");
+        root = readNewCust.executeQuery();
+
+        newCust = root.getDataObject("CUSTOMER[1]");
+        assertEquals(300, newCust.getInt("ID"));
+        assertEquals("Gerkin", newCust.getString("LASTNAME"));
+        assertEquals("5528 Wells Fargo Drive", newCust.getString("ADDRESS"));
+
+    }
+    
+    public void testPartialInsert() throws SQLException {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command readCustomers = das.createCommand("select * from CUSTOMER");
+
+        // Read
+        DataObject root = readCustomers.executeQuery();
+
+        // Create a new customer
+        DataObject newCust = root.createDataObject("CUSTOMER");
+        newCust.set("ID", new Integer(100));
+        newCust.set("ADDRESS", "5528 Wells Fargo Drive");
+        // Purposely do not set lastname to let it default to 'Garfugengheist'
+        // newCust.set("LASTNAME", "Gerkin" );
+
+        das.applyChanges(root);
+
+        Command readNewCust = das.createCommand("select * from CUSTOMER where ID = 100");
+        root = readNewCust.executeQuery();
+
+        // If partial insert was not used, LASTNAME would not be
+        // 'Garfugengheist'
+        newCust = root.getDataObject("CUSTOMER[1]");
+        assertEquals(100, newCust.getInt("ID"));
+        assertEquals("Garfugengheist", newCust.getString("LASTNAME"));
+        assertEquals("5528 Wells Fargo Drive", newCust.getString("ADDRESS"));
+
+    }
+    
+    
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java
new file mode 100644
index 0000000000..4b39c04a8b
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java
@@ -0,0 +1,148 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ * Test capability to participate in an extenrnally managed transaction. 
+ * The client is managing the transaction boundary so the DAS will not issue
+ * commit/rollback
+ * 
+ */
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.ConfigHelper;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class PassiveConnectionTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Read and modify a customer. Uses a "passive" connection
+     */
+    public void testReadModifyApply() throws Exception {
+
+        // Create and initialize a DAS connection and initialize for externally
+        // managed transaction boundaries
+        java.sql.Connection c = getConnection();
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("passiveConnection.xml"), c);
+        // Read customer 1
+        Command select = das.getCommand("get a customer");
+        DataObject root = select.executeQuery();
+
+        DataObject customer = (DataObject) root.get("CUSTOMER[1]");
+
+        String lastName = customer.getString("LASTNAME");
+
+        // Modify customer
+        customer.set("LASTNAME", "Pavick");
+
+        try {
+            das.applyChanges(root);
+
+            throw new Exception("Test Exception");
+
+            // Since the DAS is not managing tx boundaries, I must
+        } catch (Exception e) {
+            // assert here to make sure we didn't run into some hidden error
+            assertEquals("Test Exception", e.getMessage());
+            // Roll back the transaction
+            c.rollback();
+        }
+
+        // Verify that the changes did not go through
+        root = select.executeQuery();
+        assertEquals(lastName, root.getString("CUSTOMER[1]/LASTNAME"));
+
+        // Try again
+        customer = (DataObject) root.get("CUSTOMER[1]");
+        customer.set("LASTNAME", "Pavick");
+        das.applyChanges(root);
+        c.commit();
+
+        root = select.executeQuery();
+        assertEquals("Pavick", root.getString("CUSTOMER[1]/LASTNAME"));
+    }
+
+    /**
+     * Read and modify a customer. Uses a "passive" connection
+     */
+    public void testReadModifyApplyWithoutConfig() throws Exception {
+
+        // Create and initialize a DAS connection and initialize for externally
+        // managed transaction boundaries
+        java.sql.Connection c = getConnection();
+
+        // Create config programmatically
+        ConfigHelper helper = new ConfigHelper();
+        helper.addConnectionInfo(null, false);
+
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), c);
+        // Read customer 1
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+
+        DataObject customer = (DataObject) root.get("CUSTOMER[1]");
+
+        String lastName = customer.getString("LASTNAME");
+
+        // Modify customer
+        customer.set("LASTNAME", "Pavick");
+
+        try {
+            das.applyChanges(root);
+
+            throw new Exception("Test Exception");
+
+            // Since the DAS is not managing tx boundaries, I must
+        } catch (Exception e) {
+            // assert here to make sure we didn't run into some hidden error
+            assertEquals("Test Exception", e.getMessage());
+            // Roll back the transaction
+            c.rollback();
+        }
+
+        // Verify that the changes did not go through
+        root = select.executeQuery();
+        assertEquals(lastName, root.getString("CUSTOMER[1]/LASTNAME"));
+
+        // Try again
+        customer = (DataObject) root.get("CUSTOMER[1]");
+        customer.set("LASTNAME", "Pavick");
+        das.applyChanges(root);
+        c.commit();
+
+        root = select.executeQuery();
+        assertEquals("Pavick", root.getString("CUSTOMER[1]/LASTNAME"));
+    }
+    
+    
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
new file mode 100644
index 0000000000..d576557c93
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
@@ -0,0 +1,432 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Vector;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.ConfigHelper;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.ConnectionInfo;
+import org.apache.tuscany.das.rdb.config.Relationship;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.test.data.BookData;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.data.OrderDetailsData;
+import org.apache.tuscany.das.rdb.test.data.OrderDetailsDescriptionData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+import org.apache.tuscany.das.rdb.util.ConfigUtil;
+
+import commonj.sdo.DataObject;
+
+/**
+ * Tests the Converter framwork
+ */
+public class ProgrammaticConfigTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new BookData(getAutoConnection()).refresh();
+        new CustomerData(getAutoConnection()).refresh();
+        new OrderData(getAutoConnection()).refresh();
+        new OrderDetailsData(getAutoConnection()).refresh();
+        new OrderDetailsDescriptionData(getAutoConnection()).refresh();        
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Simple read with command created programaticaly using the ConfigHelper.
+     */
+    public void test0() throws Exception {
+        String commandName = "select book by id";
+        String commandSQL = "SELECT * FROM BOOK WHERE BOOK_ID =?";
+        // Create config programmatically
+        ConfigHelper helper = new ConfigHelper();
+        helper.addSelectCommand( commandName, commandSQL );
+        helper.addPrimaryKey("BOOK.BOOK_ID");
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+
+        // Read a book instance
+        Command select = das.getCommand("select book by id");
+        select.setParameter(1, new Integer(1));
+        DataObject root = select.executeQuery();
+        DataObject book = root.getDataObject("BOOK[1]");
+        // Change a field to mark the instance 'dirty'
+        book.setInt("QUANTITY", 2);
+
+        // Flush the change
+
+        das.applyChanges(root);
+
+        // Verify
+        root = select.executeQuery();
+        book = root.getDataObject("BOOK[1]");
+        assertEquals(2, book.getInt("QUANTITY"));
+    }
+
+    /**
+     * Simple read followed by a write. This should fail since there is no
+     * config associaed with the applychanges command
+     */
+    public void test1() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Read a book instance
+        Command select = das.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
+        DataObject root = select.executeQuery();
+
+        DataObject book = root.getDataObject("BOOK[1]");
+        // Change a field to mark the instance 'dirty'
+        book.setInt("QUANTITY", 2);
+
+        try {
+            das.applyChanges(root);
+            fail("An exception should be thrown since here is no config to identify the primary key");
+        } catch (RuntimeException ex) {
+            // Expected
+        }
+    }
+
+    /**
+     * Simple read followed by a write. Config instance is generated
+     * programmatically using the ConfigHelper.
+     */
+    public void test2() throws Exception {
+        // Create config programmatically
+        ConfigHelper helper = new ConfigHelper();
+        helper.addPrimaryKey("BOOK.BOOK_ID");
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+
+        // Read a book instance
+        Command select = das.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
+        DataObject root = select.executeQuery();
+        DataObject book = root.getDataObject("BOOK[1]");
+        // Change a field to mark the instance 'dirty'
+        book.setInt("QUANTITY", 2);
+
+        // Flush the change
+
+        das.applyChanges(root);
+
+        // Verify
+        root = select.executeQuery();
+        book = root.getDataObject("BOOK[1]");
+        assertEquals(2, book.getInt("QUANTITY"));
+    }
+
+    /**
+     * Test ability to read a compound graph (Read with Relationship)
+     */
+    public void test3() throws Exception {
+
+        String statement = "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID WHERE CUSTOMER.ID = 1";
+
+        // Read some customers and related orders
+        // Create relationship config programmatically
+        ConfigHelper helper = new ConfigHelper();
+        helper.addRelationship("CUSTOMER.ID", "ANORDER.CUSTOMER_ID");
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+        Command select = das.createCommand(statement);
+
+        DataObject root = select.executeQuery();
+        DataObject customer = root.getDataObject("CUSTOMER[1]");
+
+        assertEquals(2, customer.getList("ANORDER").size());
+
+    }
+
+    /**
+     * Programatically create table config with "property" name
+     */
+    public void test4() throws Exception {
+
+        String statement = "SELECT * FROM BOOK WHERE BOOK.BOOK_ID = ?";
+
+        // Create Table config programmatically
+        ConfigHelper helper = new ConfigHelper();
+        helper.addTable("BOOK", "Book");
+        helper.addPrimaryKey("Book.BOOK_ID");
+
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+        Command select = das.createCommand(statement);
+        select.setParameter(1, new Integer(1));
+
+        DataObject root = select.executeQuery();
+
+        DataObject newBook = root.createDataObject("Book");
+        newBook.setString("NAME", "Ant Colonies of the Old World");
+        newBook.setInt("BOOK_ID", 1001);
+        root.getList("Book").add(newBook);
+
+        das.applyChanges(root);
+
+        //Verify
+        select.setParameter(1, new Integer(1001));
+        root = select.executeQuery();
+        assertEquals("Ant Colonies of the Old World", root.getString("Book[1]/NAME"));
+
+    }
+    
+    /**
+     * 
+     */
+    public void testAddColumnWithPropertyName() throws SQLException {
+        String statement = "SELECT * FROM BOOK WHERE BOOK.BOOK_ID = ?";
+
+        // Create Table config programmatically
+        ConfigHelper helper = new ConfigHelper();
+        Table table = helper.addTable("BOOK", "Book");
+        helper.addPrimaryKey("Book.BOOK_ID");
+        helper.addColumn(table, "NAME", "bookName");
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+        Command select = das.createCommand(statement);
+        select.setParameter(1, new Integer(1));
+
+        DataObject root = select.executeQuery();
+
+        DataObject newBook = root.createDataObject("Book");        
+        newBook.setString("bookName", "Ant Colonies of the Old World");
+        newBook.setInt("BOOK_ID", 1001);
+        root.getList("Book").add(newBook);
+
+        das.applyChanges(root);
+
+        //Verify
+        select.setParameter(1, new Integer(1001));
+        root = select.executeQuery();
+        assertEquals("Ant Colonies of the Old World", root.getString("Book[1]/bookName"));
+    }
+    /**
+     * Simple unit test for ConnectionInfo
+     * @throws Exception
+     */
+    public void testConnectionInfo() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        helper.addConnectionInfo("jdbc/adatasource");
+
+        Config config = helper.getConfig();
+        ConnectionInfo info = config.getConnectionInfo();
+        assertEquals(info.getDataSource(), "jdbc/adatasource");
+        assertEquals(info.isManagedtx(), true);
+    }
+
+    /**
+     * Simple unit test for ConnectionInfo
+     * @throws Exception
+     */
+    public void testConnectionInfo2() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        helper.addConnectionInfo("jdbc/adatasource", false);
+
+        Config config = helper.getConfig();
+        ConnectionInfo info = config.getConnectionInfo();
+        assertEquals(info.getDataSource(), "jdbc/adatasource");
+        assertEquals(info.isManagedtx(), false);
+    }
+    
+    /**
+     * Simple unit test for ConnectionInfo using DriverManager
+     * @throws Exception
+     */
+    public void testConnectionInfoDriverManager() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        helper.addConnectionInfo("org.apache.derby.jdbc.EmbeddedDriver","jdbc:derby:target/dastest", "user", "password", 600);
+
+        Config config = helper.getConfig();
+        ConnectionInfo info = config.getConnectionInfo();
+        assertNull(info.getDataSource());
+        assertEquals(info.getConnectionProperties().getDriverClass(), "org.apache.derby.jdbc.EmbeddedDriver");
+        assertEquals(info.getConnectionProperties().getDatabaseURL(), "jdbc:derby:target/dastest");
+        assertEquals(info.getConnectionProperties().getUserName(), "user");
+        assertEquals(info.getConnectionProperties().getPassword(), "password");
+        assertEquals(info.getConnectionProperties().getLoginTimeout(), 600);
+    }  
+    
+    /**
+     * Simple unit test for adding a select command
+     * @throws Exception
+     */
+    public void testAddSelectCommand() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        helper.addSelectCommand("get all customers", "select * from customers");
+
+        Config config = helper.getConfig();
+        List commands = config.getCommand();
+        assertEquals(1, commands.size());
+        org.apache.tuscany.das.rdb.config.Command cmd = (org.apache.tuscany.das.rdb.config.Command) commands.get(0);
+        assertEquals("select", cmd.getKind());
+        assertEquals("get all customers", cmd.getName());
+        assertEquals("select * from customers", cmd.getSQL());
+    }
+        
+
+    /**
+     * Simple unit test for adding an update command
+     * @throws Exception
+     */
+    public void testAddUpdateCommand() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        helper.addUpdateCommand("update a customer", "update customers set name = ? where id = ?");
+
+        Config config = helper.getConfig();
+        List commands = config.getCommand();
+        assertEquals(1, commands.size());
+        org.apache.tuscany.das.rdb.config.Command cmd = (org.apache.tuscany.das.rdb.config.Command) commands.get(0);
+        assertEquals("update", cmd.getKind());
+        assertEquals("update a customer", cmd.getName());
+        assertEquals("update customers set name = ? where id = ?", cmd.getSQL());
+    }
+
+    /**
+     * Simple unit test for adding an insert command
+     * @throws Exception
+     */
+    public void testAddInsertCommand() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        helper.addInsertCommand("insert customer", "insert into customers(ID,NAME) values (?,?)");
+
+        Config config = helper.getConfig();
+        List commands = config.getCommand();
+        assertEquals(1, commands.size());
+        org.apache.tuscany.das.rdb.config.Command cmd = (org.apache.tuscany.das.rdb.config.Command) commands.get(0);
+        assertEquals("insert", cmd.getKind());
+        assertEquals("insert customer", cmd.getName());
+        assertEquals("insert into customers(ID,NAME) values (?,?)", cmd.getSQL());
+    }
+
+    /**
+     * Simple unit test for adding a delete command
+     * @throws Exception
+     */
+    public void testAddDeleteCommand() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        helper.addDeleteCommand("delete customer", "delete from customers where id = ?");
+
+        Config config = helper.getConfig();
+        List commands = config.getCommand();
+        assertEquals(1, commands.size());
+        org.apache.tuscany.das.rdb.config.Command cmd = (org.apache.tuscany.das.rdb.config.Command) commands.get(0);
+        assertEquals("delete", cmd.getKind());
+        assertEquals("delete customer", cmd.getName());
+        assertEquals("delete from customers where id = ?", cmd.getSQL());
+    }
+
+    /**
+     * Simple unit test for DataObjectModel
+     * @throws Exception
+     */
+    public void testDataObjectModel() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        helper.setDataObjectModel("org.apache.tuscany/mytypes");
+
+        Config config = helper.getConfig();
+        assertEquals("org.apache.tuscany/mytypes", config.getDataObjectModel());
+
+    }
+
+    /**
+     * Simple unit test for adding a Delete statement to a Table
+     * @throws Exception
+     */
+    public void testAddDeleteStatement() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        Table table = helper.addTable("widgets", "WIDGETS");
+        helper.addDeleteStatement(table, "delete from widgets where id = ?", "ID");
+
+        Config cfg = helper.getConfig();
+        assertEquals(1, cfg.getTable().size());
+        Table widgets = (Table) cfg.getTable().get(0);
+        assertEquals("delete from widgets where id = ?", widgets.getDelete().getSql());
+        assertEquals("WIDGETS", widgets.getTypeName());
+        assertEquals("ID", ConfigUtil.getParameters(widgets.getDelete()));
+
+    }
+
+    /**
+     * Simple unit test for adding a Create statement to a Table
+     * @throws Exception
+     */
+    public void testAddCreateStatement() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        Table table = helper.addTable("widgets", "WIDGETS");
+        helper.addCreateStatement(table, "insert into widgets values (?,?)", "ID NAME");
+
+        Config cfg = helper.getConfig();
+        assertEquals(1, cfg.getTable().size());
+        Table widgets = (Table) cfg.getTable().get(0);
+        assertEquals("insert into widgets values (?,?)", widgets.getCreate().getSql());
+        assertEquals("WIDGETS", widgets.getTypeName());
+        assertEquals("ID NAME", ConfigUtil.getParameters(widgets.getCreate()));
+
+    }
+    
+    public void testAddInvalidPrimaryKey() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        try {
+            helper.addPrimaryKey("PK");
+        } catch (RuntimeException ex) {
+            this.assertEquals ("Column PK must be qualified with a table name and optional schema name", ex.getMessage());
+        }
+    }
+    
+    public void testAddRelationshipWithName() throws Exception {
+        String statement = "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID WHERE CUSTOMER.ID = 1";
+
+        // Read some customers and related orders
+        // Create relationship config programmatically
+        ConfigHelper helper = new ConfigHelper();
+        helper.addRelationship("CUSTOMER.ID", "ANORDER.CUSTOMER_ID", "orders");
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+        Command select = das.createCommand(statement);
+
+        DataObject root = select.executeQuery();
+        DataObject customer = root.getDataObject("CUSTOMER[1]");
+
+        assertEquals(2, customer.getList("orders").size());
+    }
+    
+    public void testAddRelationshipMultiKeyWithName() throws Exception {
+        ConfigHelper helper = new ConfigHelper();
+        Vector parentColumnNames = new Vector();
+        Vector childColumnNames = new Vector();
+
+        parentColumnNames.add(0, "ORDERDETAILS.ORDERID");
+        parentColumnNames.add(1, "ORDERDETAILS.PRODUCTID");
+
+        childColumnNames.add(0, "ORDERDETAILSDESC.ORDERID");
+        childColumnNames.add(1, "ORDERDETAILSDESC.PRODUCTID");        
+        
+        Relationship r = helper.addRelationship(parentColumnNames, childColumnNames, "ord_dets");
+
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+        Command select = das.createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+                		" AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID");
+
+        DataObject root = select.executeQuery();  
+        DataObject ordDet1 = root.getDataObject("ORDERDETAILS[1]");
+        assertEquals(2, ordDet1.getList("ord_dets").size());
+
+    }    
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java
new file mode 100644
index 0000000000..6fb52ad17d
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java
@@ -0,0 +1,55 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ * Test the ability to query Database schema(metadata) information using regular DAS APIs This is speciic to DB2
+ * 
+ */
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class ReadDBSchemaTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testReadTableInfo() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command select = das.createCommand("SELECT * from SYSIBM.SYSTABLES WHERE TYPE = 'T'");
+        DataObject root = select.executeQuery();
+
+        DataObject table = (DataObject) root.get("SYSTABLES[1]");
+
+        assertEquals('T', table.getChar("TYPE"));
+
+    }
+
+    //Utilities
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
new file mode 100644
index 0000000000..4af085a6a5
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
@@ -0,0 +1,71 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.util.Iterator;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.PartData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class RecursiveTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new PartData(getAutoConnection()).refresh();
+    }
+
+    public void testReadEngineParts() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("PartsConfig.xml"), getConnection());
+        // Table definition
+        // CREATE TABLE PART (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(50), QUANTITY INT, PARENT_ID INT );
+
+        Command select = das.getCommand("readEngineParts");
+
+        // Need to set the key explicitly. The aggregate of columns not working
+        // because of null values
+        DataObject root = select.executeQuery();
+
+        assertEquals(5, root.getList("PART").size());
+        // printList(root.getList("PART"));
+        DataObject engine = root.getDataObject("PART.0");
+        assertEquals("Engine", engine.getString("NAME"));
+
+        assertEquals(3, engine.getList("subparts").size());
+
+        DataObject piston = null;
+        Iterator i = engine.getList("subparts").iterator();
+        while (i.hasNext()) {
+            DataObject obj = (DataObject) i.next();
+            if (obj.getString("NAME").equals("Piston")) {
+                piston = obj;
+            }
+        }
+
+        assertEquals("Piston", piston.getString("NAME"));
+        assertEquals(1, piston.getList("subparts").size());
+        assertEquals("Piston Ring", piston.getDataObject("subparts.0").getString("NAME"));
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
new file mode 100644
index 0000000000..df649ad598
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
@@ -0,0 +1,729 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ * 
+ * 
+ */
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.ConfigHelper;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.Relationship;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.test.data.CompanyData;
+import org.apache.tuscany.das.rdb.test.data.CompanyDeptData;
+import org.apache.tuscany.das.rdb.test.data.CompanyEmpData;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.data.DepEmpData;
+import org.apache.tuscany.das.rdb.test.data.DepartmentData;
+import org.apache.tuscany.das.rdb.test.data.EmployeeData;
+import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.data.ProductData;
+import org.apache.tuscany.das.rdb.test.data.ProductProdSpecData;
+import org.apache.tuscany.das.rdb.test.data.ProductSpecData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class RelationshipTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+        new OrderData(getAutoConnection()).refresh();
+
+        new CompanyData(getAutoConnection()).refresh();
+        new EmployeeData(getAutoConnection()).refresh();
+        new DepartmentData(getAutoConnection()).refresh();
+        new CompanyEmpData(getAutoConnection()).refresh();
+        new DepEmpData(getAutoConnection()).refresh();
+        new CompanyDeptData(getAutoConnection()).refresh();
+        new ProductData(getAutoConnection()).refresh();
+        new ProductSpecData(getAutoConnection()).refresh();
+        new ProductProdSpecData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Test ability to read a compound graph
+     */
+    public void testRead() throws Exception {
+
+        String statement = "SELECT * FROM CUSTOMER LEFT JOIN ANORDER "
+                + "ON CUSTOMER.ID = ANORDER.CUSTOMER_ID WHERE CUSTOMER.ID = 1";
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("customerOrderRelationshipMapping.xml"), getConnection());
+        // Read some customers and related orders
+        Command select = das.createCommand(statement);
+
+        DataObject root = select.executeQuery();
+        DataObject customer = root.getDataObject("Customer[1]");
+        assertEquals(2, customer.getList("orders").size());
+
+    }
+
+    /**
+     * Same as above except uses xml file for relationhip and key information.
+     * Employs CUD generation.
+     */
+    public void testRelationshipModification2() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerOrderMapping.xml"), getConnection());
+        // Read some customers and related orders
+        Command select = das
+                .createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID");
+
+        DataObject root = select.executeQuery();
+        
+        DataObject cust1 = root.getDataObject("CUSTOMER[1]");
+        DataObject cust2 = root.getDataObject("CUSTOMER[2]");
+
+        // Save IDs
+        Integer cust1ID = (Integer) cust1.get("ID");
+        Integer cust2ID = (Integer) cust2.get("ID");
+        // save order count
+        Integer cust1OrderCount = new Integer(cust1.getList("orders").size());
+        Integer cust2OrderCount = new Integer(cust2.getList("orders").size());
+
+        // Move an order to cust1 from cust2
+        DataObject order = (DataObject) cust2.getList("orders").get(0);
+        cust1.getList("orders").add(order);
+
+        // Flush changes
+        das.applyChanges(root);
+
+        // verify cust1 relationship updates
+        select = das
+                .createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON "
+                        + "CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?");
+        select.setParameter(1, cust1ID);
+
+        root = select.executeQuery();
+        assertEquals(cust1OrderCount.intValue() + 1, root.getList("CUSTOMER[1]/orders").size());
+
+        // verify cust2 relationship updates
+        select.setParameter(1, cust2ID);
+        root = select.executeQuery();
+        assertEquals(cust2OrderCount.intValue() - 1, root.getList("CUSTOMER[1]/orders").size());
+
+    }
+    
+    /**
+     * This scenario uses union to simmulate full outer join
+     * The resulted graph will have departments without employees, and employees without departments
+     * And this testcase will modify the relationship between these entities and assign the employees to the department
+     * 
+     * @throws Exception
+     */
+    public void testSimulateFullOuterJoinRelationshipModification() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("companyMappingWithResultDescriptor.xml"), getConnection());
+        // Read some customers and related orders
+        
+        Command select = das.getCommand("testFullOuterJoinRelationship");
+        DataObject root = select.executeQuery();
+
+        DataObject department = root.getDataObject("DEPARTMENT[NAME='New Technologies']"); //department with no employees
+                
+        DataObject emp1 = root.getDataObject("EMPLOYEE[NAME='Mary Smith']"); //employee not assgned to department
+        DataObject emp2 = root.getDataObject("EMPLOYEE[NAME='John Smith']"); //employee not assgned to department
+        
+        department.getList("employees").add(emp1);
+        department.getList("employees").add(emp2);
+
+        das.applyChanges(root);
+
+        //verify cust1 relationship updates
+        select = das.getCommand("testEmployeesFromDepartment");
+        select.setParameter(1, "New Technologies" );
+
+        root = select.executeQuery();
+        assertEquals(2, root.getDataObject("DEPARTMENT[NAME='New Technologies']").getList("employees").size());
+
+        
+
+    }
+    
+    public void testFKBehavior() throws SQLException {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerOrderMapping.xml"), getConnection());
+        // Read some customers and related orders
+        Command select = das
+                .createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID");
+
+        DataObject root = select.executeQuery();
+
+        DataObject cust1 = root.getDataObject("CUSTOMER[1]");
+        DataObject cust2 = root.getDataObject("CUSTOMER[2]");
+
+        // Save IDs
+        Integer cust1ID = (Integer) cust1.get("ID");
+        
+        // Move an order to cust1 from cust2
+        DataObject order = (DataObject) cust2.getList("orders").get(0);
+        cust1.getList("orders").add(order);
+        order.setInt("CUSTOMER_ID", cust1ID.intValue());
+       
+        try {
+            das.applyChanges(root);
+            fail("An exception should be thrown");
+        } catch (RuntimeException ex) {
+            assertEquals("Foreign key properties should not be set when the corresponding relationship has changed", ex.getMessage());
+        }
+
+    }
+    
+    public void testFKBehavior2() throws SQLException {
+        DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerOrderMapping.xml"), getConnection());
+        // Read some customers and related orders
+        Command select = das
+                .createCommand("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID");
+
+        DataObject root = select.executeQuery();
+
+        DataObject cust1 = root.getDataObject("CUSTOMER[1]");     
+
+        // Save IDs
+        Integer cust1ID = (Integer) cust1.get("ID");
+        
+        // Move an order to cust1 from cust2
+        DataObject order = root.createDataObject("ANORDER");
+        order.setInt("ID", 500);
+        order.setInt("CUSTOMER_ID", cust1ID.intValue());
+        cust1.getList("orders").add(order);       
+       
+        try {
+            das.applyChanges(root);
+            fail("An exception should be thrown");
+        } catch (RuntimeException ex) {
+            assertEquals("Foreign key properties should not be set when the corresponding relationship has changed", ex.getMessage());
+        }
+    }
+    
+    public void testInvalidFKColumn() throws SQLException {
+        ConfigHelper helper = new ConfigHelper();
+        Relationship r = helper.addRelationship("CUSTOMER.ID", "ANORDER.CUSTOMER_ID_INVALID");
+        r.setName("orders");
+       
+
+        DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+        Command select = das.createCommand("select * from CUSTOMER left join ANORDER "
+                + "ON CUSTOMER.ID = ANORDER.CUSTOMER_ID");
+
+        DataObject root = select.executeQuery();  
+        DataObject cust1 = root.getDataObject("CUSTOMER[1]");  
+        DataObject order = root.createDataObject("ANORDER");
+        order.setInt("ID", 500);
+        cust1.getList("orders").add(order);   
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+            assertEquals("Invalid foreign key column: CUSTOMER_ID_INVALID", ex.getMessage());
+        }
+    }
+    
+    /*If <Table> is present in DAS Config with type and property mappings, with tableName/typeName and columnName/propertyName differing
+     * consider relationship with proper mapping*/
+    public void testRelationshipTypesAndProperties() throws Exception {
+    	//existing records
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersRelationship.xml"), getConnection());
+        Command cmd = das.getCommand("customer and orders");
+        cmd.setParameter("ID", new Integer(1));
+        DataObject root = cmd.executeQuery();
+        DataObject firstCustomer = root.getDataObject("Customer[id=1]");
+        
+        DataObject newOrder = root.createDataObject("AnOrder");
+        newOrder.setInt("OrderId", 100);
+        newOrder.setString("PRODUCT", "MyProd");
+        
+        firstCustomer.getList("orders").add(newOrder);
+        
+        das.applyChanges(root);
+        
+        root = cmd.executeQuery();
+        firstCustomer = root.getDataObject("Customer[id=1]");
+        assertEquals(3, firstCustomer.getList("orders").size());
+    }
+    
+    /*same as testRelationshipTypesAndProperties(), except no DAS Config, and so table/type and column/property name match by default*/
+    public void testRelationshipWithProgrammaticConfig() throws Exception {
+    	//existing records
+    	ConfigHelper configHelper = new ConfigHelper();
+    	Config config = configHelper.getConfig();
+    	MappingWrapper wrapper = new MappingWrapper(config);
+    	wrapper.addRelationship("CUSTOMER.ID", "ANORDER.CUSTOMER_ID", "orders");
+    	
+        DAS das = DAS.FACTORY.createDAS(config, getConnection());
+        Command cmd = das.createCommand("select * from CUSTOMER left join ANORDER on CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = 1");
+        DataObject root = cmd.executeQuery();
+        DataObject firstCustomer = root.getDataObject("CUSTOMER[ID=1]");
+        
+        DataObject newOrder = root.createDataObject("ANORDER");
+        newOrder.setInt("ID", 100);
+        newOrder.setString("PRODUCT", "MyProd");
+        
+        firstCustomer.getList("orders").add(newOrder);
+        
+        das.applyChanges(root);
+        
+        root = cmd.executeQuery();
+        firstCustomer = root.getDataObject("CUSTOMER[ID=1]");
+    }
+    
+    //Below is set of test cases with 1-1 key restricted, 1-1 no key restricted, 1-n
+    //with parent/child having autogen keys and parent/child not having autogen keys
+    //These will help in testing all corner cases of 1-1 relationship
+    public void testOneToOneKeyRestrictedAutogenKeys() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("OneToOneRestrictedConfig.xml"), getConnection());
+
+        Command read = das.getCommand("get named employee with company");
+        read.setParameter(1, "John Smith");
+        DataObject root = read.executeQuery();
+        DataObject john = root.getDataObject("EMPLOYEE[1]");
+
+        //1-Update parent , Insert child/////////////////////////////////////////////
+        john.setString("NAME", "johnNew");
+        int origEOTMID = john.getInt("ID");
+        
+        DataObject comp = root.createDataObject("COMPANY");
+        comp.setString("NAME", "comp100");
+        john.setDataObject("company", comp);
+        
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        
+        read.setParameter(1, "johnNew");
+        root = read.executeQuery();
+        john = root.getDataObject("EMPLOYEE[1]");
+        assertNotNull(john);
+        comp = john.getDataObject("company");        
+        assertEquals(origEOTMID, comp.getInt("EOTMID"));
+        assertEquals("comp100", comp.getString("NAME"));
+        
+        //2-Insert Parent, Update child///////////////////////////////////////////
+        DataObject emp = root.createDataObject("EMPLOYEE");
+        emp.setString("NAME", "NewEmp");
+        emp.setDataObject("company", comp);//as key restricted, this will fail
+        try {
+            das.applyChanges(root);
+            fail("Expected exception, as key restricted does not allow chages in relationship");
+        } catch (RuntimeException ex) {
+        }
+        
+        //3-Update Parent, Update Child
+        read.setParameter(1, "johnNew");
+        root = read.executeQuery();
+        john = root.getDataObject("EMPLOYEE[1]");
+        comp = john.getDataObject("company");
+        
+        john.setString("NAME", "johnOld");
+        comp.setString("NAME", "comp101");
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        
+        read.setParameter(1, "johnOld");
+        root = read.executeQuery();
+        john = root.getDataObject("EMPLOYEE[1]");
+        assertNotNull(john);
+        comp = john.getDataObject("company");        
+        assertEquals(origEOTMID, comp.getInt("EOTMID"));
+        assertEquals("comp101", comp.getString("NAME"));
+    }
+    
+    public void testOneToOneNoKeyRestrictedAutogenKeys() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("OneToOneNonRestrictedConfig.xml"), getConnection());
+
+        Command read = das.getCommand("get named employee with company");
+        read.setParameter(1, "John Smith");
+        DataObject root = read.executeQuery();
+        DataObject john = root.getDataObject("EMPLOYEE[1]");
+        int origEOTMID = john.getInt("ID");
+        
+        //1-Update parent , Insert child/////////////////////////////////////////////
+        john.setString("NAME", "johnNew");
+        
+        DataObject comp = root.createDataObject("COMPANY");
+        comp.setString("NAME", "comp100");
+        john.setDataObject("company", comp);
+        
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        
+        read.setParameter(1, "johnNew");
+        root = read.executeQuery();
+        john = root.getDataObject("EMPLOYEE[1]");
+        assertNotNull(john);
+        comp = john.getDataObject("company");        
+        assertEquals(origEOTMID, comp.getInt("EOTMID"));
+        assertEquals("comp100", comp.getString("NAME"));
+        
+        //2-Insert Parent, Update child///////////////////////////////////////////
+        DataObject emp = root.createDataObject("EMPLOYEE");
+        emp.setString("NAME", "NewEmp");
+        emp.setDataObject("company", comp);//as no key restricted, this will not fail
+        try {
+            das.applyChanges(root);        
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        read.setParameter(1, "NewEmp");
+        root = read.executeQuery();
+        DataObject newEmp = root.getDataObject("EMPLOYEE[1]");
+        assertNotNull(newEmp);
+        int eotmid = newEmp.getInt("ID");
+        comp = newEmp.getDataObject("company");        
+        assertEquals(eotmid, comp.getInt("EOTMID"));
+        assertEquals("comp100", comp.getString("NAME"));        
+        
+        //3-Update Parent, Update Child
+        newEmp.setString("NAME", "johnOld");
+        comp.setString("NAME", "comp101");
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        
+        read.setParameter(1, "johnOld");
+        root = read.executeQuery();
+        newEmp = root.getDataObject("EMPLOYEE[1]");
+        assertNotNull(newEmp);
+        comp = newEmp.getDataObject("company");        
+        assertEquals(eotmid, comp.getInt("EOTMID"));
+        assertEquals("comp101", comp.getString("NAME")); 	
+    }
+    
+    public void testOneToOneKeyRestrictedNoAutogenKeys() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("OneToOneRestrictedConfig.xml"), getConnection());
+
+        Command read = das.getCommand("get spec with product");
+        read.setParameter(1, "PQRPen");
+        DataObject root = read.executeQuery();
+        DataObject prod1 = root.getDataObject("PRODUCT[1]");
+        int origProdId = prod1.getInt("ID");
+        
+        //1-Update parent , Insert child/////////////////////////////////////////////
+        prod1.setString("NAME", "PQRNewPen");
+        
+        DataObject spec1 = root.createDataObject("PRODUCTSPEC");
+        spec1.setInt("ID", 100);
+        spec1.setString("NAME", "PQRNewPenSpec");
+        prod1.setDataObject("prodspec", spec1);
+        
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        
+        read.setParameter(1, "PQRNewPen");
+        root = read.executeQuery();
+        prod1 = root.getDataObject("PRODUCT[1]");
+        assertNotNull(prod1);
+        spec1 = prod1.getDataObject("prodspec");        
+        assertEquals(origProdId, spec1.getInt("PRODUCT_ID"));
+        assertEquals("PQRNewPenSpec", spec1.getString("NAME"));
+        
+        //2-Insert Parent, Update child///////////////////////////////////////////
+        DataObject prod3 = root.createDataObject("PRODUCT");
+        prod3.setString("NAME", "NewProd");
+        prod3.setDataObject("prodspec", spec1);//as key restricted, this will fail
+        try {
+            das.applyChanges(root);
+            fail("Expected exception, as key restricted does not allow changes in relationship");
+        } catch (RuntimeException ex) {
+        }
+        
+        //3-Update Parent, Update Child
+        read.setParameter(1, "PQRNewPen");
+        root = read.executeQuery();
+        prod1 = root.getDataObject("PRODUCT[1]");
+        spec1 = prod1.getDataObject("prodspec");        
+        
+        prod1.setString("NAME", "PQRProd");
+        spec1.setString("NAME", "PQRProdSpec");
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        
+        read.setParameter(1, "PQRProd");
+        root = read.executeQuery();
+        prod1 = root.getDataObject("PRODUCT[1]");
+        assertNotNull(prod1);
+        spec1 = prod1.getDataObject("prodspec");        
+        assertEquals(origProdId, spec1.getInt("PRODUCT_ID"));
+        assertEquals("PQRProdSpec", spec1.getString("NAME"));    	
+    }
+    
+    public void testOneToOneNoKeyRestrictedNoAutogenKeys() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("OneToOneNonRestrictedConfig.xml"), getConnection());
+
+        Command read = das.getCommand("get spec with product");
+        read.setParameter(1, "PQRPen");
+        DataObject root = read.executeQuery();
+        DataObject prod1 = root.getDataObject("PRODUCT[1]");
+        int origProdId = prod1.getInt("ID");
+        
+        //1-Update parent , Insert child/////////////////////////////////////////////
+        prod1.setString("NAME", "PQRNewPen");
+        
+        DataObject spec1 = root.createDataObject("PRODUCTSPEC");
+        spec1.setInt("ID", 100);
+        spec1.setString("NAME", "PQRNewPenSpec");
+        prod1.setDataObject("prodspec", spec1);
+        
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        
+        read.setParameter(1, "PQRNewPen");
+        root = read.executeQuery();
+        prod1 = root.getDataObject("PRODUCT[1]");
+        assertNotNull(prod1);
+        spec1 = prod1.getDataObject("prodspec");        
+        assertEquals(origProdId, spec1.getInt("PRODUCT_ID"));
+        assertEquals("PQRNewPenSpec", spec1.getString("NAME"));
+        
+        //2-Insert Parent, Update child///////////////////////////////////////////
+        DataObject prod3 = root.createDataObject("PRODUCT");
+        prod3.setInt("ID", 200);
+        prod3.setString("NAME", "NewProd");
+        prod3.setDataObject("prodspec", spec1);//as no key restricted, this will not fail
+        try {
+            das.applyChanges(root);        
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        read.setParameter(1, "NewProd");
+        root = read.executeQuery();
+        DataObject newProd = root.getDataObject("PRODUCT[1]");
+        assertNotNull(newProd);
+        int product_id = newProd.getInt("ID");
+        DataObject newSpec = newProd.getDataObject("prodspec");        
+        assertEquals(product_id, newSpec.getInt("PRODUCT_ID"));
+        assertEquals("PQRNewPenSpec", newSpec.getString("NAME"));       
+        
+        //3-Update Parent, Update Child
+        newProd.setString("NAME", "MyProd");
+        newSpec.setString("NAME", "XYZNewPenSpec");
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        
+        read.setParameter(1, "MyProd");
+        root = read.executeQuery();
+        newProd = root.getDataObject("PRODUCT[1]");
+        assertNotNull(newProd);
+        newSpec = newProd.getDataObject("prodspec");        
+        assertEquals(product_id, newSpec.getInt("PRODUCT_ID"));
+        assertEquals("XYZNewPenSpec", newSpec.getString("NAME"));  	
+    }
+    
+    public void testOneToManyAutogenKeys() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection());
+
+        Command read = das.getCommand("all companies and departments");
+        DataObject root = read.executeQuery();
+        DataObject comp1 = (DataObject)root.getList("COMPANY").get(0);
+        int compId = comp1.getInt("ID");
+        
+        //1-Update parent , Insert child/////////////////////////////////////////////
+        comp1.setString("NAME", "MyCompany");
+        
+        DataObject dept1 = root.createDataObject("DEPARTMENT");
+        dept1.setString("NAME", "MyCompanyDepartment");
+        comp1.getList("departments").add(dept1);
+        
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        
+        //read.setParameter(1, new Integer(1));
+        root = read.executeQuery();
+        comp1 = root.getDataObject("COMPANY[ID="+compId+"]");
+        assertNotNull(comp1);
+        assertEquals("MyCompany", comp1.getString("NAME"));
+        List comp1Depts = comp1.getList("departments");
+        boolean foundNewDept = false;
+        DataObject curDept = null;
+        
+        for(int i=0; i<comp1Depts.size(); i++) {
+        	curDept = (DataObject)comp1Depts.get(i);
+        	if(curDept.getString("NAME").equals("MyCompanyDepartment")) {
+        		foundNewDept = true;
+        		break;
+        	}
+        }
+        
+        if(!foundNewDept) {
+        	fail("Expected new department to be available!");
+        }
+                
+        assertEquals(comp1.getInt("ID"), curDept.getInt("COMPANYID"));
+        
+        //2-Insert Parent, Update child///////////////////////////////////////////
+        DataObject compNew = root.createDataObject("COMPANY");
+        compNew.setString("NAME", "CompanyNew");
+        compNew.getList("departments").add(curDept);
+        try {
+            das.applyChanges(root);        
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        compNew = root.getDataObject("COMPANY[NAME='CompanyNew']");
+        
+        root = read.executeQuery();
+        compNew = root.getDataObject("COMPANY[ID="+compNew.getInt("ID")+"]");
+        assertNotNull(compNew);
+        int newCompany_id = compNew.getInt("ID");
+        List newCompDepts = compNew.getList("departments");        
+        
+        DataObject deptNew = (DataObject)newCompDepts.get(0);
+        assertEquals(newCompany_id, deptNew.getInt("COMPANYID"));
+        assertEquals("MyCompanyDepartment", deptNew.getString("NAME"));       
+        
+        //3-Update Parent, Update Child
+        compNew.setString("NAME", "MyNewCompanyName");
+        deptNew.setString("NAME", "XYZNewSoap123Dept");
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        
+        //read.setParameter(1, new Integer(newCompany_id));
+        root = read.executeQuery();
+        compNew = root.getDataObject("COMPANY[ID="+newCompany_id+"]");
+        assertNotNull(compNew);
+        deptNew = (DataObject)compNew.getList("departments").get(0);        
+        assertEquals(newCompany_id, deptNew.getInt("COMPANYID"));
+        assertEquals("XYZNewSoap123Dept", deptNew.getString("NAME"));    	
+    }
+    
+    public void testOneToManyNoAutogenKeys() throws Exception {    	
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
+
+        Command read = das.getCommand("customer and orders");
+        read.setParameter(1, new Integer(1));
+        DataObject root = read.executeQuery();
+        DataObject cust1 = root.getDataObject("CUSTOMER[1]");
+
+        //1-Update parent , Insert child/////////////////////////////////////////////
+        cust1.setString("LASTNAME", "MyCustomer");
+        
+        DataObject ord1 = root.createDataObject("ANORDER");
+        ord1.setInt("ID", 100);
+        ord1.setString("PRODUCT", "XYZNewProduct");
+        cust1.getList("orders").add(ord1);
+        
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        
+        read.setParameter(1, new Integer(1));
+        root = read.executeQuery();
+        cust1 = root.getDataObject("CUSTOMER[1]");
+        assertNotNull(cust1);
+        assertEquals("MyCustomer", cust1.getString("LASTNAME"));
+        List cust1Ords = cust1.getList("orders");
+        boolean foundNewOrder = false;
+        DataObject curOrd = null;
+        
+        for(int i=0; i<cust1Ords.size(); i++) {
+        	curOrd = (DataObject)cust1Ords.get(i);
+        	if(curOrd.getString("PRODUCT").equals("XYZNewProduct")) {
+        		foundNewOrder = true;
+        		break;
+        	}
+        }
+        
+        if(!foundNewOrder) {
+        	fail("Expected new order to be available!");
+        }
+                
+        assertEquals(cust1.getInt("ID"), curOrd.getInt("CUSTOMER_ID"));
+        
+        //2-Insert Parent, Update child///////////////////////////////////////////
+        DataObject custNew = root.createDataObject("CUSTOMER");
+        custNew.setInt("ID", 100);
+        custNew.setString("LASTNAME", "CustNew");
+        custNew.getList("orders").add(curOrd);
+        try {
+            das.applyChanges(root);        
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        
+        read.setParameter(1, new Integer(100));
+        root = read.executeQuery();
+        custNew = root.getDataObject("CUSTOMER[1]");
+        assertNotNull(custNew);
+        int newCustomer_id = custNew.getInt("ID");
+        List newCustOrds = custNew.getList("orders");        
+        
+        DataObject ordNew = (DataObject)newCustOrds.get(0);
+        assertEquals(newCustomer_id, ordNew.getInt("CUSTOMER_ID"));
+        assertEquals("XYZNewProduct", ordNew.getString("PRODUCT"));       
+        
+        //3-Update Parent, Update Child
+        custNew.setString("LASTNAME", "MyNewLastName");
+        ordNew.setString("PRODUCT", "XYZNewSoap123Product");
+        try {
+            das.applyChanges(root);
+        } catch (RuntimeException ex) {
+        	fail("Did not expect exception!");
+        }
+        
+        read.setParameter(1, new Integer(100));
+        root = read.executeQuery();
+        custNew = root.getDataObject("CUSTOMER[1]");
+        assertNotNull(custNew);
+        ordNew = (DataObject)custNew.getList("orders").get(0);        
+        assertEquals(100, ordNew.getInt("CUSTOMER_ID"));
+        assertEquals("XYZNewSoap123Product", ordNew.getString("PRODUCT"));    	
+    }
+}
+\ No newline at end of file
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
new file mode 100644
index 0000000000..74cc753911
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
@@ -0,0 +1,91 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+/**
+ * Test ability to specify format(shape) of the ResultSet. This is necessary
+ * when the JDBC driver in use does not provide adequate support for
+ * ResultSetMetadata. Also, we expect that specifying the result set shape will
+ * increase performance.
+ * 
+ */
+public class ResultSetShapeTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Read a specific customer
+     */
+    public void testReadSingle() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomerConfigWithIDConverter.xml"), getConnection());    
+        // Create and initialize command to read customers
+        Command readCustomers = das.getCommand("literal");          
+
+        // Read
+        DataObject root = readCustomers.executeQuery();
+
+        // Verify
+        assertEquals(5, root.getList("CUSTOMER").size());
+        assertEquals(99, root.getInt("CUSTOMER[1]/ID"));
+        assertEquals("Roosevelt", root.getString("CUSTOMER[1]/LASTNAME"));
+        assertEquals("1600 Pennsylvania Avenue", root.getString("CUSTOMER[1]/ADDRESS"));
+
+    }
+
+    /**
+     * Read a specific customer This duplicates the previous tests but does not
+     * provide the shape info. Since the select will not return valid metadata,
+     * this test is expected to fail
+     */
+    public void testReadSingleVerifyShapeUse() throws Exception {  
+                                                                       
+
+        // Using literals in the select forces invalid resultset metadata
+        String sqlString = "Select 99, 'Roosevelt', '1600 Pennsylvania Avenue' from customer";
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Create and initialize command to read customers
+        Command readCustomers = das.createCommand(sqlString);     
+
+        // Read
+        try {
+          readCustomers.executeQuery();
+          fail("exception not thrown");
+        } catch (RuntimeException ex) {
+            assertEquals("Unable to obtain table information from JDBC. DAS configuration must specify ResultDescriptors", ex.getMessage());
+        }
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java
new file mode 100644
index 0000000000..ca6174956e
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java
@@ -0,0 +1,76 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ * This class provides tests for all supported "types". The current plan 
+ * is to use the Data type definitions provided in the SDO 2 specification. We
+ * must test the ability to use all of these types as well as different mapping 
+ * from thse types to types used in the database. For example, a SDO Data
+ * Type "STRING", might be staored as a "TIMESTAMP" in DB2.
+ * 
+ */
+
+import org.apache.tuscany.das.rdb.test.data.TypesData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+public class SerializationTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new TypesData(getAutoConnection()).refresh();
+    }
+
+    /**
+     * Read various types.
+     */
+
+    public void testReadandSerialize() throws Exception {
+        /**
+         * Currently failing because of TUSCANY-22 
+         * Command select = Command.FACTORY .createCommand("Select * from TYPETEST where ID = 1");
+         * select.setConnection(getConnection()); DataObject root = select.executeQuery();
+         * 
+         * DataObject obj = root.getDataObject("TYPETEST[1]");
+         * 
+         * assertTrue(obj.isSet("ID")); assertTrue(obj.isSet("ATIMESTAMP")); 
+         * assertTrue(obj.isSet("ADECIMAL")); assertTrue(obj.isSet("AFLOAT"));
+         * 
+         * //Java serilaization to file FileOutputStream fos = null; ObjectOutputStream out = null; try { fos = new
+         * FileOutputStream("serializedGraph.xml"); out = new ObjectOutputStream(fos); 
+         * out.writeObject(root); 
+         * out.flush(); 
+         * } finally { 
+         * out.close();
+         * fos.close(); }
+         * 
+         * //Reconstruct the graph FileInputStream fis = null; ObjectInputStream in = null; 
+         * DataObject root2; try { fis = new
+         * FileInputStream("serializedGraph.xml"); in = new ObjectInputStream(fis); 
+         * root2 = (DataObject) in.readObject(); } finally { in.close();
+         * fis.close(); }
+         * 
+         * assertEquals(1, root.getInt("TYPETEST[1]/ID")); assertEquals(TypesData.getTimestamp(),
+         * (java.sql.Timestamp)root.get("TYPETEST[1]/ATIMESTAMP")); 
+         * assertEquals(1234567.89f, root2.getFloat("TYPETEST[1]/ADECIMAL"), .001);
+         * assertEquals(1234567.89f, root2.getFloat("TYPETEST[1]/AFLOAT"), .001);
+         * 
+         */
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
new file mode 100644
index 0000000000..881fb109f6
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
@@ -0,0 +1,228 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ * These are the simplest possible uses of the JDBC DAS. In this mode, the programming model is not much more than JDBC
+ * 
+ * The assumptions for these tests are:
+ * 
+ * Single type Client explicitly Read/Create/Update/Delete commands 
+ * No O/R mapping metadata SDO change history is not used Dynamic DataObjects No
+ * specified graph model
+ * 
+ * 
+ */
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class SimplestCrud extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Read a specific customer
+     */
+    public void testReadSingle() throws Exception {
+
+        // Create and initialize command to read customers
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
+
+        // Read
+        DataObject root = readCustomers.executeQuery();
+
+        // Verify
+        assertEquals(1, root.getInt("CUSTOMER[1]/ID"));
+    }
+
+    /**
+     * Read a specific customer
+     */
+    public void testReadSingle2() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Create and initialize command to read customers
+        Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
+
+        // Read
+        DataObject root = readCustomers.executeQuery();
+
+        // Verify
+        assertEquals(1, root.getInt("CUSTOMER[1]/ID"));
+    }
+
+    /**
+     * Read a specific customer Same as above but tests tolerance of white space in provided SQL
+     */
+    public void testReadSingleWithWhiteSpace() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Create and initialize command to read customers
+        Command readCustomers = das.createCommand("   select * from CUSTOMER where ID = 1");
+
+        // Read
+        DataObject root = readCustomers.executeQuery();
+
+        // Verify
+        assertEquals(1, root.getInt("CUSTOMER[1]/ID"));
+    }
+
+    /**
+     * Read all customers with a specific last name
+     */
+    public void testReadMultiple() throws Exception {
+
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Create and initialize command to read customers
+        Command readCustomers = das.createCommand("select * from CUSTOMER where LASTNAME = 'Williams'");
+
+        // Read
+        DataObject root = readCustomers.executeQuery();
+
+        // Verify
+        assertEquals(4, root.getList("CUSTOMER").size());
+    }
+
+    /**
+     * Read all customers with a specific last name LASTNAME value is provided via a parameter
+     */
+    public void testReadMultipleWithParameters() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Create and initialize command to read customers
+        Command readCustomers = das.createCommand("select * from CUSTOMER where LASTNAME = ?");
+
+        // Parameterize the command
+        readCustomers.setParameter(1, "Williams");
+        DataObject root = readCustomers.executeQuery();
+
+        // Verify
+        assertEquals(4, root.getList("CUSTOMER").size());
+    }
+
+    public void testInsert() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command insert = das.createCommand("insert into CUSTOMER values (10, 'Williams', '5528 Wells Fargo Dr')");
+        insert.execute();
+
+        // Verify
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
+        DataObject root = select.executeQuery();
+        assertEquals(1, root.getList("CUSTOMER").size());
+        assertEquals("5528 Wells Fargo Dr", root.get("CUSTOMER[1]/ADDRESS"));
+
+    }
+
+    public void testInsertWithParameters() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command insert = das.createCommand("insert into CUSTOMER values (?, ?, ?)");
+        insert.setParameter(1, new Integer(10));
+        insert.setParameter(2, "Williams");
+        insert.setParameter(3, "5528 Wells Fargo Dr");
+        insert.execute();
+
+        // Verify
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
+        DataObject root = select.executeQuery();
+        assertEquals(1, root.getList("CUSTOMER").size());
+        assertEquals("5528 Wells Fargo Dr", root.get("CUSTOMER[1]/ADDRESS"));
+
+    }
+
+    public void testDelete() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Verify pre-condition
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+        assertEquals(1, root.getList("CUSTOMER").size());
+
+        // Create and execute the delete command
+        Command delete = das.createCommand("delete from CUSTOMER where ID = 1");
+        delete.execute();
+
+        // Verify delete by reusing the original select command
+        root = select.executeQuery();
+        assertEquals(0, root.getList("CUSTOMER").size());
+
+    }
+
+    public void testUpdate() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Verify pre-condition
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+        assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
+
+        Command update = das.createCommand("update CUSTOMER set LASTNAME = 'Pavick' where ID = 1");
+        update.execute();
+
+        // Verify update - reuse select command
+        root = select.executeQuery();
+        assertEquals("Pavick", root.get("CUSTOMER[1]/LASTNAME"));
+
+    }
+
+    public void testUpdateWithParameters() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Verify pre-condition
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+        assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
+
+        Command update = das.createCommand("update CUSTOMER set LASTNAME = ? where ID = ?");
+        update.setParameter(1, "Pavick");
+        update.setParameter(2, new Integer(1));
+        update.execute();
+
+        // Verify update - reuse select command
+        root = select.executeQuery();
+        assertEquals("Pavick", root.get("CUSTOMER[1]/LASTNAME"));
+
+    }
+
+    public void testUpdateWithParmarkers() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Verify pre-condition
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+        assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
+
+        Command update = das.createCommand("update CUSTOMER set LASTNAME = ? where ID = ?");
+        update.setParameter(1, "Pavick");
+        update.setParameter(2, new Integer(1));
+        update.execute();
+
+        //Verify update - reuse select command
+        root = select.executeQuery();
+        assertEquals("Pavick", root.get("CUSTOMER[1]/LASTNAME"));
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
new file mode 100644
index 0000000000..74126b2668
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
@@ -0,0 +1,142 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.CompanyData;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class StoredProcs extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new CompanyData(getAutoConnection()).refresh();
+        new CustomerData(getAutoConnection()).refresh();
+        new OrderData(getAutoConnection()).refresh();
+
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testMultipleResultSets() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command read = das.createCommand("{call GETALLCUSTOMERSANDORDERS()}");
+
+        DataObject root = read.executeQuery();
+
+        // Verify
+        assertEquals(5, root.getList("CUSTOMER").size());
+        assertEquals(4, root.getList("ANORDER").size());
+    }
+
+    // Call a simple stored proc to read all companies
+    public void testGetCompanies() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command read = das.createCommand("{call GETALLCOMPANIES()}");
+
+        DataObject root = read.executeQuery();
+
+        // Verify
+        assertEquals(3, root.getList("COMPANY").size());
+        assertTrue(root.getInt("COMPANY[1]/ID") > 0);
+
+    }
+
+    public void testGetNamedCompany() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command read = das.createCommand("{call GETNAMEDCOMPANY(?)}");
+
+        read.setParameter(1, "MegaCorp");
+        DataObject root = read.executeQuery();
+
+        assertEquals("MegaCorp", root.getString("COMPANY[1]/NAME"));
+
+    }
+
+    public void testGetNamedCompanyByName() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command read = das.createCommand("{call GETNAMEDCOMPANY(?)}");
+
+        read.setParameter(1, "MegaCorp");
+        DataObject root = read.executeQuery();
+
+        assertEquals("MegaCorp", root.getString("COMPANY[1]/NAME"));
+    }
+
+    // Retreive heirarchy using a stored proc ... new programming model
+    public void testGetCustomersAndOrder() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
+        Command read = das.createCommand("{call getCustomerAndOrders(?)}");
+        read.setParameter(1, new Integer(1));
+
+        DataObject root = read.executeQuery();
+
+        DataObject customer = (DataObject) root.getList("CUSTOMER").get(0);
+        assertEquals(2, customer.getList("orders").size());
+
+    }
+
+    /**
+     * Call a stored proc requiring an in parameter and producing 
+     * an out parameter and a resultset
+     * 
+     * This stored proc takes a lastname argument and returns a 
+     * graph of customers with that last name. The number of read 
+     * customers is returned in
+     * the out parameter
+     */
+    public void testGetNamedCustomers() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConfig("storedProcTest.xml"), getConnection());
+        Command read = das.getCommand("getNamedCustomers");
+        read.setParameter(1, "Williams");
+        DataObject root = read.executeQuery();
+
+        Integer customersRead = (Integer) read.getParameter(2);
+
+        assertEquals(4, customersRead.intValue());
+        assertEquals(customersRead.intValue(), root.getList("CUSTOMER").size());
+
+    }
+
+    // TODO - Resolve issue with programmatic creation of GETNAMEDCUSTOMERS on DB2 and
+    // re-enable this test
+
+    // Simplest possible SP write
+    public void testDelete() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        Command delete = das.createCommand("{call DELETECUSTOMER(?)}");
+        delete.setParameter(1, new Integer(1));
+        delete.execute();
+
+        // Verify DELETE
+        Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
+        DataObject root = select.executeQuery();
+        assertTrue(root.getList("CUSTOMER").isEmpty());
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
new file mode 100644
index 0000000000..0fb75dc424
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
@@ -0,0 +1,75 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.sql.SQLException;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.customer.AnOrder;
+import org.apache.tuscany.das.rdb.test.customer.Customer;
+import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
+
+public class TopDown extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        new CustomerData(getAutoConnection()).refresh();
+        new OrderData(getAutoConnection()).refresh();
+
+    }
+
+    // Uses dynamic SDOs but user provides the model
+    public void testUserProvidedModelDynamic() throws SQLException {
+
+        DAS das = DAS.FACTORY.createDAS(getConfig("staticCustomerOrder.xml"), getConnection());
+
+        Command select = das.getCommand("Customer and Orders");
+
+        HelperContext context = HelperProvider.getDefaultContext();
+        CustomerFactory.INSTANCE.register(context);
+
+        // Parameterize the command
+        select.setParameter(1, new Integer(1));
+
+        // Get the graph - DataGraphRoot is from the typed package
+        DataObject root = select.executeQuery();
+
+        // Modify a customer
+        Customer customer = (Customer) root.getDataObject("Customer[1]");
+        customer.setLastName("Pavick");
+
+        // Modify an order
+        AnOrder order = (AnOrder) customer.getOrders().get(0);
+        order.setProduct("Kitchen Sink 001");
+
+        // Flush changes
+        das.applyChanges((DataObject) root);
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TransactionTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TransactionTests.java
new file mode 100644
index 0000000000..60eff851d6
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TransactionTests.java
@@ -0,0 +1,87 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ * Test capability to participate in an extenrlly managed transaction. 
+ * The client is managing the transaction boundary so the DAS will not issue
+ * commit/rollback
+ * 
+ */
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class TransactionTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Read and modify a customer. Uses a "passive" connection
+     */
+    public void testReadModifyApply() throws Exception {
+
+        // Create and initialize a DAS connection and initialize for externally
+        // managed transaction boundaries
+        java.sql.Connection c = getConnection();
+
+        DAS das = DAS.FACTORY.createDAS(c);
+        // Read customer 1
+        Command select = das.createCommand("select * from CUSTOMER");
+        DataObject root = select.executeQuery();
+        
+        int numCustomers = root.getList("CUSTOMER").size();
+
+        //Create two identical customers.  Will force insert error on dup key
+        
+        DataObject custA = root.createDataObject("CUSTOMER");
+        custA.set("ID", new Integer(100));
+        custA.set("ADDRESS", "5528 Wells Fargo Drive");
+        custA.set("LASTNAME", "Gerkin");
+       
+        DataObject custB = root.createDataObject("CUSTOMER");
+        custB.set("ID", new Integer(100));
+        custB.set("ADDRESS", "5528 Wells Fargo Drive");
+        custB.set("LASTNAME", "Gerkin");
+        try {
+            das.applyChanges(root);
+            fail("An exception was expected");
+        } catch (Exception e) {
+            //do nothing
+        }
+
+        // Verify that the changes did not go through
+        // Roll back should discard al changes
+        root = select.executeQuery();
+        assertEquals(numCustomers, root.getList("CUSTOMER").size());
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java
new file mode 100644
index 0000000000..54dfbc4402
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java
@@ -0,0 +1,108 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ * This class provides tests for all supported "types".  The current plan is to use the Data
+ * type definitions provided in the SDO 2 specification.  We must test the ability to use
+ * all of these types as well as different mapping from thse types to types used in the 
+ * database.  For example, a SDO Data Type "STRING", might be staored as a "TIMESTAMP" in DB2.
+ * 
+ */
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.impl.SDODataTypeHelper;
+import org.apache.tuscany.das.rdb.test.data.TypesData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+import org.apache.tuscany.sdo.api.SDOUtil;
+import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Type;
+import commonj.sdo.impl.HelperProvider;
+
+public class TypeTests extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new TypesData(getAutoConnection()).refresh();
+    }
+
+    /**
+     * Read various types.
+     */
+    public void testRead() throws Exception {
+        DAS das = DAS.FACTORY.createDAS(getConnection());
+        // Read customer 1
+        Command select = das.createCommand("Select * from TYPETEST where ID = 1");
+        DataObject root = select.executeQuery();
+
+        DataObject types = (DataObject) root.get("TYPETEST[1]");
+
+        java.sql.Timestamp ts = (java.sql.Timestamp) types.get("ATIMESTAMP");
+        assertEquals(ts, TypesData.getTimestamp());
+
+        float decimal = types.getFloat("ADECIMAL");
+        assertEquals(1234567.89f, decimal, .0001);
+
+    }
+
+    /**
+     * Write various types.  
+     * TODO - Need to rethink the Timestamp write.  My current thinking id that writes of non-SDO2 defined types 
+     * require a converter
+     */
+    /*    public void testWrite() throws Exception {
+
+     //Read customer 1
+     Command select = Command.FACTORY.createCommand("Select * from TYPETEST where ID = 1");  
+     select.setConnection(getConnection());
+     DataObject root = select.executeQuery();
+     
+     DataObject types = (DataObject)root.get("TYPETEST[1]");
+     Date now = new Date();
+     types.set("ATIMESTAMP", now);
+     
+     ApplyChangesCommand apply = Command.FACTORY.createApplyChangesCommand();
+     apply.setConnection(getConnection());
+     apply.addPrimaryKey("TYPETEST.ID");
+     apply.execute(root);
+     
+     //Verify
+     root = select.executeQuery();
+     java.sql.Timestamp ts = (java.sql.Timestamp)types.get("ATIMESTAMP");
+     assertEquals(now, ts);
+     
+     }*/
+    
+    public void testTypeMapping() throws Exception {
+    	 List typesList = SDOUtil.getTypes(HelperProvider.getDefaultContext(), ModelFactoryImpl.NAMESPACE_URI);
+    	 Iterator itr = typesList.iterator();
+    	 while(itr.hasNext()) {
+    		 Type sdoType = (Type)itr.next();
+    		 if(sdoType.isDataType() && !sdoType.getName().equals("ChangeSummaryType"))
+    			 assertEquals(sdoType.getURI()+"."+sdoType.getName(), SDODataTypeHelper.columnTypeForSDOType(sdoType));
+    	 }
+    } 
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
new file mode 100644
index 0000000000..f98e014ca9
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
@@ -0,0 +1,56 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.commands;
+
+import org.apache.tuscany.das.rdb.config.Column;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.ConfigFactory;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.impl.ReadCommandImpl;
+
+public class ReadCustomersByLastnameCommand extends ReadCommandImpl {
+
+    private static final String SQL_STRING = "select * from CUSTOMER where LASTNAME = ?";
+
+    private static final Config CONFIG;
+
+    static {
+        ConfigFactory factory = ConfigFactory.INSTANCE;
+        CONFIG = factory.createConfig();
+        Table t = factory.createTable();
+        Column id = factory.createColumn();
+        id.setColumnName("ID");
+        id.setPrimaryKey(true);
+        Column lastname = factory.createColumn();
+        lastname.setColumnName("LASTNAME");
+        Column address = factory.createColumn();
+        address.setColumnName("ADDRESS");
+
+        t.getColumn().add(id);
+        t.getColumn().add(lastname);
+        t.getColumn().add(address);
+        t.setTableName("CUSTOMER");
+        CONFIG.getTable().add(t);
+    }
+
+    public ReadCustomersByLastnameCommand() {
+        super(SQL_STRING, new MappingWrapper(CONFIG), null);
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
new file mode 100644
index 0000000000..7a4b8f49dd
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
@@ -0,0 +1,57 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.commands;
+
+import org.apache.tuscany.das.rdb.config.Column;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.ConfigFactory;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.impl.ReadCommandImpl;
+
+public class ReadCustomersCommand extends ReadCommandImpl {
+
+    private static final String SQL_STRING = "select * from CUSTOMER";
+
+    private static final Config CONFIG;
+
+    static {
+        ConfigFactory factory = ConfigFactory.INSTANCE;
+        CONFIG = factory.createConfig();
+        Table t = factory.createTable();
+        Column id = factory.createColumn();
+        id.setColumnName("ID");
+        id.setPrimaryKey(true);
+        Column lastname = factory.createColumn();
+        lastname.setColumnName("LASTNAME");
+        Column address = factory.createColumn();
+        address.setColumnName("ADDRESS");
+
+        t.getColumn().add(id);
+        t.getColumn().add(lastname);
+        t.getColumn().add(address);
+        t.setTableName("CUSTOMER");
+        CONFIG.getTable().add(t);
+    }
+
+    public ReadCustomersCommand() {
+        super(SQL_STRING, new MappingWrapper(CONFIG), null);
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
new file mode 100644
index 0000000000..52e1274d8a
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
@@ -0,0 +1,66 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.commands;
+
+import org.apache.tuscany.das.rdb.config.Column;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.ConfigFactory;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.impl.ReadCommandImpl;
+import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
+
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
+
+public class ReadCustomersStaticTypesCommand extends ReadCommandImpl {
+
+    private static final String SQL_STRING = "Select ID, LASTNAME, ADDRESS from CUSTOMER where LASTNAME = ?";
+
+    private static final Config CONFIG;
+
+    static {
+        ConfigFactory factory = ConfigFactory.INSTANCE;
+        CONFIG = factory.createConfig();
+        Table t = factory.createTable();
+        Column id = factory.createColumn();
+        id.setColumnName("ID");
+        id.setPrimaryKey(true);
+        Column lastname = factory.createColumn();
+        lastname.setColumnName("LASTNAME");
+        Column address = factory.createColumn();
+        address.setColumnName("ADDRESS");
+
+        t.getColumn().add(id);
+        t.getColumn().add(lastname);
+        t.getColumn().add(address);
+        t.setTableName("CUSTOMER");
+        t.setTypeName("Customer");
+        CONFIG.getTable().add(t);
+
+        CONFIG.setDataObjectModel("http:///org.apache.tuscany.das.rdb.test/customer.xsd");
+        HelperContext context = HelperProvider.getDefaultContext();
+        CustomerFactory.INSTANCE.register(context);     
+    }
+
+    public ReadCustomersStaticTypesCommand() {
+        super(SQL_STRING, new MappingWrapper(CONFIG), null);
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java
new file mode 100644
index 0000000000..ba771ca3e5
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java
@@ -0,0 +1,63 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.config.ConfigFactory;
+import org.apache.tuscany.das.rdb.config.ResultDescriptor;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.impl.ReadCommandImpl;
+
+public class ReadCustomersWithShapeCommand extends ReadCommandImpl {
+    // This sql string ensures that we won't have resultset metadata
+    static String sqlString = "select * from customer union select * from customer";
+
+    static List descriptor = new ArrayList();
+
+    static {
+        ConfigFactory factory = ConfigFactory.INSTANCE;
+
+        ResultDescriptor desc1 = factory.createResultDescriptor();
+        desc1.setColumnName("ID");
+        desc1.setColumnType("commonj.sdo.Int");
+        desc1.setTableName("CUSTOMER");
+
+        ResultDescriptor desc2 = factory.createResultDescriptor();
+        desc2.setColumnName("LASTNAME");
+        desc2.setColumnType("commonj.sdo.String");
+        desc2.setTableName("CUSTOMER");
+
+        ResultDescriptor desc3 = factory.createResultDescriptor();
+        desc3.setColumnName("ADDRESS");
+        desc3.setColumnType("commonj.sdo.String");
+        desc3.setTableName("CUSTOMER");
+
+        descriptor.add(desc1);
+        descriptor.add(desc2);
+        descriptor.add(desc3);
+
+    }
+
+    public ReadCustomersWithShapeCommand() {
+        super(sqlString, new MappingWrapper(), descriptor);
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
new file mode 100644
index 0000000000..44eea42445
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
@@ -0,0 +1,83 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.config.Column;
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.ConfigFactory;
+import org.apache.tuscany.das.rdb.config.ResultDescriptor;
+import org.apache.tuscany.das.rdb.config.Table;
+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
+import org.apache.tuscany.das.rdb.impl.ReadCommandImpl;
+
+public class SimpleReadCustomersWithShapeCommand extends ReadCommandImpl {
+
+    // This sql string ensures that we won't have resultset metadata
+    private static final String SQL_STRING = "Select * from customer union select * from customer";
+
+    private static final List DESCRIPTOR = new ArrayList();
+
+    private static final Config CONFIG;
+
+    static {
+        ConfigFactory factory = ConfigFactory.INSTANCE;
+        CONFIG = factory.createConfig();
+        Table t = factory.createTable();
+        Column id = factory.createColumn();
+        id.setColumnName("ID");
+        id.setPrimaryKey(true);
+        Column lastname = factory.createColumn();
+        lastname.setColumnName("LASTNAME");
+        Column address = factory.createColumn();
+        address.setColumnName("ADDRESS");
+
+        t.getColumn().add(id);
+        t.getColumn().add(lastname);
+        t.getColumn().add(address);
+        t.setTableName("CUSTOMER");
+        CONFIG.getTable().add(t);
+
+        ResultDescriptor desc1 = factory.createResultDescriptor();
+        desc1.setColumnName("ID");
+        desc1.setColumnType("commonj.sdo.Int");
+        desc1.setTableName("CUSTOMER");
+
+        ResultDescriptor desc2 = factory.createResultDescriptor();
+        desc2.setColumnName("LASTNAME");
+        desc2.setColumnType("commonj.sdo.String");
+        desc2.setTableName("CUSTOMER");
+
+        ResultDescriptor desc3 = factory.createResultDescriptor();
+        desc3.setColumnName("ADDRESS");
+        desc3.setColumnType("commonj.sdo.String");
+        desc3.setTableName("CUSTOMER");
+
+        DESCRIPTOR.add(desc1);
+        DESCRIPTOR.add(desc2);
+        DESCRIPTOR.add(desc3);
+    }
+
+    public SimpleReadCustomersWithShapeCommand() {
+        super(SQL_STRING, new MappingWrapper(CONFIG), DESCRIPTOR);
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java
new file mode 100644
index 0000000000..33f7152c04
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java
@@ -0,0 +1,46 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.Types;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+public class BookData extends TestDataWithExplicitColumns {
+
+    // CREATE TABLE BOOK (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(50), AUTHOR VARCHAR(30), QUANTITY INT, OCC INTEGER)
+
+    private static int[] bookTypes = {Types.INTEGER, Types.VARCHAR, Types.VARCHAR, Types.INTEGER, Types.INTEGER};
+
+    private static Object[][] bookData = {{new Integer(1), "The Brothers Karamazov", "Fyodor Dostoevsky", 
+            new Integer(5), new Integer(17)},
+        {new Integer(2), "Cat in the Hat", "Doctor Seuss", new Integer(10), new Integer(1)}};
+
+    private static String[] bookColumns = {"BOOK_ID", "NAME", "AUTHOR", "QUANTITY", "OCC"};
+
+    public BookData(Connection connection) {
+        super(connection, bookData, bookColumns, bookTypes);
+    }
+
+    public String getTableName() {
+        return "BOOK";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java
new file mode 100644
index 0000000000..6a99f825e7
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java
@@ -0,0 +1,54 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.apache.tuscany.das.rdb.test.framework.TestData;
+
+public class CityData extends TestData {
+
+    private static Object[][] cityData = {{new Integer(1), "Lizard Lick", "1"}, 
+        {new Integer(2), "Morrisville", "1"},
+        {new Integer(3), "Breckenridge", "2"}, 
+        {new Integer(4), "Barstow", "3"}, 
+        {new Integer(5), "Sacramento", "3"}
+
+    };
+
+    public CityData(Connection c) {
+        super(c, cityData);
+    }
+
+    public String getTableName() {
+        return "CITIES";
+    }
+
+    public void doDeletes() throws SQLException {
+        deleteRowsFromTable();
+
+    }
+
+    public void doInserts() throws SQLException {
+        insertRows();
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java
new file mode 100644
index 0000000000..0c28ed2caa
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java
@@ -0,0 +1,44 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.Types;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+public class CompanyData extends TestDataWithExplicitColumns {
+
+    // CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY ,NAME VARCHAR(30))
+
+    private static int[] columnTypes = {Types.VARCHAR};
+
+    private static Object[][] companyData = {{"ACME Publishing"}, {"Do-rite plumbing"}, {"MegaCorp"}};
+
+    private static String[] companyColumns = {"NAME"};
+
+    public CompanyData(Connection connection) {
+        super(connection, companyData, companyColumns, columnTypes);
+    }
+
+    public String getTableName() {
+        return "COMPANY";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java
new file mode 100644
index 0000000000..686e3243cb
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java
@@ -0,0 +1,41 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.test.framework.RelationshipData;
+
+public class CompanyDeptData extends RelationshipData {
+
+    private static Object[][] data = {{"MegaCorp", "Advanced Technologies"}};
+
+    public CompanyDeptData(Connection c) {
+        super(c, data);
+    }
+
+    protected String getParentRetrievalStatement() {
+        return "select id from company where name = ?";
+    }
+
+    protected String getChildUpdateStatement() {
+        return "update department set companyid = ? where department.name = ?";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java
new file mode 100644
index 0000000000..b1d3fb12b5
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java
@@ -0,0 +1,45 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.test.framework.RelationshipData;
+
+
+public class CompanyEmpData extends RelationshipData {
+
+    protected static Object[][] data = {
+        {"Mary Smith", "ACME Publishing" },
+        {"Jane Doe", "Do-rite plumbing"},
+        {"Al Smith", "MegaCorp"}};
+    
+    public CompanyEmpData(Connection c) {
+        super(c, data);
+    }
+
+    protected String getParentRetrievalStatement() {
+        return "select employee.id from employee where employee.name = ?";
+    }
+
+    protected String getChildUpdateStatement() {
+        return "update company set company.eotmid = ? where company.name = ?";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java
new file mode 100644
index 0000000000..f64b0076b8
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java
@@ -0,0 +1,39 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.test.framework.TestData;
+
+public class CustomerData extends TestData {
+
+    private static Object[][] customerData = {{new Integer(1), "Williams", "1212 foobar lane"},
+        {new Integer(2), "Daniel", "156 Brentfield Loop"}, {new Integer(3), "Williams", "456 penny lane"},
+        {new Integer(4), "Williams", "5000 pineville"}, {new Integer(5), "Williams", "100000 firefly lane"}};
+
+    public CustomerData(Connection connection) {
+        super(connection, customerData);
+    }
+
+    public String getTableName() {
+        return "CUSTOMER";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java
new file mode 100644
index 0000000000..ad8ff14e86
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java
@@ -0,0 +1,43 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.test.framework.RelationshipData;
+
+public class DepEmpData extends RelationshipData {
+
+    private static Object[][] data = {{"Advanced Technologies", "John Jones"}, 
+        {"Advanced Technologies", "Jane Doe"},
+        {"Advanced Technologies", "Al Smith"}};
+
+    public DepEmpData(Connection c) {
+        super(c, data);
+    }
+
+    protected String getParentRetrievalStatement() {
+        return "select department.id from department where department.name = ?";
+    }
+
+    protected String getChildUpdateStatement() {
+        return "update employee set employee.departmentid = ? where employee.name = ?";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java
new file mode 100644
index 0000000000..54e2713498
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java
@@ -0,0 +1,44 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.Types;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+
+public class DepartmentData extends TestDataWithExplicitColumns {
+
+    private static int[] columnTypes = {Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.INTEGER};
+
+    private static Object[][] deptData = {{"Advanced Technologies", "NY", "123", new Integer(1) },
+                                          {"New Technologies", "CA", "125", new Integer(2) }};
+
+    private static String[] deptColumns = {"NAME", "LOCATION", "DEPNUMBER", "COMPANYID"};
+
+    public DepartmentData(Connection connection) {
+        super(connection, deptData, deptColumns, columnTypes);
+    }
+
+    public String getTableName() {
+        return "DEPARTMENT";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DocumentsImagesData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DocumentsImagesData.java
new file mode 100644
index 0000000000..d88cb0431d
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DocumentsImagesData.java
@@ -0,0 +1,82 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.sql.Blob;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+public class DocumentsImagesData extends TestDataWithExplicitColumns {
+
+	public DocumentsImagesData(Connection connection) {
+		super(connection, null, null, null);
+	}
+	
+    public String getTableName() {
+        return "DOCUMENTS_IMAGES";
+    }
+
+    //Due to special processing, not using superclass methods.
+    protected void insertRows() throws SQLException {    	
+    	try{
+    		InputStream fileAsciiStream = this.getClass().getClassLoader().getResourceAsStream("asciifile.txt");
+			PreparedStatement ps = this.connection.prepareStatement("INSERT INTO DOCUMENTS_IMAGES VALUES (?, ?, ?)");
+			ps.setInt(1, 100);
+			
+			// - set the value of the input parameter to the input stream
+			ps.setAsciiStream(2, fileAsciiStream, fileAsciiStream.available());
+			
+			//Blob
+			InputStream fileImgStream = this.getClass().getClassLoader().getResourceAsStream("moin-www.png");			
+			byte[] imgBytes = new byte[fileImgStream.available()];
+			int i=0;
+			while(fileImgStream.available()>0){					
+				imgBytes[i] = (byte)fileImgStream.read();
+				i++;
+			}
+			Blob blob = createBlob(imgBytes);
+			ps.setBlob(3, blob);
+			ps.execute(); 
+			ps.close();
+    	}catch(IOException ioe){
+    		ioe.printStackTrace();
+    		throw new RuntimeException("Could not insert data for Blob/Clob..Please check resources!"+ioe.getMessage());
+    	}
+    }
+    
+     private Blob createBlob(byte[] bytes) {
+        Blob blob = null;
+        Class blobClazz;
+        try {
+            blobClazz = Class.forName("javax.sql.rowset.serial.SerialBlob", true, Thread.currentThread().getContextClassLoader());
+            Constructor blobConstructor = blobClazz.getConstructor(new Class[] { bytes.getClass() });
+            blob = (Blob) blobConstructor.newInstance(new Object[] { bytes });
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return blob;
+    }
+    
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java
new file mode 100644
index 0000000000..96346ff21d
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java
@@ -0,0 +1,54 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.Types;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+public class DogData extends TestDataWithExplicitColumns {
+
+    /*    CREATE TABLE DOG (
+     ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+     OWNER_ID INTEGER UNSIGNED NOT NULL,
+     NAME VARCHAR(20) NOT NULL,
+     BREED VARCHAR(20) NULL,
+     OCC_COUNT INTEGER UNSIGNED NULL,
+     PRIMARY KEY(ID),
+     );*/
+
+    //id and owner_id omitted.  id is auto-generated. owner_id is filled in by DogOwner data
+    private static int[] columnTypes = {Types.VARCHAR, Types.VARCHAR, Types.INTEGER};
+
+    private static Object[][] data = {{"Fido", "Mutt", new Integer(1)}, 
+        {"Max", "German Shepherd", new Integer(1)},
+        {"Saddie", "Collie", new Integer(1)}};
+
+    private static String[] columns = {"NAME", "BREED", "OCC_COUNT"};
+
+    public DogData(Connection connection) {
+        super(connection, data, columns, columnTypes);
+    }
+
+    public String getTableName() {
+        return "DOG";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java
new file mode 100644
index 0000000000..402d62fb67
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java
@@ -0,0 +1,46 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.Types;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+public class EmployeeData extends TestDataWithExplicitColumns {
+
+    private static int[] columnTypes = {Types.VARCHAR, Types.VARCHAR, Types.SMALLINT};
+
+    private static Object[][] employeeData = {{"John Jones", "E0001", Boolean.valueOf(false)}, 
+        {"Mary Smith", "E0002", Boolean.valueOf(true)},
+        {"Jane Doe", "E0003", Boolean.valueOf(false)},
+        {"Al Smith", "E0004", Boolean.valueOf(true)},
+        {"John Smith", "E0005", Boolean.valueOf(false)}};
+
+    private static String[] employeeColumns = {"NAME", "SN", "MANAGER"};
+
+    public EmployeeData(Connection connection) {
+        super(connection, employeeData, employeeColumns, columnTypes);
+    }
+
+    public String getTableName() {
+        return "EMPLOYEE";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
new file mode 100644
index 0000000000..50b1227b47
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
@@ -0,0 +1,53 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.Types;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+public class KennelData extends TestDataWithExplicitColumns {
+
+    /*    CREATE TABLE KENNEL (
+     ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+     KNUMBER INTEGER UNSIGNED NULL,
+     KIND VARCHAR(20) NULL,
+     OCC_COUNT INTEGER UNSIGNED NULL,
+     PRIMARY KEY(ID)
+     );*/
+
+    //id omitted.  id is auto-generated.
+    private static int[] columnTypes = {Types.INTEGER, Types.VARCHAR, Types.INTEGER};
+
+    private static Object[][] data = {{new Integer(100), "Small", new Integer(1)}, 
+        {new Integer(101), "Small", new Integer(1)},
+        {new Integer(102), "Large", new Integer(1)}};
+
+    private static String[] columns = {"KNUMBER", "KIND", "OCC_COUNT"};
+
+    public KennelData(Connection connection) {
+        super(connection, data, columns, columnTypes);
+    }
+
+    public String getTableName() {
+        return "KENNEL";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/MultiSchemaData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/MultiSchemaData.java
new file mode 100644
index 0000000000..bc59c09fb2
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/MultiSchemaData.java
@@ -0,0 +1,99 @@
+/*
+ * 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.    
+ */
+
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+//JIRA-952
+public class MultiSchemaData {
+	Connection con;
+	
+	public MultiSchemaData(Connection connection){
+		this.con = connection;
+	}
+	
+    public void refresh() throws SQLException{
+    	//System.out.println("Inserting data in multi schema tables");
+	    	Statement s = this.con.createStatement();
+	    	
+	        String[] statements = {
+	        "DELETE FROM DASTEST1.CUSTOMER",
+	        "DELETE FROM DASTEST1.EMPLOYEE",
+	        "DELETE FROM DASTEST1.CITY",
+	        "DELETE FROM DASTEST1.ORDERDETAILS",
+	        "DELETE FROM DASTEST2.CUSTOMER",
+	        "DELETE FROM DASTEST2.CITY",
+	        "DELETE FROM DASTEST2.ACCOUNT",
+	        "DELETE FROM DASTEST3.CUSTOMER",
+	        "DELETE FROM DASTEST3.CUSTORDER",
+	        "DELETE FROM DASTEST3.ORDERDETAILSDESC",
+	        
+			"INSERT INTO DASTEST1.CUSTOMER (ID, LASTNAME, ADDRESS) VALUES (1,'Williams','USA')",
+			"INSERT INTO DASTEST1.CUSTOMER (ID, LASTNAME, ADDRESS) VALUES (2,'Amita1','INDIA')",
+			"INSERT INTO DASTEST1.CUSTOMER (ID, LASTNAME, ADDRESS) VALUES (3,'Patrick1','UK')",
+			
+			"INSERT INTO DASTEST1.EMPLOYEE (ID, LASTNAME, ADDRESS) VALUES (1,'Williams','USA')",
+			"INSERT INTO DASTEST1.EMPLOYEE (ID, LASTNAME, ADDRESS) VALUES (2,'Amita1','INDIA')",
+			"INSERT INTO DASTEST1.EMPLOYEE (ID, LASTNAME, ADDRESS) VALUES (3,'Patrick1','UK')",
+			
+			"INSERT INTO DASTEST2.CUSTOMER (ID, LASTNAME, ADDRESS) VALUES (1,'John2','USA')",
+			"INSERT INTO DASTEST2.CUSTOMER (ID, LASTNAME, ADDRESS) VALUES (2,'Amita2','INDIA')",
+			"INSERT INTO DASTEST2.CUSTOMER (ID, LASTNAME, ADDRESS) VALUES (3,'Patrick2','UK')",
+		
+			"INSERT INTO DASTEST3.CUSTOMER (ID, LASTNAME, ADDRESS) VALUES (1,'JohnAdm','USA')",
+			"INSERT INTO DASTEST3.CUSTOMER (ID, LASTNAME, ADDRESS) VALUES (2,'AmitaAdm','INDIA')",
+			"INSERT INTO DASTEST3.CUSTOMER (ID, LASTNAME, ADDRESS) VALUES (3,'PatrickAdm','UK')",
+			
+			"INSERT INTO DASTEST1.CITY (INDX, NAME) VALUES (1,'Fremont')",
+			"INSERT INTO DASTEST1.CITY (INDX, NAME) VALUES (2,'Belmont')",
+			
+			"INSERT INTO DASTEST2.CITY (INDX, NAME) VALUES (1,'Milipitas')",
+			"INSERT INTO DASTEST2.CITY (INDX, NAME) VALUES (2,'Newark')",
+			
+			"INSERT INTO DASTEST2.ACCOUNT (ACCOUNT_ID, CUSTOMER_ID, BALANCE) VALUES (10, 1, 101)",
+			"INSERT INTO DASTEST2.ACCOUNT (ACCOUNT_ID, CUSTOMER_ID, BALANCE) VALUES (20, 1, 202)",
+			"INSERT INTO DASTEST2.ACCOUNT (ACCOUNT_ID, CUSTOMER_ID, BALANCE) VALUES (30, 2, 303)",
+			"INSERT INTO DASTEST2.ACCOUNT (ACCOUNT_ID, CUSTOMER_ID, BALANCE) VALUES (40, 2, 404)",
+		
+			"INSERT INTO DASTEST3.CUSTORDER (ORDER_ID, CUSTOMER_ID, ORDER_COUNT) VALUES (100,1,150)",
+			"INSERT INTO DASTEST3.CUSTORDER (ORDER_ID, CUSTOMER_ID, ORDER_COUNT) VALUES (200,1,250)",
+			"INSERT INTO DASTEST3.CUSTORDER (ORDER_ID, CUSTOMER_ID, ORDER_COUNT) VALUES (300,2,150)",
+			"INSERT INTO DASTEST3.CUSTORDER (ORDER_ID, CUSTOMER_ID, ORDER_COUNT) VALUES (400,2,250)",
+			
+			"INSERT INTO DASTEST1.ORDERDETAILS (ORDERID, PRODUCTID, PRICE) VALUES (1,1,101)",
+			"INSERT INTO DASTEST1.ORDERDETAILS (ORDERID, PRODUCTID, PRICE) VALUES (1,2,102)",
+			"INSERT INTO DASTEST1.ORDERDETAILS (ORDERID, PRODUCTID, PRICE) VALUES (2,1,201)",
+			"INSERT INTO DASTEST1.ORDERDETAILS (ORDERID, PRODUCTID, PRICE) VALUES (2,2,202)",
+			"INSERT INTO DASTEST3.ORDERDETAILSDESC (ID, ORDERID, PRODUCTID, DESCR) VALUES (10,1,1, 'DESC 10,1,1')",
+			"INSERT INTO DASTEST3.ORDERDETAILSDESC (ID, ORDERID, PRODUCTID, DESCR) VALUES (20,1,1, 'DESC 20,1,1')",
+			"INSERT INTO DASTEST3.ORDERDETAILSDESC (ID, ORDERID, PRODUCTID, DESCR) VALUES (30,1,2, 'DESC 30,1,2')",
+			"INSERT INTO DASTEST3.ORDERDETAILSDESC (ID, ORDERID, PRODUCTID, DESCR) VALUES (40,1,2, 'DESC 40,1,2')",
+			"INSERT INTO DASTEST3.ORDERDETAILSDESC (ID, ORDERID, PRODUCTID, DESCR) VALUES (50,2,1, 'DESC 50,2,1')",
+			"INSERT INTO DASTEST3.ORDERDETAILSDESC (ID, ORDERID, PRODUCTID, DESCR) VALUES (60,2,2, 'DESC 60,2,2')"
+	        };
+	        
+	        for (int i = 0; i < statements.length; i++) {
+	                s.execute(statements[i]);
+	        }
+	        s.close();
+        //System.out.println("Multi schema database setup complete!");
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java
new file mode 100644
index 0000000000..279da7b9e3
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java
@@ -0,0 +1,41 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.test.framework.TestData;
+
+public class OrderData extends TestData {
+
+    protected static Object[][] orderData = {
+        {new Integer(1), "recombobulator", new Integer(47), new Integer(1)},
+        {new Integer(2), "wrench", new Integer(17), new Integer(3)}, 
+        {new Integer(3), "pliers", new Integer(500), new Integer(1)},
+        {new Integer(4), "Tooth Paste", new Integer(12), new Integer(2)}};
+
+    public OrderData(Connection c) {
+        super(c, orderData);
+    }
+
+    public String getTableName() {
+        return "ANORDER";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java
new file mode 100644
index 0000000000..1eae4a73dd
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java
@@ -0,0 +1,43 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.test.framework.TestData;
+
+public class OrderDetailsData extends TestData {
+
+    // CREATE TABLE ORDERDETAILS (ORDERID INT NOT NULL, PRODUCTID INT NOT NULL, PRICE FLOAT, 
+    // PRIMARY KEY (ORDERID, PRODUCTID))
+
+    protected static Object[][] orderDetailsData = {{new Integer(1), new Integer(1), new Float(1.1)},
+        {new Integer(1), new Integer(2), new Float(1.2)}, 
+        {new Integer(2), new Integer(1), new Float(2.1)},
+        {new Integer(2), new Integer(2), new Float(2.2)}};
+
+    public OrderDetailsData(Connection c) {
+        super(c, orderDetailsData);
+    }
+
+    public String getTableName() {
+        return "ORDERDETAILS";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java
new file mode 100644
index 0000000000..b72bc8afae
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java
@@ -0,0 +1,47 @@
+	/*
+	 * 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.    
+	 */
+
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.test.framework.TestData;
+//JIRA-841
+public class OrderDetailsDescriptionData extends TestData {
+
+    // CREATE TABLE ORDERDETAILSDESC (ID INT NOT NULL, ORDERID INT NOT NULL, PRODUCTID INT NOT NULL, 
+	// DESCR VARCHAR, 
+    // PRIMARY KEY ID, FOREIGN KEY (ORDERID, PRODUCTID))
+
+    protected static Object[][] orderDetailsDescriptionData = 
+    {   {new Integer(1), new Integer(1), new Integer(1), "Descr 1,1,1"},
+        {new Integer(2), new Integer(1), new Integer(1), "Descr 2,1,1"}, 
+        {new Integer(3), new Integer(1), new Integer(2), "Descr 3,1,2"},
+        {new Integer(4), new Integer(1), new Integer(2), "Descr 4,1,2"},
+        {new Integer(5), new Integer(2), new Integer(1), "Descr 6,2,1"},
+        {new Integer(6), new Integer(2), new Integer(2), "Descr 6,2,2"}};
+
+    public OrderDetailsDescriptionData(Connection c) {
+        super(c, orderDetailsDescriptionData);
+    }
+
+    public String getTableName() {
+        return "ORDERDETAILSDESC";
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java
new file mode 100644
index 0000000000..02afac5e98
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java
@@ -0,0 +1,53 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.Types;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+public class OwnerData extends TestDataWithExplicitColumns {
+
+    /*    CREATE TABLE OWNER (
+     ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+     NAME VARCHAR(20) NULL,
+     CONTACT_PHONE VARCHAR(20) NULL,
+     OCC_COUNT INTEGER UNSIGNED NULL,
+     PRIMARY KEY(ID)
+     );*/
+
+    //id omitted.  id is auto-generated.
+    private static int[] columnTypes = {Types.VARCHAR, Types.VARCHAR, Types.INTEGER};
+
+    private static Object[][] data = {{"Fanny", "222-2222", new Integer(1)}, 
+        {"Manny", "333-3333", new Integer(1)},
+        {"Sammy", "444-4444", new Integer(1)}};
+
+    private static String[] columns = {"NAME", "CONTACT_PHONE", "OCC_COUNT"};
+
+    public OwnerData(Connection connection) {
+        super(connection, data, columns, columnTypes);
+    }
+
+    public String getTableName() {
+        return "OWNER";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java
new file mode 100644
index 0000000000..a06a2124f3
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java
@@ -0,0 +1,41 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.test.framework.RelationshipData;
+
+public class OwnerDogData extends RelationshipData {
+
+    private static final Object[][] DATA = {{"Fanny", "Fido"}, {"Manny", "Max"}, {"Sammy", "Saddie"}};
+
+    public OwnerDogData(Connection c) {
+        super(c, DATA);
+    }
+
+    protected String getParentRetrievalStatement() {
+        return "select ID from OWNER where NAME = ?";
+    }
+
+    protected String getChildUpdateStatement() {
+        return "update DOG set OWNER_ID = ? where NAME = ?";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java
new file mode 100644
index 0000000000..fc8256dde1
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java
@@ -0,0 +1,48 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.Types;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+public class PartData extends TestDataWithExplicitColumns {
+
+    // CREATE TABLE PART (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(50), QUANTITY INT, PARENT_ID INT )
+
+    private static String[] partColumns = {"ID", "NAME", "QUANTITY", "PARENT_ID"};
+
+    private static int[] columnTypes = {Types.INTEGER, Types.VARCHAR, Types.INTEGER, Types.INTEGER};
+
+    private static Object[][] partData = {{new Integer(1), "Engine", new Integer(1), null},
+        {new Integer(2), "Block", new Integer(1), new Integer(1)}, 
+        {new Integer(3), "Cam Shaft", new Integer(2), new Integer(1)},
+        {new Integer(4), "Piston", new Integer(8), new Integer(1)}, 
+        {new Integer(5), "Piston Ring", new Integer(2), new Integer(4)}};
+
+    public PartData(Connection connection) {
+        super(connection, partData, partColumns, columnTypes);
+    }
+
+    public String getTableName() {
+        return "PART";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/ProductData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/ProductData.java
new file mode 100644
index 0000000000..9cb0263a8c
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/ProductData.java
@@ -0,0 +1,41 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.Types;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+public class ProductData extends TestDataWithExplicitColumns {
+    private static int[] columnTypes = {Types.INTEGER, Types.VARCHAR};
+
+    private static Object[][] productData = {{new Integer(1), "XYZSoap"}, {new Integer(2), "ABCOil"}, {new Integer(3), "PQRPen"}};
+
+    private static String[] productColumns = {"ID", "NAME"};
+
+    public ProductData(Connection connection) {
+        super(connection, productData, productColumns, columnTypes);
+    }
+
+    public String getTableName() {
+        return "PRODUCT";
+    }
+
+}
+\ No newline at end of file
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/ProductProdSpecData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/ProductProdSpecData.java
new file mode 100644
index 0000000000..1360daa61a
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/ProductProdSpecData.java
@@ -0,0 +1,44 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.test.framework.RelationshipData;
+
+
+public class ProductProdSpecData extends RelationshipData {
+
+    protected static Object[][] data = {
+        {"XYZSoap",  "XYZSoapSpec"},
+        {"ABCOil", "ABCOilSpec"}};
+    
+    public ProductProdSpecData(Connection c) {
+        super(c, data);
+    }
+
+    protected String getParentRetrievalStatement() {
+        return "select product.id from product where product.name = ?";
+    }
+
+    protected String getChildUpdateStatement() {
+        return "update productspec set productspec.product_id = ? where productspec.name = ?";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/ProductSpecData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/ProductSpecData.java
new file mode 100644
index 0000000000..60ca47e7d7
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/ProductSpecData.java
@@ -0,0 +1,41 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.Types;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+public class ProductSpecData extends TestDataWithExplicitColumns {
+    private static int[] columnTypes = {Types.INTEGER, Types.VARCHAR};
+
+    private static Object[][] productSpecData = {{new Integer(1), "XYZSoapSpec"}, {new Integer(2), "ABCOilSpec"}};
+
+    private static String[] productSpecColumns = {"ID", "NAME"};
+
+    public ProductSpecData(Connection connection) {
+        super(connection, productSpecData, productSpecColumns, columnTypes);
+    }
+
+    public String getTableName() {
+        return "PRODUCTSPEC";
+    }
+
+}
+\ No newline at end of file
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/SingerData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/SingerData.java
new file mode 100644
index 0000000000..0cfa4dadca
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/SingerData.java
@@ -0,0 +1,44 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.Types;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+public class SingerData extends TestDataWithExplicitColumns {
+    // CREATE TABLE SINGER (ID INT , NAME VARCHAR(20))
+
+    private static int[] singerTypes = {Types.INTEGER, Types.VARCHAR};
+
+    private static Object[][] singerData = {{new Integer(1), "John"},
+        {new Integer(2), "Jane"}, {new Integer(3), "Lata"}};
+
+    private static String[] singerColumns = {"ID", "NAME"};
+
+    public SingerData(Connection connection) {
+        super(connection, singerData, singerColumns, singerTypes);
+    }
+
+    public String getTableName() {
+        return "SINGER";
+    }
+}
+
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/SongData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/SongData.java
new file mode 100644
index 0000000000..d74db4d7bd
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/SongData.java
@@ -0,0 +1,45 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.Types;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+public class SongData extends TestDataWithExplicitColumns {
+    // CREATE TABLE SONG (ID INT , TITLE VARCHAR(20), SINGERID INT)
+
+    private static int[] songTypes = {Types.INTEGER, Types.VARCHAR, Types.INTEGER};
+
+    private static Object[][] songData = {{null, "ABCD", new Integer(1)},
+        {new Integer(20), "Lamb", new Integer(1)},
+        {new Integer(30), "La ra ra", new Integer(2)}};
+
+    private static String[] songColumns = {"ID", "TITLE", "SINGERID"};
+
+    public SongData(Connection connection) {
+        super(connection, songData, songColumns, songTypes);
+    }
+
+    public String getTableName() {
+        return "SONG";
+    }
+}
+
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java
new file mode 100644
index 0000000000..d4e2b99570
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java
@@ -0,0 +1,48 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.apache.tuscany.das.rdb.test.framework.TestData;
+
+public class StateData extends TestData {
+    private static Object[][] stateData = {{new Integer(1), "NC"}, {new Integer(2), "CO"}, 
+        {new Integer(3), "CA"}};
+    
+    public StateData(Connection c) {
+        super(c, stateData);
+    }
+
+    public String getTableName() {
+        return "STATES";
+    }
+
+
+    public void doDeletes() throws SQLException {
+        deleteRowsFromTable();
+    }
+
+    public void doInserts() throws SQLException {
+        insertRows();
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java
new file mode 100644
index 0000000000..97c024109a
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java
@@ -0,0 +1,38 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.test.framework.TestData;
+
+public class TypesData extends TestData {
+
+    private static Object[][] customerData = {{new Integer(1), TIMESTAMP, 
+            new Float(1234567.89), new Float(1234567.89)}};
+
+    public TypesData(Connection connection) {
+        super(connection, customerData);
+    }
+
+    public String getTableName() {
+        return "TYPETEST";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java
new file mode 100644
index 0000000000..78396b4b2e
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java
@@ -0,0 +1,52 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+import java.sql.Types;
+
+import org.apache.tuscany.das.rdb.test.framework.TestDataWithExplicitColumns;
+
+public class VisitData extends TestDataWithExplicitColumns {
+
+    /*
+     * CREATE TABLE VISIT ( ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, 
+     * CHECK_IN TIMESTAMP NULL, CHECK_OUT TIMESTAMP NULL, OCC_COUNT INTEGER UNSIGNED
+     * NULL, PRIMARY KEY(ID) );
+     */
+
+    // id omitted. id is auto-generated.
+    private static int[] columnTypes = {Types.TIMESTAMP, Types.TIMESTAMP, Types.INTEGER};
+
+    private static Object[][] data = {
+        {getTimestamp("2006-10-20 00:00:00.0"), getTimestamp("2006-10-22 00:00:00.0"), new Integer(1)},
+        {getTimestamp("2006-10-20 00:00:00.0"), getTimestamp("2006-10-22 00:00:00.0"), new Integer(1)},
+        {getTimestamp("2006-10-20 00:00:00.0"), getTimestamp("2006-10-22 00:00:00.0"), new Integer(1)}};
+
+    private static String[] columns = {"CHECK_IN", "CHECK_OUT", "OCC_COUNT"};
+
+    public VisitData(Connection connection) {
+        super(connection, data, columns, columnTypes);
+    }
+
+    public String getTableName() {
+        return "VISIT";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java
new file mode 100644
index 0000000000..370c1d42d7
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java
@@ -0,0 +1,37 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.framework;
+
+import junit.framework.Test;
+
+public class DB2Setup extends DatabaseSetup {
+
+    public DB2Setup(Test test) {
+        super(test);
+    }
+
+    protected void initConnectionProtocol() {
+
+        platformName = "DB2";
+        driverName = "com.ibm.db2.jcc.DB2Driver";
+        databaseURL = "jdbc:db2:DASTEST";
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java
new file mode 100644
index 0000000000..78b1cf19e1
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java
@@ -0,0 +1,147 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.framework;
+
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+
+/**
+ * 
+ */
+public class DasTest extends TestCase {
+
+    protected static Connection connection;
+
+    /**
+     * Tears down the fixture, for example, close a network connection. This method is called after a test is executed.
+     */
+    protected void tearDown() throws Exception {
+        // if (usingDefaultSetup)
+        // connection = null;
+    }
+
+    protected Connection getAutoConnection() throws SQLException {
+
+        Connection c = primGetConnection();
+        c.setAutoCommit(true);
+        return connection;
+
+    }
+
+    protected Connection getConnection() throws SQLException {
+
+        Connection c = primGetConnection();
+        c.setAutoCommit(false);
+        return connection;
+    }
+
+    /**
+     * This provides the default connection for runing single test cases on a chosen platform.
+     */
+    private Connection primGetConnection() {
+        if (connection == null) {
+            defaultSetup();
+        }
+        return connection;
+    }
+
+    /**
+     * This is a bit of a hack since it counts on constructor initialization 
+     * of the DatabaseSet up class and also calls its setUp method directly.
+     * This is a misuse of this JUnit TestSetup subclass .
+     * 
+     * TODO - refactor to avoid this hackiness ... could move this logic to its 
+     * own class that is then invoked by DatabaseSetUp
+     */
+    private void defaultSetup() {
+
+        // DatabaseSetup setUp = new DB2Setup(this);
+        DatabaseSetup setUp = new DerbySetup(this);
+        try {
+            setUp.setUp();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    // Utilities
+    protected InputStream getConfig(String fileName) {
+        return Thread.currentThread().getContextClassLoader().getResourceAsStream(fileName);
+    }
+
+    protected void write(String label, ResultSet rs) throws SQLException {
+
+        ResultSetMetaData md = rs.getMetaData();
+        int count = md.getColumnCount();
+        System.out.println("Contents of ResultSet from " + label);
+        for (int i = 1; i <= count; i++) {
+            System.out.print("\t");
+            System.out.println(md.getColumnLabel(i));
+        }
+        System.out.println("");
+        while (rs.next()) {
+            for (int i = 1; i <= count; i++) {
+                System.out.print("\t");
+                System.out.print(rs.getString(i));
+            }
+            System.out.println("\t");
+        }
+        System.out.println("done");
+    }
+
+    protected void printList(List data) {
+        Iterator i = data.iterator();
+        while (i.hasNext()) {
+            System.out.println();
+            DataObject obj = (DataObject) i.next();
+            Iterator props = obj.getType().getProperties().iterator();
+            while (props.hasNext()) {
+                Property p = (Property) props.next();
+                if (p.isMany()) {
+                    System.out.print("[ " + p.getName() + " ] ");
+                    Iterator children = obj.getList(p).iterator();
+                    while (children.hasNext()) {
+                        DataObject child = (DataObject) children.next();
+                        System.out.print("[ " + child.get("ID") + " ]");
+                    }
+                    System.out.println();
+                } else if (!p.getType().isDataType()) {
+                    DataObject child = obj.getDataObject(p);
+                    if (child != null) {
+                        System.out.println("[ " + p.getName() + " ] " + "[ " + child.get("ID") + " ]");
+                    }
+                } else {
+                    System.out.println("[ " + p.getName() + " ] " + obj.get(p));
+                }
+            }
+        }
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
new file mode 100644
index 0000000000..629013832c
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
@@ -0,0 +1,572 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.framework;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+public class DatabaseSetup extends TestSetup {
+
+    protected Statement s;
+
+    protected String platformName = "Not initialized";
+
+    protected String driverName = "Not initialized";
+
+    protected String databaseURL = "Not initialized";
+
+    protected String userName;
+
+    protected String password;
+
+    // Data Types
+    protected String stringType = "VARCHAR";
+
+    protected String integerType = "INT";
+
+    protected String timestampType = "TIMESTAMP";
+
+    protected String floatType = "FLOAT";
+
+    protected String decimalType = "DECIMAL";
+
+    private Connection connection;
+
+    public DatabaseSetup(Test test) {
+        super(test);
+        initConnectionProtocol();
+        initConnection();
+        DasTest.connection = connection;
+    }
+
+    protected void initConnectionProtocol() {
+        // Subclasses provide implementation
+    }
+
+    private void initConnection() {
+
+        try {
+
+            Class.forName(driverName).newInstance();
+            if (userName != null) {
+                connection = DriverManager.getConnection(databaseURL, userName, password);
+            } else {
+                connection = DriverManager.getConnection(databaseURL);
+            }
+            connection.setAutoCommit(false);
+
+        } catch (SQLException e) {
+
+            if (e.getNextException() != null) {
+                e.getNextException().printStackTrace();
+            } else {
+                e.printStackTrace();
+            }
+
+            throw new RuntimeException(e);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        } catch (InstantiationException e) {
+            throw new RuntimeException(e);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    protected void setUp() throws Exception {
+
+        System.out.println("Setting up for " + platformName + " run");
+
+        s = connection.createStatement();
+
+        try {
+            dropTriggers();
+            dropSequences();
+            dropTables();
+            dropProcedures();
+            dropSchema();//JIRA-952
+
+            createSchema();//JIRA-952
+            createSequences();
+            createTables();
+            createTriggers();
+            createProcedures();
+            connection.commit();
+        } catch (SQLException e) {
+            connection.rollback();
+        }
+
+    }
+
+    protected void tearDown() throws Exception {
+
+        System.out.println("Ending " + platformName + " run");
+        connection.close();
+
+    }
+
+    //JIRA-952
+    private void dropSchema(){
+        String[] statements = {"DROP SCHEMA DASTEST1 RESTRICT",
+        		"DROP SCHEMA DASTEST2 RESTRICT",
+        		"DROP SCHEMA DASTEST3 RESTRICT",
+        };
+        
+        for (int i = 0; i < statements.length; i++) {
+            try {
+                s.execute(statements[i]);
+            } catch (SQLException e) {
+                // If the table does not exist then ignore the exception on drop
+                if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0)) 
+                        && (!(e.getMessage().indexOf("42704") >= 0))) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }        
+    }
+    
+    private void dropTables() {
+
+        String[] statements = {
+            "DROP TABLE CUSTOMER", "DROP TABLE ANORDER", "DROP TABLE ORDERDETAILS", 
+            "DROP TABLE ORDERDETAILSDESC", "DROP TABLE ITEM", "DROP TABLE COMPANY", 
+            "DROP TABLE EMPLOYEE", "DROP TABLE DEPARTMENT", "DROP TABLE BOOK", 
+            "DROP TABLE PART", "DROP TABLE TYPETEST", "DROP TABLE CITIES", 
+            "DROP TABLE STATES", "DROP TABLE conmgt.SERVERSTATUS", 
+            "DROP TABLE DOG", "DROP TABLE OWNER", "DROP TABLE KENNEL", 
+            "DROP TABLE VISIT",
+            "DROP TABLE DASTEST1.CUSTOMER" ,"DROP TABLE DASTEST2.CUSTOMER","DROP TABLE DASTEST3.CUSTOMER",
+            "DROP TABLE DASTEST1.CITY", "DROP TABLE DASTEST2.CITY",
+            "DROP TABLE DASTEST2.ACCOUNT",
+            "DROP TABLE DASTEST3.CUSTORDER",
+            "DROP TABLE DASTEST3.ORDERDETAILSDESC", "DROP TABLE DASTEST1.ORDERDETAILS",
+            "DROP TABLE DASTEST1.EMPLOYEE",
+            "DROP TABLE SINGER",
+            "DROP TABLE SONG",            
+            "DROP TABLE DASTEST1.EMPLOYEE",
+            "DROP TABLE DOCUMENTS_IMAGES", 
+            "DROP TABLE PRODUCT", "DROP TABLE PRODUCTSPEC",
+        };
+
+        for (int i = 0; i < statements.length; i++) {
+            try {
+                s.execute(statements[i]);
+            } catch (SQLException e) {
+                // If the table does not exist then ignore the exception on drop
+                if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0))
+                        && (!(e.getMessage().indexOf("42704") >= 0))) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+    protected void dropTriggers() {
+
+    }
+
+    protected void createTriggers() {
+
+    }
+
+    protected void dropSequences() {
+
+    }
+
+    protected void createSequences() {
+
+    }
+
+    protected void dropProcedures() {
+
+        // System.out.println("Dropping procedures");
+
+        String[] statements = {
+
+            "DROP PROCEDURE GETALLCOMPANIES", "DROP PROCEDURE DELETECUSTOMER", 
+            "DROP PROCEDURE GETNAMEDCOMPANY", "DROP PROCEDURE GETCUSTOMERANDORDERS",
+            "DROP PROCEDURE GETNAMEDCUSTOMERS", "DROP PROCEDURE GETALLCUSTOMERSANDORDERS"
+
+        };
+
+        for (int i = 0; i < statements.length; i++) {
+            try {
+                s.execute(statements[i]);
+            } catch (SQLException e) {
+                // If the proc does not exist then ignore the exception on drop
+                if (!(e.getMessage().indexOf("does not exist") >= 0) && !(e.getMessage().indexOf("42704") >= 0)) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+    //JIRA-952
+    private void createSchema() {
+    	// System.out.println("Creating schema");
+    	try {
+
+            s.execute("CREATE SCHEMA DASTEST1");
+            s.execute("CREATE SCHEMA DASTEST2");
+            s.execute("CREATE SCHEMA DASTEST3");
+    	}catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    private void createTables() {
+
+        // System.out.println("Creating tables");
+
+        try {
+
+            s.execute(getCreateCustomer());
+            s.execute(getCreateAnOrder());
+            s.execute(getCreateOrderDetails());
+            s.execute(getCreateItem());
+            s.execute(getCreateCompany());
+            s.execute(getCreateEmployee());
+            s.execute(getCreateDepartment());
+            s.execute(getCreateBook());
+            s.execute(getCreatePart());
+            s.execute(getCreateTypeTest());
+            s.execute(getCreateStates());
+            s.execute(getCreateCities());
+            s.execute(getCreateServerStatus());
+
+            s.execute(getCreateDog());
+            s.execute(getCreateOwner());
+            s.execute(getCreateKennel());
+            s.execute(getCreateVisit());
+            s.execute(getCreateOrderDetailsDesc());//JIRA-841
+            s.execute(getCreateProduct());//no autogen ids
+            s.execute(getCreateProductSpec());//no autogen ids
+            
+            //JIRA-952 start
+            s.execute(getCreateDASTEST1Customer());
+            s.execute(getCreateDASTEST1Employee());
+            s.execute(getCreateDASTEST2Customer());
+            s.execute(getCreateDASTEST3Customer());
+            s.execute(getCreateDASTEST1City());
+            s.execute(getCreateDASTEST2City());
+            s.execute(getCreateDASTEST2Account());
+            s.execute(getCreateDASTEST3CustOrder());
+            s.execute(getCreateDASTEST1OrderDetails());
+            s.execute(getCreateDASTEST3OrderDetailsDesc());            
+            //JIRA-952 end
+            s.execute(getCreateSinger());
+            s.execute(getCreateSong());            
+            s.execute(getCreateDocumentsImages());
+
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected void createProcedures() {
+
+        // System.out.println("Creating procedures");
+        try {
+
+            s.execute("CREATE PROCEDURE GETALLCOMPANIES() PARAMETER STYLE JAVA LANGUAGE JAVA "
+                            + "READS SQL DATA DYNAMIC RESULT SETS 1 "
+                            + "EXTERNAL NAME " 
+                            + "'org.apache.tuscany.das.rdb.test.framework.JavaStoredProcs.getAllCompanies'");
+            s.execute("CREATE PROCEDURE DELETECUSTOMER(theId int) PARAMETER STYLE JAVA LANGUAGE JAVA " 
+                    + "MODIFIES SQL DATA EXTERNAL NAME " 
+                    + "'org.apache.tuscany.das.rdb.test.framework.JavaStoredProcs.deleteCustomer'");
+            s.execute("CREATE PROCEDURE GETNAMEDCOMPANY(theName VARCHAR(100)) PARAMETER STYLE JAVA LANGUAGE JAVA " 
+                    + "READS SQL DATA DYNAMIC RESULT SETS 1 EXTERNAL NAME " 
+                    + "'org.apache.tuscany.das.rdb.test.framework.JavaStoredProcs.getNamedCompany'");
+            s.execute("CREATE PROCEDURE GETCUSTOMERANDORDERS(theID INTEGER) PARAMETER STYLE JAVA LANGUAGE JAVA " 
+                    + "READS SQL DATA DYNAMIC RESULT SETS 1 EXTERNAL NAME " 
+                    + "'org.apache.tuscany.das.rdb.test.framework.JavaStoredProcs.getCustomerAndOrders'");
+            s.execute("CREATE PROCEDURE GETNAMEDCUSTOMERS(theName VARCHAR(100), OUT theCount INTEGER) " 
+                    + "PARAMETER STYLE JAVA LANGUAGE JAVA READS SQL DATA DYNAMIC RESULT SETS 1 EXTERNAL NAME " 
+                    + "'org.apache.tuscany.das.rdb.test.framework.JavaStoredProcs.getNamedCustomers'");
+            s.execute("CREATE PROCEDURE GETALLCUSTOMERSANDORDERS() PARAMETER STYLE JAVA LANGUAGE JAVA " 
+                    + "READS SQL DATA DYNAMIC RESULT SETS 2 EXTERNAL NAME " 
+                    + "'org.apache.tuscany.das.rdb.test.framework.JavaStoredProcs.getAllCustomersAndAllOrders'");
+            // TODO - "GETNAMEDCUSTOMERS" is failing on DB2 with SQLCODE: 42723. Need to investigate
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    //
+    // This section povides methods that return strings for table creation.
+    // Platform-specific sublcasses
+    // can override these as necessary
+    //
+
+    protected String getCreateCustomer() {
+        return "CREATE TABLE CUSTOMER (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, " 
+            + getStringColumn("LASTNAME", 30)
+                + " DEFAULT 'Garfugengheist', " + getStringColumn("ADDRESS", 30) + ")";
+    }
+
+    protected String getCreateAnOrder() {
+        return "CREATE TABLE ANORDER (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, " 
+            + getStringColumn("PRODUCT", 30) + ", "
+                + getIntegerColumn("QUANTITY") + "," + getIntegerColumn("CUSTOMER_ID") + ")";
+    }
+
+    protected String getCreateOrderDetails() {
+        return "CREATE TABLE ORDERDETAILS (" + getIntegerColumn("ORDERID") + " NOT NULL, " 
+            + getIntegerColumn("PRODUCTID")
+                + " NOT NULL, PRICE FLOAT, PRIMARY KEY (ORDERID, PRODUCTID))";
+    }
+
+    protected String getCreateItem() {
+        return "CREATE TABLE ITEM (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, " 
+            + getStringColumn("NAME", 30) + ")";
+    }
+
+    protected String getCreateCompany() {
+        return "CREATE TABLE COMPANY (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL " 
+            + getGeneratedKeyClause() + " , "
+                + getStringColumn("NAME", 30) + ", " + getIntegerColumn("EOTMID") + ")";
+    }
+
+    protected String getCreateEmployee() {
+        return "CREATE TABLE EMPLOYEE (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL " 
+            + getGeneratedKeyClause() + ","
+                + getStringColumn("NAME", 30) + "," + getStringColumn("SN", 10) + ", MANAGER SMALLINT, " 
+                + getIntegerColumn("DEPARTMENTID") + ")";
+    }
+
+    protected String getCreateDepartment() {
+        return "CREATE TABLE DEPARTMENT (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL " 
+            + getGeneratedKeyClause() + ", "
+                + getStringColumn("NAME", 30) + "," + getStringColumn("LOCATION", 30) + ", " 
+                + getStringColumn("DEPNUMBER", 10) + ","
+                + getIntegerColumn("COMPANYID") + ")";
+    }
+
+    protected String getCreateBook() {
+        return "CREATE TABLE BOOK (" + getIntegerColumn("BOOK_ID") + " PRIMARY KEY NOT NULL, " 
+            + getStringColumn("NAME", 50) + ","
+                + getStringColumn("AUTHOR", 30) + ", " + getIntegerColumn("QUANTITY") + "," 
+                + getIntegerColumn("OCC") + ")";
+    }
+
+    protected String getCreatePart() {
+        return "CREATE TABLE PART (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, NAME VARCHAR(50),  " 
+            + getIntegerColumn("QUANTITY") + ","
+                + getIntegerColumn("PARENT_ID") + " )";
+    }
+
+    protected String getCreateTypeTest() {
+        return "CREATE TABLE TYPETEST (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, " 
+                + getTimestampColumn("ATIMESTAMP") + ","
+                + getDecimalColumn("ADECIMAL", 9, 2) + "," + getFloatColumn("AFLOAT") + ")";
+    }
+
+    protected String getCreateStates() {
+        return "CREATE TABLE STATES (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, " 
+                + getStringColumn("NAME", 2) + ")";
+    }
+
+    protected String getCreateCities() {
+        return "CREATE TABLE CITIES (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL," 
+                + getStringColumn("NAME", 50) + ","
+                + getIntegerColumn("STATE_ID") + "," + getForeignKeyConstraint("STATES", "ID", "STATE_ID") + ")";
+    }
+
+    protected String getCreateServerStatus() {
+
+        return "CREATE TABLE CONMGT.SERVERSTATUS (STATUSID INTEGER PRIMARY KEY NOT NULL " + getGeneratedKeyClause()
+                + "  (START WITH 1 ,INCREMENT BY 1), MANAGEDSERVERID INTEGER NOT NULL, TIMESTAMP TIMESTAMP NOT NULL)";
+
+    }
+
+    protected String getCreateProduct() {
+
+        return "CREATE TABLE PRODUCT (ID INTEGER PRIMARY KEY NOT NULL "
+                + "  , "+getStringColumn("NAME", 50) + ")";    	
+    }
+    
+    protected String getCreateProductSpec() {
+
+        return "CREATE TABLE PRODUCTSPEC (ID INTEGER PRIMARY KEY NOT NULL "
+                +", "+ getIntegerColumn("PRODUCT_ID")   +", "+getStringColumn("NAME", 50) + ")";    	
+    }
+
+    // Dog Kennel Schema
+
+    protected String getCreateDog() {
+        return "CREATE TABLE DOG (" + getIntegerColumn("ID") + " NOT NULL " + getGeneratedKeyClause() + " , " 
+            + getIntegerColumn("OWNER_ID") + " , "
+                + getStringColumn("NAME", 20) + ", " + getStringColumn("BREED", 20) + ", " 
+                + getIntegerColumn("OCC_COUNT") + ", "
+                + "PRIMARY KEY(ID))";
+    }
+
+    protected String getCreateOwner() {
+        return "CREATE TABLE OWNER (" + getIntegerColumn("ID") + " NOT NULL " + getGeneratedKeyClause() + " , " 
+            + getStringColumn("NAME", 20) + ", "
+                + getStringColumn("CONTACT_PHONE", 20) + ", " + getIntegerColumn("OCC_COUNT") + ", " 
+                + "PRIMARY KEY(ID))";
+    }
+
+    protected String getCreateKennel() {
+        return "CREATE TABLE KENNEL (" + getIntegerColumn("ID") + " NOT NULL " + getGeneratedKeyClause() 
+            + " , " + getIntegerColumn("KNUMBER") + ", "
+                + getStringColumn("KIND", 20) + ", " + getIntegerColumn("OCC_COUNT") + ", " + "PRIMARY KEY(ID))";
+    }
+
+    protected String getCreateVisit() {
+        return "CREATE TABLE VISIT (" + getIntegerColumn("ID") + " NOT NULL " + getGeneratedKeyClause() + " , " 
+            + getTimestampColumn("CHECK_IN")
+                + ", " + getTimestampColumn("CHECK_OUT") + ", " + getIntegerColumn("OCC_COUNT") + ", " 
+                + "PRIMARY KEY(ID))";
+    }
+
+    protected String getCreateOrderDetailsDesc() {
+        return "CREATE TABLE ORDERDETAILSDESC ("+ getIntegerColumn("ID") + " NOT NULL, " + getIntegerColumn("ORDERID") + " NOT NULL, " 
+            + getIntegerColumn("PRODUCTID")
+                + " NOT NULL,"+ getStringColumn("DESCR", 20)+", PRIMARY KEY (ID))";
+    } 
+    
+    //JIRA-952 start
+    protected String getCreateDASTEST1Customer() {
+        return "CREATE TABLE DASTEST1.CUSTOMER (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, " 
+            + getStringColumn("LASTNAME", 30)
+                + " DEFAULT 'Garfugengheist', " + getStringColumn("ADDRESS", 30) + ")";
+    }
+
+    protected String getCreateDASTEST1Employee() {
+        return "CREATE TABLE DASTEST1.EMPLOYEE (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, " 
+            + getStringColumn("LASTNAME", 30)
+                + " DEFAULT 'Garfugengheist', " + getStringColumn("ADDRESS", 30) + ")";
+    }
+    
+    protected String getCreateDASTEST2Customer() {
+        return "CREATE TABLE DASTEST2.CUSTOMER (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, " 
+            + getStringColumn("LASTNAME", 30)
+                + " DEFAULT 'Garfugengheist', " + getStringColumn("ADDRESS", 30) + ")";
+    }
+    
+    protected String getCreateDASTEST3Customer() {
+        return "CREATE TABLE DASTEST3.CUSTOMER (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, " 
+            + getStringColumn("LASTNAME", 30)
+                + " DEFAULT 'Garfugengheist', " + getStringColumn("ADDRESS", 30) + ")";
+    }
+    
+    protected String getCreateDASTEST1City() {
+        return "CREATE TABLE DASTEST1.CITY (" + getIntegerColumn("INDX") + " PRIMARY KEY NOT NULL," 
+                + getStringColumn("NAME", 50)  + ")";
+    }
+
+    protected String getCreateDASTEST2City() {
+        return "CREATE TABLE DASTEST2.CITY (" + getIntegerColumn("INDX") + " PRIMARY KEY NOT NULL," 
+                + getStringColumn("NAME", 50)  + ")";
+    }    
+    
+    protected String getCreateDASTEST2Account() {
+    	return "CREATE TABLE DASTEST2.ACCOUNT ("+ getIntegerColumn("ACCOUNT_ID") + " PRIMARY KEY NOT NULL," +
+    	getIntegerColumn("CUSTOMER_ID") +", "+ getIntegerColumn("BALANCE") + ")";
+    }
+    
+    protected String getCreateDASTEST3CustOrder() {
+    	return "CREATE TABLE DASTEST3.CUSTORDER ("+ getIntegerColumn("ORDER_ID") + " PRIMARY KEY NOT NULL," +
+    	getIntegerColumn("CUSTOMER_ID") +", "+getIntegerColumn("ORDER_COUNT")+ ")";
+    }    
+
+    protected String getCreateDASTEST1OrderDetails() {
+        return "CREATE TABLE DASTEST1.ORDERDETAILS (" + getIntegerColumn("ORDERID") + " NOT NULL, " 
+            + getIntegerColumn("PRODUCTID")
+                + " NOT NULL, PRICE FLOAT, PRIMARY KEY (ORDERID, PRODUCTID))";
+    }
+    
+    protected String getCreateDASTEST3OrderDetailsDesc() {
+        return "CREATE TABLE DASTEST3.ORDERDETAILSDESC ("+ getIntegerColumn("ID") + " NOT NULL, " + getIntegerColumn("ORDERID") + " NOT NULL, " 
+            + getIntegerColumn("PRODUCTID")
+                + " NOT NULL,"+ getStringColumn("DESCR", 20)+", PRIMARY KEY (ID))";
+    }
+    //JIRA-952 end
+    // //////////////
+
+    protected String getCreateSinger() {
+    	return "CREATE TABLE SINGER ("+ getIntegerColumn("ID") + " NOT NULL, " +
+    		getStringColumn("NAME", 20) +" )";
+    }
+    
+    protected String getCreateSong() {
+    	return "CREATE TABLE SONG ("+ getIntegerColumn("ID") + " , " +//" NOT NULL, " +
+    		getStringColumn("TITLE", 20) + ", "+
+    		getIntegerColumn("SINGERID") + " )";
+    }
+    
+
+    protected String getCreateDocumentsImages() {
+    	return "CREATE TABLE DOCUMENTS_IMAGES (ID INT, TEXT CLOB(64K),PIC BLOB(16M))";
+    }
+    
+
+
+
+
+
+
+
+
+    protected String getForeignKeyConstraint(String pkTable, String pkColumn, String foreignKey) {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("CONSTRAINT FK1 FOREIGN KEY (");
+        buffer.append(foreignKey);
+        buffer.append(") REFERENCES ");
+        buffer.append(pkTable);
+        buffer.append("(");
+        buffer.append(pkColumn);
+        buffer.append(") ON DELETE NO ACTION ON UPDATE NO ACTION");
+        return buffer.toString();
+    }
+
+    protected String getStringColumn(String name, int length) {
+        return name + ' ' + stringType + "(" + new Integer(length).toString() + ")";
+    }
+
+    protected String getIntegerColumn(String name) {
+        return name + ' ' + integerType;
+    }
+
+    protected String getGeneratedKeyClause() {
+        return "GENERATED ALWAYS AS IDENTITY";
+    }
+
+    protected String getDecimalColumn(String name, int size1, int size2) {
+        return name + ' ' + decimalType + "(" + new Integer(size1).toString() + ',' 
+            + new Integer(size2).toString() + ")";
+    }
+
+    protected String getFloatColumn(String name) {
+        return name + ' ' + floatType;
+    }
+
+    protected String getTimestampColumn(String name) {
+        return name + ' ' + timestampType;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java
new file mode 100644
index 0000000000..300f315465
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java
@@ -0,0 +1,44 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.framework;
+
+import java.util.Properties;
+
+import junit.framework.Test;
+
+public class DerbySetup extends DatabaseSetup {
+
+    public DerbySetup(Test test) {
+        super(test);
+    }
+
+    protected void initConnectionProtocol() {
+
+        // Set the derby property to explicitly specify the database location relative
+        // from current directory to "target"
+        Properties p = System.getProperties();
+        p.put("derby.system.home", "target");
+
+        platformName = "Derby";
+        driverName = "org.apache.derby.jdbc.EmbeddedDriver";
+        databaseURL = "jdbc:derby:dastest; create = true";
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java
new file mode 100644
index 0000000000..71a7d1c4e4
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java
@@ -0,0 +1,97 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.framework;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * Stored Procedures for DB2 and Derby SP tests
+ * 
+ */
+public final class JavaStoredProcs {
+
+    private JavaStoredProcs() {
+
+    }
+
+    public static void getAllCustomersAndAllOrders(ResultSet[] result1, ResultSet[] result2) throws SQLException {
+        Connection conn = DriverManager.getConnection("jdbc:default:connection");
+        PreparedStatement ps = conn.prepareStatement("SELECT * FROM CUSTOMER");
+
+        result1[0] = ps.executeQuery();
+
+        PreparedStatement ps2 = conn.prepareStatement("select * from anorder");
+        result2[0] = ps2.executeQuery();
+
+    }
+
+    public static void getAllCompanies(ResultSet[] results) throws SQLException {
+
+        Connection conn = DriverManager.getConnection("jdbc:default:connection");
+        PreparedStatement ps = conn.prepareStatement("SELECT * FROM COMPANY");
+        results[0] = ps.executeQuery();
+    }
+
+    public static void deleteCustomer(int theId) throws SQLException {
+
+        Connection conn = DriverManager.getConnection("jdbc:default:connection");
+        PreparedStatement ps = conn.prepareStatement("DELETE FROM CUSTOMER WHERE ID = ?");
+        ps.setInt(1, theId);
+        ps.execute();
+
+    }
+
+    public static void getNamedCompany(String theName, ResultSet[] results) throws SQLException {
+
+        Connection conn = DriverManager.getConnection("jdbc:default:connection");
+        PreparedStatement ps = conn.prepareStatement("SELECT * FROM COMPANY WHERE NAME = ?");
+        ps.setString(1, theName);
+        results[0] = ps.executeQuery();
+    }
+
+    public static void getCustomerAndOrders(int theId, ResultSet[] results) throws SQLException {
+
+        Connection conn = DriverManager.getConnection("jdbc:default:connection");
+        PreparedStatement ps = conn
+                .prepareStatement("SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID " 
+                        + "WHERE CUSTOMER.ID = ?");
+        ps.setInt(1, theId);
+        results[0] = ps.executeQuery();
+    }
+
+    public static void getNamedCustomers(String theName, int[] outCount, ResultSet[] results) throws SQLException {
+
+        Connection conn = DriverManager.getConnection("jdbc:default:connection");
+        PreparedStatement ps = conn.prepareStatement("SELECT * FROM CUSTOMER WHERE LASTNAME = ?");
+        ps.setString(1, theName);
+        results[0] = ps.executeQuery();
+
+        ps = conn.prepareStatement("SELECT COUNT(*) FROM CUSTOMER WHERE LASTNAME = ?");
+        ps.setString(1, theName);
+
+        ResultSet rs = ps.executeQuery();
+        rs.next();
+        outCount[0] = rs.getInt(1);
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
new file mode 100644
index 0000000000..580f1c5f25
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
@@ -0,0 +1,105 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.framework;
+
+import java.sql.SQLException;
+
+import junit.framework.Test;
+
+public class MySQLSetup extends DatabaseSetup {
+
+    public MySQLSetup(Test test) {
+        super(test);
+    }
+
+    protected void initConnectionProtocol() {
+
+        platformName = "MySQL";
+        driverName = "com.mysql.jdbc.Driver";
+        databaseURL = "jdbc:mysql:///dastest?user=dastester&password=dastester";
+
+    }
+
+    protected void createProcedures() {
+
+        String createGetAllCompanies = "CREATE PROCEDURE `dastest`.`GETALLCOMPANIES` () " 
+            + "    SELECT * FROM COMPANY ";
+
+        String createDeleteCustomer = "CREATE PROCEDURE `dastest`.`DELETECUSTOMER` (theId INT) " 
+            + "  DELETE FROM CUSTOMER WHERE ID = theId ";
+
+        String createGetNamedCustomers = "CREATE PROCEDURE `dastest`.`GETNAMEDCUSTOMERS`(IN thename VARCHAR(30), "
+                + "OUT theCount INTEGER ) " + " BEGIN "
+                + "  SELECT * FROM CUSTOMER AS CUSTOMER WHERE LASTNAME = theName; "
+                + "  SET theCount =  (SELECT COUNT(*) FROM CUSTOMER WHERE LASTNAME = theName); " + " END ";
+
+        String createGetCustomerAndOrders = " CREATE PROCEDURE `dastest`.`GETCUSTOMERANDORDERS` (theId INT) "
+                + " SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID "
+                        + "WHERE CUSTOMER.ID =  theId ";
+
+        String createGetNamedCompany = " CREATE PROCEDURE `dastest`.`GETNAMEDCOMPANY` (theName VARCHAR(100)) "
+                + " SELECT * FROM COMPANY WHERE NAME = theName";
+
+        String createCustomersAndOrders = "CREATE PROCEDURE `dastest`.`GETALLCUSTOMERSANDORDERS` () " 
+                + " BEGIN SELECT * FROM CUSTOMER; SELECT * FROM ANORDER; END;";
+        
+        System.out.println("Creating procedures");
+        try {
+
+            s.execute(createGetAllCompanies);
+            s.execute(createDeleteCustomer);
+            s.execute(createGetNamedCompany);
+            s.execute(createGetCustomerAndOrders);
+            s.execute(createGetNamedCustomers);
+            s.execute(createCustomersAndOrders);
+
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    // Overrides for table creation
+    protected String getCreateCompany() {
+        return "CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, NAME VARCHAR(30), EOTMID INT)";
+    }
+
+    protected String getCreateEmployee() {
+        return "CREATE TABLE EMPLOYEE (ID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, NAME VARCHAR(30), " 
+                + "SN VARCHAR(10), MANAGER SMALLINT, DEPARTMENTID INT)";
+    }
+
+//    protected String getCreateDepartment() {
+//        return "CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, NAME VARCHAR(30), " 
+//                + "LOCATION VARCHAR(30), DEPNUMBER VARCHAR(10), COMPANYID INT, EOTM INT)";
+//    }
+
+    protected String getCreateTypeTest() {
+        return "CREATE TABLE TYPETEST (ID INT PRIMARY KEY NOT NULL, ATIMESTAMP DATETIME, ADECIMAL DECIMAL(9,2), " 
+                + "AFLOAT FLOAT)";
+    }
+
+    protected String getCreateServerStatus() {
+        return "CREATE TABLE CONMGT.SERVERSTATUS (STATUSID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, " 
+                + "MANAGEDSERVERID INTEGER NOT NULL, TIMESTAMP TIMESTAMP NOT NULL)";
+    }
+    protected String getGeneratedKeyClause() {
+        return "AUTO_INCREMENT";
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java
new file mode 100644
index 0000000000..094fe13456
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java
@@ -0,0 +1,80 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.framework;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public abstract class RelationshipData {
+    protected Object[][] data;
+    
+    protected Connection connection;
+    
+    private int currentRow = -1;
+
+    public RelationshipData(Connection c, Object[][] inputData) {
+        this.connection = c;
+        this.data = inputData;
+    }
+
+    public int size() {
+        return data[0].length;
+    }
+
+    public int numberOfRows() {
+        return data.length;
+    }
+
+    public boolean next() {
+        ++currentRow;
+        return currentRow < numberOfRows();
+    }
+
+    public void refresh() throws SQLException {
+        updateRelationships();
+    }
+
+    protected abstract String getParentRetrievalStatement();
+
+    protected abstract String getChildUpdateStatement();
+
+    protected void updateRelationships() throws SQLException {
+        // { MegaCorp, Advanced Technologies }
+        // select company.id from company where company.name = ?
+        PreparedStatement retrieveParent = connection.prepareStatement(getParentRetrievalStatement());
+        // update department set department.companyid = ? where department.name = ?
+        PreparedStatement updateChild = connection.prepareStatement(getChildUpdateStatement());
+
+        while (next()) {
+            retrieveParent.setObject(1, data[currentRow][0]);
+            retrieveParent.execute();
+            ResultSet rs = retrieveParent.getResultSet();
+            rs.next();
+            Object parentID = rs.getObject(1);
+            retrieveParent.clearParameters();
+
+            updateChild.setObject(1, parentID);
+            updateChild.setObject(2, data[currentRow][1]);
+            updateChild.execute();
+            updateChild.clearParameters();
+        }
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
new file mode 100644
index 0000000000..4b91cde06b
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
@@ -0,0 +1,126 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.framework;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public abstract class TestData {
+
+    protected static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd hh:ss:mm.SSS");
+
+    protected static final Timestamp TIMESTAMP = getTimestamp();
+    
+    protected Object[][] data;
+
+    protected Connection connection;
+
+    private int currentRow = -1;
+ 
+
+    public TestData(Connection c, Object[][] customerData) {
+        this.connection = c;
+        this.data = customerData;
+    }
+
+    public int size() {
+        return data[0].length;
+    }
+
+    public int numberOfRows() {
+        return data.length;
+    }
+
+    public boolean next() {
+        ++currentRow;
+        return currentRow < numberOfRows();
+    }
+
+    public abstract String getTableName();
+
+    public Object getObject(int i) {
+        return data[currentRow][i - 1];
+    }
+
+    public void refresh() throws SQLException {
+        deleteRowsFromTable();
+        insertRows();
+    }
+
+    protected void deleteRowsFromTable() throws SQLException {
+        PreparedStatement ps = connection.prepareStatement("delete from " + getTableName());
+        ps.execute();
+        ps.close();
+    }
+
+    protected void insertRows() throws SQLException {
+        StringBuffer sql = new StringBuffer();
+        sql.append("insert into ");
+        sql.append(getTableName());
+        sql.append(" values (");
+        for (int i = 1; i < size(); i++) {
+            sql.append("?,");
+        }
+        sql.append("?)");
+        PreparedStatement ps = connection.prepareStatement(sql.toString());
+
+        while (next()) {
+            for (int i = 1; i <= size(); i++) {
+                ps.setObject(i, getObject(i));
+            }
+            ps.execute();
+            ps.clearParameters();
+        }
+        ps.close();
+    }
+
+    // Utilities
+    protected static Date getDate() {
+
+        try {
+            return DATE_FORMAT.parse("1966-12-20 00:00:00.0");
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected static Date getDate(String timeStamp) {
+
+        try {
+            return DATE_FORMAT.parse(timeStamp);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static Timestamp getTimestamp() {
+        return new Timestamp(getDate().getTime());
+    }
+
+    public static Timestamp getTimestamp(String timeStamp) {
+        return new Timestamp(getDate(timeStamp).getTime());
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
new file mode 100644
index 0000000000..5a329d0b74
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.test.framework;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+import org.apache.log4j.Logger;
+
+public abstract class TestDataWithExplicitColumns extends TestData {
+
+    private String[] columns;
+
+    private int[] sqlTypes;
+    
+    private final Logger logger = Logger.getLogger(TestDataWithExplicitColumns.class);
+
+    public TestDataWithExplicitColumns(Connection c, Object[][] data, String[] columns, int[] sqlTypes) {
+        super(c, data);
+        this.columns = columns;
+        this.sqlTypes = sqlTypes;
+    }
+
+    private String getColumn(int i) {
+        return columns[i - 1];
+    }
+
+    private int getSqlType(int i) {
+        return sqlTypes[i - 1];
+    }
+
+    // Create an insert statement of the following form ...
+    // "INSERT INTO table_name (column1, column2,...) VALUES (value1, value2,....)"
+    // This is necessary for tables with a generated column since the PK value is not provided
+    protected void insertRows() throws SQLException {
+        StringBuffer sql = new StringBuffer();
+        sql.append("insert into ");
+        sql.append(getTableName());
+
+        sql.append(" (");
+        for (int i = 1; i <= size(); i++) {
+            sql.append(getColumn(i));
+            if (i < size()) {
+                sql.append(',');
+            }
+        }
+        sql.append(" )");
+
+        sql.append(" values (");
+        for (int i = 1; i < size(); i++) {
+            sql.append("?,");
+        }
+        sql.append("?)");
+
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(sql.toString());
+        }
+
+        PreparedStatement ps = connection.prepareStatement(sql.toString());
+
+        while (next()) {
+            for (int i = 1; i <= size(); i++) {
+                ps.setObject(i, getObject(i), getSqlType(i));
+            }
+            ps.execute();
+            ps.clearParameters();
+        }
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
new file mode 100644
index 0000000000..282aeaeb36
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
@@ -0,0 +1,43 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.mappings;
+
+import org.apache.tuscany.das.rdb.Converter;
+
+public class IntegerToBooleanConverter implements Converter {
+
+    public IntegerToBooleanConverter() {
+        super();
+    }
+
+    public Object getPropertyValue(Object columnData) {
+        Integer value = (Integer) columnData;
+        return value.intValue() == 0 ? Boolean.FALSE : Boolean.TRUE;
+    }
+
+    public Object getColumnValue(Object propertyData) {
+        Boolean value = (Boolean) propertyData;
+        if (value.booleanValue()) {
+            return new Integer(1);
+        } 
+        return new Integer(0);
+    }
+    
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java
new file mode 100644
index 0000000000..df9d2978eb
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java
@@ -0,0 +1,77 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.mappings;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.tuscany.das.rdb.Converter;
+
+public class SillyDateStringConverter implements Converter {
+
+    private static DateFormat myformat = new SimpleDateFormat("yyyy.MM.dd");
+
+    private static Date kbday;
+
+    private static Date tbday;
+
+    public SillyDateStringConverter() {
+        super();
+    }
+
+    static {
+        try {
+            kbday = myformat.parse("1957.09.27");
+            tbday = myformat.parse("1966.12.20");
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public Object getPropertyValue(Object columnData) {
+
+        if (columnData.equals("Williams")) {
+            return kbday;
+        }
+
+        if (columnData.equals("Pavick")) {
+            return tbday;
+        }
+
+        throw new IllegalArgumentException();
+
+    }
+
+    public Object getColumnValue(Object propertyData) {
+
+        if (propertyData.equals(kbday)) {
+            return "Williams";
+        }
+
+        if (propertyData.equals(tbday)) {
+            return "Pavick";
+        }
+
+        throw new IllegalArgumentException();
+
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringObfuscationConverter.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringObfuscationConverter.java
new file mode 100644
index 0000000000..efea61c7de
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringObfuscationConverter.java
@@ -0,0 +1,65 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.mappings;
+
+import java.io.UnsupportedEncodingException;
+
+import org.apache.tuscany.das.rdb.Converter;
+
+public class StringObfuscationConverter implements Converter {
+
+    public StringObfuscationConverter() {
+        super();
+    }
+
+    public Object getPropertyValue(Object columnData) {
+        return toRot13((String) columnData);
+    }
+
+    public Object getColumnValue(Object propertyData) {
+        return toRot13((String) propertyData);
+    }
+
+    // Utilities
+
+    // A simple, reversible, obfuscation algorithm using a ROT13 implementation
+    private String toRot13(String original) {
+
+        int abyte = 0;
+        byte[] buffer = {};
+        try {
+            buffer = original.getBytes("ISO-8859-1");
+        } catch (UnsupportedEncodingException e) {
+            throw new Error(e);
+        }
+
+        for (int i = 0; i < buffer.length; i++) {
+            abyte = buffer[i];
+            int cap = abyte & 32;
+            abyte &= ~cap;
+            abyte = ((abyte >= 'A') && (abyte <= 'Z') ? ((abyte - 'A' + 13) % 26 + 'A') : abyte) | cap;
+            buffer[i] = (byte) abyte;
+        }
+        try {
+            return new String(buffer, "ISO-8859-1");
+        } catch (UnsupportedEncodingException e) {
+            throw new Error(e);
+        }
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java
new file mode 100644
index 0000000000..2be6522fcc
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java
@@ -0,0 +1,39 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.mappings;
+
+import org.apache.tuscany.das.rdb.Converter;
+
+public class StringToIntegerConverter implements Converter {
+
+    public StringToIntegerConverter() {
+        super();
+    }
+
+    public Object getPropertyValue(Object columnData) {
+        // System.out.println("Converting object.. " + columnData);
+
+        return new Integer(columnData.toString());
+    }
+
+    public Object getColumnValue(Object columnData) {
+        return columnData.toString();
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java
new file mode 100644
index 0000000000..a15cef37e6
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java
@@ -0,0 +1,37 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.mappings;
+
+import org.apache.tuscany.das.rdb.Converter;
+
+public class StringToLongConverter implements Converter {
+
+    public StringToLongConverter() {
+        super();
+    }
+
+    public Object getPropertyValue(Object columnData) {
+        return new Long(columnData.toString());
+    }
+
+    public Object getColumnValue(Object columnData) {
+        return columnData.toString();
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
new file mode 100644
index 0000000000..1dbf8ea5a2
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
@@ -0,0 +1,127 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.das.rdb.test.suites;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.tuscany.das.rdb.test.AliasTests;
+import org.apache.tuscany.das.rdb.test.BestPracticeTests;
+import org.apache.tuscany.das.rdb.test.CUDGeneration;
+import org.apache.tuscany.das.rdb.test.CommandGroupTests;
+import org.apache.tuscany.das.rdb.test.CompanyTests;
+import org.apache.tuscany.das.rdb.test.CompoundKeyRelationshipTests;
+import org.apache.tuscany.das.rdb.test.CompoundKeyTests;
+import org.apache.tuscany.das.rdb.test.ConnectionTests;
+import org.apache.tuscany.das.rdb.test.ConverterTests;
+import org.apache.tuscany.das.rdb.test.CorrectedDefectTests;
+import org.apache.tuscany.das.rdb.test.CrudWithChangeHistory;
+import org.apache.tuscany.das.rdb.test.DynamicResultDescriptorTests;
+import org.apache.tuscany.das.rdb.test.ExceptionTests;
+import org.apache.tuscany.das.rdb.test.GeneratedCommandTests;
+import org.apache.tuscany.das.rdb.test.GeneratedId;
+import org.apache.tuscany.das.rdb.test.GraphMergeTests;
+import org.apache.tuscany.das.rdb.test.ImpliedRelationshipTests;
+import org.apache.tuscany.das.rdb.test.KennelTests;
+import org.apache.tuscany.das.rdb.test.LOBTests;
+import org.apache.tuscany.das.rdb.test.MissingPKTests;
+import org.apache.tuscany.das.rdb.test.MultiSchemaTests;
+import org.apache.tuscany.das.rdb.test.NamedParameterTests;
+import org.apache.tuscany.das.rdb.test.OCCTests;
+import org.apache.tuscany.das.rdb.test.OneToOneRelationshipTests;
+import org.apache.tuscany.das.rdb.test.OperationOrderingTests;
+import org.apache.tuscany.das.rdb.test.Paging;
+import org.apache.tuscany.das.rdb.test.PartialUpdateTests;
+import org.apache.tuscany.das.rdb.test.PassiveConnectionTests;
+import org.apache.tuscany.das.rdb.test.ProgrammaticConfigTests;
+import org.apache.tuscany.das.rdb.test.RecursiveTests;
+import org.apache.tuscany.das.rdb.test.RelationshipTests;
+import org.apache.tuscany.das.rdb.test.ResultSetShapeTests;
+import org.apache.tuscany.das.rdb.test.SerializationTests;
+import org.apache.tuscany.das.rdb.test.SimplestCrud;
+import org.apache.tuscany.das.rdb.test.StoredProcs;
+import org.apache.tuscany.das.rdb.test.TopDown;
+import org.apache.tuscany.das.rdb.test.TransactionTests;
+import org.apache.tuscany.das.rdb.test.TypeTests;
+import org.apache.tuscany.das.rdb.test.typed.SimplestStaticCrud;
+
+public final class AllCommonTests {
+
+    private AllCommonTests() {
+    }
+
+    public static Test suite() {
+        TestSuite suite = new TestSuite("All platform-common DAS tests");
+        // $JUnit-BEGIN$
+
+        suite.addTest(new TestSuite(SimplestCrud.class));
+        suite.addTest(new TestSuite(CrudWithChangeHistory.class));
+        suite.addTest(new TestSuite(SimplestStaticCrud.class));
+        suite.addTest(new TestSuite(Paging.class));
+        suite.addTest(new TestSuite(GeneratedId.class));
+
+        suite.addTest(new TestSuite(StoredProcs.class));
+        suite.addTest(new TestSuite(CUDGeneration.class));
+        suite.addTest(new TestSuite(TopDown.class));
+        suite.addTest(new TestSuite(OCCTests.class));
+        suite.addTest(new TestSuite(RecursiveTests.class));
+
+        suite.addTest(new TestSuite(GraphMergeTests.class));
+        suite.addTest(new TestSuite(CompoundKeyTests.class));
+        suite.addTest(new TestSuite(CompoundKeyRelationshipTests.class));
+        suite.addTest(new TestSuite(RelationshipTests.class));
+        suite.addTest(new TestSuite(GeneratedCommandTests.class));
+
+        suite.addTest(new TestSuite(CompanyTests.class));
+        suite.addTest(new TestSuite(ResultSetShapeTests.class));
+        suite.addTest(new TestSuite(TypeTests.class));
+        suite.addTest(new TestSuite(OperationOrderingTests.class));
+        suite.addTest(new TestSuite(ConverterTests.class));
+
+        suite.addTest(new TestSuite(PartialUpdateTests.class));
+        suite.addTest(new TestSuite(ExceptionTests.class));
+        suite.addTest(new TestSuite(PassiveConnectionTests.class));
+        suite.addTest(new TestSuite(SerializationTests.class));
+
+        suite.addTest(new TestSuite(CommandGroupTests.class));
+        suite.addTest(new TestSuite(BestPracticeTests.class));
+        suite.addTest(new TestSuite(CorrectedDefectTests.class));
+        suite.addTest(new TestSuite(OneToOneRelationshipTests.class));
+
+        suite.addTest(new TestSuite(ProgrammaticConfigTests.class));
+        suite.addTest(new TestSuite(AliasTests.class));
+
+        suite.addTest(new TestSuite(ImpliedRelationshipTests.class));
+
+        suite.addTest(new TestSuite(KennelTests.class));
+
+        suite.addTest(new TestSuite(TransactionTests.class));
+        suite.addTest(new TestSuite(MultiSchemaTests.class));
+        suite.addTest(new TestSuite(MissingPKTests.class));
+
+
+        suite.addTest(new TestSuite(DynamicResultDescriptorTests.class));
+        suite.addTest(new TestSuite(LOBTests.class));
+        suite.addTest(new TestSuite(NamedParameterTests.class));
+        suite.addTest(new TestSuite(ConnectionTests.class));
+        //$JUnit-END$
+        return suite;
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java
new file mode 100644
index 0000000000..ea8a2ddbaf
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java
@@ -0,0 +1,44 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.suites;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.tuscany.das.rdb.test.ReadDBSchemaTests;
+import org.apache.tuscany.das.rdb.test.framework.DB2Setup;
+
+public final class AllTestsDB2 {
+
+    private AllTestsDB2() {
+        
+    }
+    
+    public static Test suite() {
+
+        TestSuite suite = new TestSuite();
+        suite.addTest(AllCommonTests.suite());
+        suite.addTest(new TestSuite(ReadDBSchemaTests.class));
+
+        TestSuite suite2 = new TestSuite("All DAS tests on DB2");
+        suite2.addTest(new DB2Setup(suite));
+        return suite2;
+
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java
new file mode 100644
index 0000000000..0649fa815c
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java
@@ -0,0 +1,35 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.suites;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.tuscany.das.rdb.test.framework.DerbySetup;
+
+public class AllTestsDerby extends TestSuite {
+
+    public static Test suite() {
+
+        TestSuite suite = new TestSuite("All DAS tests on Derby");
+        suite.addTest(new DerbySetup(AllCommonTests.suite()));
+        return suite;
+
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java
new file mode 100644
index 0000000000..e68aaad8aa
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java
@@ -0,0 +1,39 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.suites;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.tuscany.das.rdb.test.framework.MySQLSetup;
+
+public final class AllTestsMySQL {
+
+    private AllTestsMySQL() {
+        
+    }
+    
+    public static Test suite() {
+
+        TestSuite suite = new TestSuite("All DAS tests on MySQL");
+        suite.addTest(new MySQLSetup(AllCommonTests.suite()));
+        return suite;
+
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
new file mode 100644
index 0000000000..c8ebc868da
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
@@ -0,0 +1,58 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test.typed;
+
+import java.io.InputStream;
+import java.util.Collection;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
+import org.apache.tuscany.das.rdb.test.data.CustomerData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
+
+/**
+ */
+public class SimplestStaticCrud extends DasTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        new CustomerData(getAutoConnection()).refresh();
+    }
+
+    public void testRead() throws Exception {
+        InputStream mapping = getClass().getClassLoader().getResourceAsStream("basicStaticCustomer.xml");
+        DAS das = DAS.FACTORY.createDAS(mapping, getConnection());
+        HelperContext context = HelperProvider.getDefaultContext();
+        CustomerFactory.INSTANCE.register(context);
+
+        Command select = das.createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where LASTNAME = ?");
+        select.setParameter(1, "Williams");
+
+        DataObject root = select.executeQuery();
+
+        Collection customers = root.getList("Customer");
+        assertEquals(4, customers.size());
+    }
+
+}
diff --git a/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/util/PrintPropertiesOfDataObject.java b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/util/PrintPropertiesOfDataObject.java
new file mode 100644
index 0000000000..897e8d39b3
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/java/org/apache/tuscany/das/rdb/test/util/PrintPropertiesOfDataObject.java
@@ -0,0 +1,134 @@
+/**
+ *
+ *  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.
+ */
+
+package org.apache.tuscany.das.rdb.test.util;
+
+import java.util.List;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+import commonj.sdo.Type;
+
+/**
+ * Demonstrates iterating through, and inspecting properites of a DataObject. This
+ * sample shows listing properties of a DataObject, determining if the properties are
+ * set and whether they are simple properties or represent DataObjects <br>
+ * <br>
+ * This sample is from the <a href="http://incubator.apache.org/tuscany"
+ * target="_blank"> Apache Tuscany</a> project. It was written to help users
+ * understand and experiment with SDO. It is based upon code snippets contained
+ * within, and is meant for use with, and reference to the <a
+ * href=http://osoa.org/download/attachments/36/Java-SDO-Spec-v2.1.0-FINAL.pdf?version=1"
+ * target="_bank">SDO Specification</a>. This specific examples was based upon code
+ * snippets in the section titled 'Property Indexes'. <br>
+ * <b>Usage:</b> <br>
+ * This sample can easily be run from within Eclipse as a Java Application if Tuscany or 
+ * the sample-sdo project is imported into Eclipse as an existing project.
+ * <br><br>
+ * If executing as a standalone application please do the following: 
+ * <br>
+ * <UL>
+ * <LI>Include the following jar files on your classpath :
+ * <UL>
+ * <LI>SDO API and Tuscany Implementation
+ * <UL>
+ * <LI>sdo-api-{version}.jar - SDO API
+ * <LI>tuscany-sdo-impl-{version}.jar - Tuscany SDO implementation
+ * </UL>
+ * </LI>
+ * <LI>EMF dependencies. 
+ * <UL>
+ * <LI>emf-common-{version}.jar - some common framework utility and base classes
+ * <LI>emf-ecore-{version}.jar - the EMF core runtime implementation classes (the Ecore metamodel)
+ * <LI>emf-ecore-change-{version}.jar - the EMF change recorder and framework
+ * <LI>emf-ecore-xmi-{version}.jar - EMF's default XML (and XMI) serializer and loader
+ * <LI>xsd-{version}.jar - the XML Schema model
+ * </UL>
+ * </LI>
+ * </UL>
+ * 
+ * These jar files can be obtained by downloading and unpacking a <a href="http://cwiki.apache.org/TUSCANY/sdo-downloads.html" target="_blank">Tuscany binary distribution</a>  </LI>
+ * <LI>Execute: <br>
+ * java org.apache.tuscany.samples.sdo.specCodeSnippets.PrintPropertiesOfDataObject</LI>
+ * </UL>
+ */
+
+public class PrintPropertiesOfDataObject {
+
+    /**
+     * Calls recursive method to inspect and print properties of a DataObject.
+     * 
+     * @param DataObject.
+     *            The DataObject to print the properties of
+     */
+    public static void printDataObjectProperties(DataObject myDo) throws Exception {
+        System.out.println("Recursivly inspecting and printing properties of DataObject");
+        printAndInspectDataObject("   ", myDo);
+    }
+
+    /**
+     * Recursivly inspects and prints DataObject. This method will list all set
+     * properties
+     * 
+     * @param buffer.
+     *            Blank string to help with formating
+     * @param myDo.
+     *            DataObject to recursivly inspect and print the properties of.
+     * @throws Exception
+     */
+    private static void printAndInspectDataObject(String buffer, DataObject dataObject) throws Exception {
+        for (int i = 0; i < dataObject.getInstanceProperties().size(); i++) {
+            Property p = (Property) dataObject.getInstanceProperties().get(i);
+            // just print out the name, type and string value of the property
+            Type type = p.getType();
+            System.out.print(buffer + "  " + p.getName() + ",type=" + type.getName());
+            if (dataObject.isSet(p)) {
+                // see if this represents a simple property or if the type is also a
+                // datatype
+                if (type.isDataType()) {
+                    System.out.println(", simple type :  " + dataObject.get(i));
+                } else {
+
+                    // check to see if the property has many values
+                    if (p.isMany()) {
+                        System.out.println(buffer + ", many valued with list of DataObjects : ");
+                        List dataObjects = dataObject.getList(p);
+                        for (int x = 0; x < dataObjects.size(); x++) {
+                            if (p.isContainment()) {
+                                printAndInspectDataObject(buffer + "    ", (DataObject) dataObjects.get(x));
+                                System.out.println();
+                            }
+                        }
+
+                    } else {
+
+                        System.out.println(buffer + ", data object : ");
+                        DataObject newDataObject = dataObject.getDataObject(p);
+                        printAndInspectDataObject(buffer + "    ", newDataObject);
+                        System.out.println("");
+                    }
+                }
+            } else {
+                System.out.println(buffer + ", is not set");
+            }
+        }
+
+    }
+}
diff --git a/das-java/trunk/rdb/src/test/resources/1xM_mapping_no_cud.xml b/das-java/trunk/rdb/src/test/resources/1xM_mapping_no_cud.xml
new file mode 100644
index 0000000000..95267de08b
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/1xM_mapping_no_cud.xml
@@ -0,0 +1,36 @@
+<?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/das-java/trunk/rdb/src/test/resources/BooksConfig.xml b/das-java/trunk/rdb/src/test/resources/BooksConfig.xml
new file mode 100644
index 0000000000..2da86cbdb2
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/BooksConfig.xml
@@ -0,0 +1,30 @@
+<?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/das-java/trunk/rdb/src/test/resources/BooksConfigWithAlias.xml b/das-java/trunk/rdb/src/test/resources/BooksConfigWithAlias.xml
new file mode 100644
index 0000000000..91bdccfac5
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/BooksConfigWithAlias.xml
@@ -0,0 +1,36 @@
+<?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/das-java/trunk/rdb/src/test/resources/CompanyConfig.xml b/das-java/trunk/rdb/src/test/resources/CompanyConfig.xml
new file mode 100644
index 0000000000..793697c314
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/CompanyConfig.xml
@@ -0,0 +1,43 @@
+<?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/das-java/trunk/rdb/src/test/resources/CompanyEmployeeConfig.xml b/das-java/trunk/rdb/src/test/resources/CompanyEmployeeConfig.xml
new file mode 100644
index 0000000000..0e25268afa
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/CompanyEmployeeConfig.xml
@@ -0,0 +1,54 @@
+<?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/das-java/trunk/rdb/src/test/resources/CustomerConfig.xml b/das-java/trunk/rdb/src/test/resources/CustomerConfig.xml
new file mode 100644
index 0000000000..ed544f39dd
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/CustomerConfig.xml
@@ -0,0 +1,24 @@
+<?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/das-java/trunk/rdb/src/test/resources/CustomerConfigWithConverter.xml b/das-java/trunk/rdb/src/test/resources/CustomerConfigWithConverter.xml
new file mode 100644
index 0000000000..b38922b53a
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/CustomerConfigWithConverter.xml
@@ -0,0 +1,33 @@
+<?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/das-java/trunk/rdb/src/test/resources/CustomerConfigWithConverter2.xml b/das-java/trunk/rdb/src/test/resources/CustomerConfigWithConverter2.xml
new file mode 100644
index 0000000000..bb49a414c4
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/CustomerConfigWithConverter2.xml
@@ -0,0 +1,29 @@
+<?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/das-java/trunk/rdb/src/test/resources/CustomerConfigWithIDConverter.xml b/das-java/trunk/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
new file mode 100644
index 0000000000..9a567b7ea8
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
@@ -0,0 +1,32 @@
+<?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/das-java/trunk/rdb/src/test/resources/CustomersOrdersConfig.xml b/das-java/trunk/rdb/src/test/resources/CustomersOrdersConfig.xml
new file mode 100644
index 0000000000..323c8cb6ba
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/CustomersOrdersConfig.xml
@@ -0,0 +1,51 @@
+<?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/das-java/trunk/rdb/src/test/resources/CustomersOrdersConfigProps.xml b/das-java/trunk/rdb/src/test/resources/CustomersOrdersConfigProps.xml
new file mode 100644
index 0000000000..992cf3fa3e
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/CustomersOrdersConfigProps.xml
@@ -0,0 +1,53 @@
+<?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" typeName="Customer">
+        <Column columnName="ID" propertyName="ID" primaryKey="true"/>
+        <Column columnName="LASTNAME" propertyName="lastName"/>
+        <Column columnName="ADDRESS" propertyName="address"/>
+    </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/das-java/trunk/rdb/src/test/resources/CustomersOrdersRelationship.xml b/das-java/trunk/rdb/src/test/resources/CustomersOrdersRelationship.xml
new file mode 100644
index 0000000000..d91460052d
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/CustomersOrdersRelationship.xml
@@ -0,0 +1,53 @@
+<?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" typeName="Customer">
+        <Column columnName="ID" propertyName="id" primaryKey="true"/>
+        <Column columnName="LASTNAME" propertyName="lastName"/>
+        <Column columnName="ADDRESS" propertyName="address"/>
+    </Table>
+    
+    <Table tableName="ANORDER" typeName="AnOrder">
+        <Column columnName="ID" propertyName="OrderId" primaryKey="true"/>
+    </Table>
+    
+    <Relationship name="orders" primaryKeyTable="CUSTOMER"
+        foreignKeyTable="ANORDER" many="true">
+        <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
+    </Relationship>
+    
+</Config>
diff --git a/das-java/trunk/rdb/src/test/resources/InvalidConfig1.xml b/das-java/trunk/rdb/src/test/resources/InvalidConfig1.xml
new file mode 100644
index 0000000000..fa1e353281
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/InvalidConfig1.xml
@@ -0,0 +1,32 @@
+<?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/das-java/trunk/rdb/src/test/resources/InvalidConverter.xml b/das-java/trunk/rdb/src/test/resources/InvalidConverter.xml
new file mode 100644
index 0000000000..e6c15ad11f
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/InvalidConverter.xml
@@ -0,0 +1,36 @@
+<?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/das-java/trunk/rdb/src/test/resources/ManagedBooksConfig.xml b/das-java/trunk/rdb/src/test/resources/ManagedBooksConfig.xml
new file mode 100644
index 0000000000..c2b833d2bf
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/ManagedBooksConfig.xml
@@ -0,0 +1,30 @@
+<?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/das-java/trunk/rdb/src/test/resources/MissingPK.xml b/das-java/trunk/rdb/src/test/resources/MissingPK.xml
new file mode 100644
index 0000000000..a236f4b0e9
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MissingPK.xml
@@ -0,0 +1,59 @@
+<?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="testNullDataInPK" SQL="SELECT SINGER.ID, SINGER.NAME, SONG.ID, SONG.TITLE FROM SINGER, SONG WHERE SINGER.ID = SONG.SINGERID" kind="Select"/>
+  <Command name="testOuterJoin" SQL="SELECT SINGER.ID, SINGER.NAME, SONG.ID, SONG.TITLE FROM SINGER LEFT OUTER JOIN SONG ON SINGER.ID = SONG.SINGERID WHERE SINGER.ID = 3" kind="Select"/>
+
+  <Table tableName="SINGER">
+    <Column columnName="ID" primaryKey="true"/>
+  </Table>
+  
+  <Table tableName="SONG">
+    <Column columnName="ID" primaryKey="true" />
+  </Table>
+  
+  <Command name="test11" SQL="SELECT OWNER.ID, OWNER.NAME, DOG.ID, DOG.NAME  FROM OWNER, DOG WHERE OWNER.ID = DOG.OWNER_ID" kind="Select"/>
+  <Command name="test22" SQL="SELECT OWNER.ID, OWNER.NAME,  DOG.NAME FROM OWNER, DOG WHERE OWNER.ID = DOG.OWNER_ID" kind="Select"/>
+  <Command name="test33" SQL="SELECT OWNER.NAME, DOG.ID, DOG.NAME FROM OWNER, DOG WHERE OWNER.ID = DOG.OWNER_ID" kind="Select"/>
+  <Command name="test44" SQL="SELECT OWNER.NAME, DOG.NAME FROM OWNER, DOG WHERE OWNER.ID = DOG.OWNER_ID" kind="Select"/>
+
+  <Table tableName="OWNER">
+    <Column columnName="ID" primaryKey="true"/>
+  </Table>
+  
+  <Table tableName="DOG">
+    <Column columnName="ID" primaryKey="true" />
+  </Table>
+
+ <Command name="testPartFail" SQL="SELECT PART.QUANTITY FROM PART" kind="Select"/>
+  
+ <Table tableName="PART">
+    <Column columnName="ID"/>
+  </Table>  
+    
+  <Command name="get all books" SQL="SELECT AUTHOR FROM BOOK" kind="Select"/>
+  
+	<Table tableName="BOOK" typeName="BookInfo">
+        <Column columnName="BOOK_ID" propertyName="BookID" primaryKey="true"/>
+        <Column columnName="AUTHOR" propertyName="Writer"/>
+	    <Column columnName="OCC" collision="true"/>
+    </Table>
+      
+</Config>
diff --git a/das-java/trunk/rdb/src/test/resources/MissingPKREL.xml b/das-java/trunk/rdb/src/test/resources/MissingPKREL.xml
new file mode 100644
index 0000000000..0efd7bf63c
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MissingPKREL.xml
@@ -0,0 +1,63 @@
+<?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="test11" SQL="SELECT OWNER.ID, OWNER.NAME, DOG.ID, DOG.NAME FROM OWNER, DOG WHERE OWNER.ID = DOG.OWNER_ID" kind="Select"/>
+  <Command name="test22" SQL="SELECT OWNER.ID, OWNER.NAME,  DOG.NAME FROM OWNER, DOG WHERE OWNER.ID = DOG.OWNER_ID" kind="Select"/>
+  <Command name="test33" SQL="SELECT OWNER.NAME, DOG.ID, DOG.NAME FROM OWNER, DOG WHERE OWNER.ID = DOG.OWNER_ID" kind="Select"/>
+  <Command name="test44" SQL="SELECT OWNER.NAME, DOG.NAME FROM OWNER, DOG WHERE OWNER.ID = DOG.OWNER_ID" kind="Select"/>
+
+  <Table tableName="OWNER">
+    <Column columnName="ID" primaryKey="true"/>
+  </Table>
+  
+  <Table tableName="DOG">
+    <Column columnName="ID" primaryKey="true" />
+  </Table>
+
+  <Relationship name="owns" primaryKeyTable="OWNER" foreignKeyTable="DOG" many="true">
+     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="OWNER_ID"/>
+  </Relationship>	
+
+  <Command name="compound_pks" SQL="SELECT ORDERDETAILS.ORDERID, ORDERDETAILS.PRODUCTID FROM ORDERDETAILS" kind="Select"/>
+  <Command name="compound_pks_fail" SQL="SELECT ORDERDETAILS.ORDERID FROM ORDERDETAILS" kind="Select"/>
+  <Command name="compound_pks_join" 
+  SQL="SELECT ORDERDETAILS.ORDERID, ORDERDETAILS.PRODUCTID, ORDERDETAILSDESC.ID FROM ORDERDETAILS,ORDERDETAILSDESC WHERE ORDERDETAILS.ORDERID=ORDERDETAILSDESC.ORDERID AND ORDERDETAILS.PRODUCTID=ORDERDETAILSDESC.PRODUCTID"   
+  kind="Select">
+  </Command>
+  <Command name="compound_pks_join_fail" 
+  SQL="SELECT ORDERDETAILS.ORDERID, ORDERDETAILSDESC.ID FROM ORDERDETAILS, ORDERDETAILSDESC WHERE ORDERDETAILS.ORDERID=ORDERDETAILSDESC.ORDERID AND ORDERDETAILS.PRODUCTID=ORDERDETAILSDESC.PRODUCTID"   
+  kind="Select">  
+  </Command>
+	
+  <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/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig1.xml b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig1.xml
new file mode 100644
index 0000000000..2555a9ed64
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig1.xml
@@ -0,0 +1,36 @@
+<?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/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig12.xml b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig12.xml
new file mode 100644
index 0000000000..63ac8230ce
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig12.xml
@@ -0,0 +1,33 @@
+<?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/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig13.xml b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig13.xml
new file mode 100644
index 0000000000..6458108a63
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig13.xml
@@ -0,0 +1,34 @@
+<?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/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig14.xml b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig14.xml
new file mode 100644
index 0000000000..4b37a11138
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig14.xml
@@ -0,0 +1,37 @@
+<?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/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig2.xml b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig2.xml
new file mode 100644
index 0000000000..d055735590
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig2.xml
@@ -0,0 +1,45 @@
+<?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/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig3.xml b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig3.xml
new file mode 100644
index 0000000000..06727c6a79
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig3.xml
@@ -0,0 +1,32 @@
+<?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/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig5.xml b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig5.xml
new file mode 100644
index 0000000000..6915c69576
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig5.xml
@@ -0,0 +1,32 @@
+<?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/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig6.xml b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig6.xml
new file mode 100644
index 0000000000..fd3d177ad4
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig6.xml
@@ -0,0 +1,38 @@
+<?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/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig7.xml b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig7.xml
new file mode 100644
index 0000000000..eab57c759e
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig7.xml
@@ -0,0 +1,26 @@
+<?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/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig8.xml b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig8.xml
new file mode 100644
index 0000000000..205010c5c6
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig8.xml
@@ -0,0 +1,34 @@
+<?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/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig9.xml b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig9.xml
new file mode 100644
index 0000000000..84a10531aa
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MultiSchemaDasConfig9.xml
@@ -0,0 +1,30 @@
+<?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/das-java/trunk/rdb/src/test/resources/MultiSchemaInvalidDasConfig.xml b/das-java/trunk/rdb/src/test/resources/MultiSchemaInvalidDasConfig.xml
new file mode 100644
index 0000000000..4658493dbd
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/MultiSchemaInvalidDasConfig.xml
@@ -0,0 +1,47 @@
+<?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/das-java/trunk/rdb/src/test/resources/OneToOneNonRestrictedConfig.xml b/das-java/trunk/rdb/src/test/resources/OneToOneNonRestrictedConfig.xml
new file mode 100644
index 0000000000..a1266f43de
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/OneToOneNonRestrictedConfig.xml
@@ -0,0 +1,51 @@
+<?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 named employee with company" 
+		SQL="select * from EMPLOYEE left outer join COMPANY on EMPLOYEE.ID = COMPANY.EOTMID where EMPLOYEE.NAME= ?" kind = "Select"/>
+
+	<Table tableName="COMPANY">
+    	<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="false">
+      	<KeyPair primaryKeyColumn="ID" foreignKeyColumn="EOTMID" />
+  	</Relationship>
+
+	<Command name="get spec with product" 
+		SQL="select * from PRODUCT left outer join PRODUCTSPEC on PRODUCT.ID = PRODUCTSPEC.PRODUCT_ID where PRODUCT.NAME= ?" kind = "Select"/>
+
+	<Table tableName="PRODUCT">
+    	<Column columnName="ID" primaryKey="true" generated="false"/>
+  	</Table>
+  
+  	<Table tableName="PRODUCTSPEC">
+  	  	<Column columnName="ID" primaryKey="true" generated="false"/>
+  	</Table>	
+	  	
+	<Relationship name="prodspec" primaryKeyTable="PRODUCT" foreignKeyTable="PRODUCTSPEC" many="false" keyRestricted="false">
+      	<KeyPair primaryKeyColumn="ID" foreignKeyColumn="PRODUCT_ID" />
+  	</Relationship>
+			
+</Config>
+\ No newline at end of file
diff --git a/das-java/trunk/rdb/src/test/resources/OneToOneRestrictedConfig.xml b/das-java/trunk/rdb/src/test/resources/OneToOneRestrictedConfig.xml
new file mode 100644
index 0000000000..c9ef484513
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/OneToOneRestrictedConfig.xml
@@ -0,0 +1,69 @@
+<?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>
+			
+	<Command name="get spec with product" 
+		SQL="select * from PRODUCT left outer join PRODUCTSPEC on PRODUCT.ID = PRODUCTSPEC.PRODUCT_ID where PRODUCT.NAME= ?" kind = "Select"/>
+
+	<Table tableName="PRODUCT">
+    	<Column columnName="ID" primaryKey="true" generated="false"/>
+  	</Table>
+  
+  	<Table tableName="PRODUCTSPEC">
+  	  	<Column columnName="ID" primaryKey="true" generated="false"/>
+  	</Table>	
+	  	
+	<Relationship name="prodspec" primaryKeyTable="PRODUCT" foreignKeyTable="PRODUCTSPEC" many="false" keyRestricted="true">
+      	<KeyPair primaryKeyColumn="ID" foreignKeyColumn="PRODUCT_ID" />
+  	</Relationship>
+						
+</Config>
+			
diff --git a/das-java/trunk/rdb/src/test/resources/OrderDetailsAndDescription.xml b/das-java/trunk/rdb/src/test/resources/OrderDetailsAndDescription.xml
new file mode 100644
index 0000000000..d5bc8d44a8
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/OrderDetailsAndDescription.xml
@@ -0,0 +1,35 @@
+<?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/das-java/trunk/rdb/src/test/resources/OrdersOrderDetailsConfig.xml b/das-java/trunk/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
new file mode 100644
index 0000000000..2e998ee57e
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
@@ -0,0 +1,36 @@
+<?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/das-java/trunk/rdb/src/test/resources/PartsConfig.xml b/das-java/trunk/rdb/src/test/resources/PartsConfig.xml
new file mode 100644
index 0000000000..b1809079d6
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/PartsConfig.xml
@@ -0,0 +1,50 @@
+<?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/das-java/trunk/rdb/src/test/resources/SINGER.xsd b/das-java/trunk/rdb/src/test/resources/SINGER.xsd
new file mode 100644
index 0000000000..c843929efb
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/SINGER.xsd
@@ -0,0 +1,39 @@
+<?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/SINGER.xsd" targetNamespace="http:///org.apache.tuscany.das.rdb.test/SINGER.xsd">
+	<!-- A Singer -->
+	  <xsd:complexType name="SINGER">
+       <xsd:sequence>
+          <xsd:element name="ID" nillable="false" type="xsd:int"/>
+          <xsd:element name="NAME" type="xsd:string"/>
+          <xsd:element maxOccurs="unbounded" name="sings" type="this:SONG"/> 
+       </xsd:sequence>
+  	 </xsd:complexType>   
+   
+   <!-- A Song -->
+   	<xsd:complexType name="SONG">
+   		<xsd:sequence>
+   			<xsd:element name="ID" nillable="false" type="xsd:int"/>
+   			<xsd:element name="TITLE" type="xsd:string"/>
+   			<xsd:element name="SINGERID" type="xsd:int"/>
+   		</xsd:sequence>
+   	</xsd:complexType>
+   	   
+</xsd:schema>
diff --git a/das-java/trunk/rdb/src/test/resources/asciifile.txt b/das-java/trunk/rdb/src/test/resources/asciifile.txt
new file mode 100644
index 0000000000..d3c922ab52
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/asciifile.txt
@@ -0,0 +1 @@
+this is a long file
+\ No newline at end of file
diff --git a/das-java/trunk/rdb/src/test/resources/basicCompanyDepartmentMapping.xml b/das-java/trunk/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
new file mode 100644
index 0000000000..bd648cd2ef
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
@@ -0,0 +1,39 @@
+<?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/das-java/trunk/rdb/src/test/resources/basicCompanyMapping.xml b/das-java/trunk/rdb/src/test/resources/basicCompanyMapping.xml
new file mode 100644
index 0000000000..b6ca4f9feb
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/basicCompanyMapping.xml
@@ -0,0 +1,25 @@
+<?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/das-java/trunk/rdb/src/test/resources/basicCustomerMapping.xml b/das-java/trunk/rdb/src/test/resources/basicCustomerMapping.xml
new file mode 100644
index 0000000000..a81ca90f8e
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/basicCustomerMapping.xml
@@ -0,0 +1,29 @@
+<?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/das-java/trunk/rdb/src/test/resources/basicCustomerMappingWithCUD.xml b/das-java/trunk/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
new file mode 100644
index 0000000000..f27a50f4f3
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
@@ -0,0 +1,44 @@
+<?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>
+		  	<Parameter name="ID" index="1"/>
+		  	<Parameter name="LASTNAME" index="2"/>
+		  	<Parameter name="ADDRESS" index="3"/>		  			  	
+	  	 </Parameters>
+	  </create>
+	  <update sql="update customer set lastname = ?, address = ? where ID = ?" >
+	  	<Parameters>
+		  	<Parameter name="ID" index="3"/>
+		  	<Parameter name="LASTNAME" index="1"/>
+		  	<Parameter name="ADDRESS" index="2"/>		  			  	
+	  	 </Parameters>	  
+	  </update>
+      <delete sql="delete from customer where ID = ?" >
+	  	<Parameters>
+		  	<Parameter name="ID" index="1"/>
+	  	 </Parameters>      
+      </delete>
+  </Table>
+	
+</Config>
diff --git a/das-java/trunk/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml b/das-java/trunk/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
new file mode 100644
index 0000000000..faddf3835b
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
@@ -0,0 +1,46 @@
+<?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>
+		  	<Parameter name="ID" index="1"/>
+		  	<Parameter name="LASTNAME" index="2"/>
+		  	<Parameter name="ADDRESS" index="3"/>		  			  	
+	  	 </Parameters>	  
+	  </create>
+	  <update sql="update customer set lastname = ? where ID = ?" >
+	  	<Parameters>
+		  	<Parameter name="ID" index="2"/>
+		  	<Parameter name="LASTNAME" index="1"/>
+	  	 </Parameters>	  
+	  </update>
+      <delete sql="delete from customer where ID = ?" >
+	  	<Parameters>
+		  	<Parameter name="ID" index="1"/>
+	  	 </Parameters>
+      </delete>
+      <Column columnName="ID" primaryKey="true"/>
+      <Column columnName="LASTNAME"/>
+      <Column columnName="ADDRESS"/> 
+  </Table>
+	
+</Config>
diff --git a/das-java/trunk/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml b/das-java/trunk/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
new file mode 100644
index 0000000000..347cd53f45
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
@@ -0,0 +1,48 @@
+<?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>
+		  	<Parameter name="ID" index="1"/>
+		  	<Parameter name="LASTNAME" index="2"/>
+		  	<Parameter name="ADDRESS" index="3"/>		  			  	
+	  	 </Parameters>	  
+	  </create>
+	  <update sql="udpate customer blah set lastname = ?, address = ? where ID = ?" >
+	  	<Parameters>
+		  	<Parameter name="ID" index="3"/>
+		  	<Parameter name="LASTNAME" index="1"/>
+		  	<Parameter name="ADDRESS" index="2"/>		  			  	
+	  	 </Parameters>
+	  </update>
+      <delete sql="dleete from customer blah where ID = ?" >
+	  	<Parameters>
+		  	<Parameter name="ID" index="1"/>
+	  	 </Parameters>      
+      </delete>
+     
+    <Column columnName="ID" primaryKey="true"/>
+    <Column columnName="LASTNAME"/>
+    <Column columnName="ADDRESS"/> 
+  </Table>
+	
+</Config>
diff --git a/das-java/trunk/rdb/src/test/resources/basicCustomerOrderMapping.xml b/das-java/trunk/rdb/src/test/resources/basicCustomerOrderMapping.xml
new file mode 100644
index 0000000000..c03d9392ed
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/basicCustomerOrderMapping.xml
@@ -0,0 +1,35 @@
+<?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/das-java/trunk/rdb/src/test/resources/basicStaticCustomer.xml b/das-java/trunk/rdb/src/test/resources/basicStaticCustomer.xml
new file mode 100644
index 0000000000..c4b4fe56af
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/basicStaticCustomer.xml
@@ -0,0 +1,28 @@
+<?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/das-java/trunk/rdb/src/test/resources/cityStates.xml b/das-java/trunk/rdb/src/test/resources/cityStates.xml
new file mode 100644
index 0000000000..1908ba4268
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/cityStates.xml
@@ -0,0 +1,40 @@
+<?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/das-java/trunk/rdb/src/test/resources/company.xsd b/das-java/trunk/rdb/src/test/resources/company.xsd
new file mode 100644
index 0000000000..0bf0229201
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/company.xsd
@@ -0,0 +1,52 @@
+<?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="id" type="xsd:int"/>
+        <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="id" type="xsd:int"/>        
+        <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="id" type="xsd:int"/>      
+        <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/das-java/trunk/rdb/src/test/resources/companyMapping.xml b/das-java/trunk/rdb/src/test/resources/companyMapping.xml
new file mode 100644
index 0000000000..9388cf8264
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/companyMapping.xml
@@ -0,0 +1,42 @@
+<?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/das-java/trunk/rdb/src/test/resources/companyMappingWithConverters.xml b/das-java/trunk/rdb/src/test/resources/companyMappingWithConverters.xml
new file mode 100644
index 0000000000..d8609eab96
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/companyMappingWithConverters.xml
@@ -0,0 +1,51 @@
+<?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">
+	<Command name="AllCompanies" SQL="select * from COMPANY" kind="Select">
+     <ResultDescriptor columnName="ID" tableName="COMPANY" columnType="commonj.sdo.Int"/>
+     <ResultDescriptor columnName="NAME" tableName="COMPANY" columnType="commonj.sdo.String"/>
+     <ResultDescriptor columnName="EOTMID" tableName="COMPANY" columnType="commonj.sdo.Int"/>
+    </Command>
+      
+  <Table tableName="COMPANY" typeName="CompanyType">
+    <Column columnName="ID" propertyName="id" primaryKey="true" generated="true"/>
+    <Column columnName="NAME" propertyName="name" />
+    <Column columnName="EOTMID" propertyName="employeeOfTheMonth"/>
+  </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/das-java/trunk/rdb/src/test/resources/companyMappingWithResultDescriptor.xml b/das-java/trunk/rdb/src/test/resources/companyMappingWithResultDescriptor.xml
new file mode 100644
index 0000000000..419f27eca3
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/companyMappingWithResultDescriptor.xml
@@ -0,0 +1,57 @@
+<?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/das-java/trunk/rdb/src/test/resources/companynoid.xsd b/das-java/trunk/rdb/src/test/resources/companynoid.xsd
new file mode 100644
index 0000000000..7c301ff16a
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/companynoid.xsd
@@ -0,0 +1,49 @@
+<?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/companynoid.xsd" 
+	xmlns:companynoid="org.apache.tuscany.das.rdb.test/companynoid.xsd" 
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">		
+	
+      <xsd:element name="companynoid" type="companynoid:CompanynoidType"/>
+      
+      <xsd:complexType name="CompanynoidType">
+        <xsd:sequence>
+          <xsd:element maxOccurs="unbounded" name="departmentsnoid" type="companynoid:DepartmentnoidType"/>
+        </xsd:sequence>
+        <xsd:attribute name="name" type="xsd:string"/>
+        <xsd:attribute name="employeeOfTheMonth" type="xsd:IDREF" ecore:reference="EmployeenoidType"/>
+      </xsd:complexType>
+      
+      <xsd:complexType name="DepartmentnoidType">
+        <xsd:sequence>
+          <xsd:element maxOccurs="unbounded" name="employees" type="companynoid:EmployeenoidType"/>
+        </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="EmployeenoidType">
+        <xsd:attribute name="id" type="xsd:int"/>      
+        <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/das-java/trunk/rdb/src/test/resources/companynoidMappingWithConverters.xml b/das-java/trunk/rdb/src/test/resources/companynoidMappingWithConverters.xml
new file mode 100644
index 0000000000..bfbefddd2f
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/companynoidMappingWithConverters.xml
@@ -0,0 +1,44 @@
+<?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/companynoid.xsd">
+  
+  <Table tableName="COMPANY" typeName="CompanynoidType">
+    <Column columnName="ID" primaryKey="true"/>
+  </Table>
+  
+  <Table tableName="DEPARTMENT" typeName="DepartmentnoidType">
+    <Column columnName="ID" primaryKey="true"/>
+    <Column columnName="DEPNUMBER" propertyName="NUMBER" converterClassName="org.apache.tuscany.das.rdb.test.mappings.StringToIntegerConverter"/>
+  </Table>
+
+  <Table tableName="EMPLOYEE" typeName="EmployeenoidType">
+  	  <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/das-java/trunk/rdb/src/test/resources/connectionInfoDriverManagerAuth.xml b/das-java/trunk/rdb/src/test/resources/connectionInfoDriverManagerAuth.xml
new file mode 100644
index 0000000000..8a6a1880af
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/connectionInfoDriverManagerAuth.xml
@@ -0,0 +1,33 @@
+<?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>
+    <ConnectionProperties
+        driverClass="org.apache.derby.jdbc.EmbeddedDriver"
+        databaseURL="jdbc:derby:dastestcon"
+        userName="dasuser"
+        password="dasuser"        
+        loginTimeout="600000"/>
+</ConnectionInfo>
+
+<Command name="getBook" SQL="Select * from BOOK" kind="Select"/>
+
+</Config>
diff --git a/das-java/trunk/rdb/src/test/resources/connectionInfoDriverManagerNoAuth.xml b/das-java/trunk/rdb/src/test/resources/connectionInfoDriverManagerNoAuth.xml
new file mode 100644
index 0000000000..1c7a79acc7
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/connectionInfoDriverManagerNoAuth.xml
@@ -0,0 +1,31 @@
+<?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>
+    <ConnectionProperties
+        driverClass="org.apache.derby.jdbc.EmbeddedDriver"
+        databaseURL="jdbc:derby:dastestcon"
+        loginTimeout="600000"/>
+</ConnectionInfo>
+
+<Command name="getBook" SQL="Select * from BOOK" kind="Select"/>
+
+</Config>
diff --git a/das-java/trunk/rdb/src/test/resources/customer.xsd b/das-java/trunk/rdb/src/test/resources/customer.xsd
new file mode 100644
index 0000000000..e5482ae3a0
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/customer.xsd
@@ -0,0 +1,43 @@
+<?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/das-java/trunk/rdb/src/test/resources/customerMapping.xml b/das-java/trunk/rdb/src/test/resources/customerMapping.xml
new file mode 100644
index 0000000000..3de367e0c6
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/customerMapping.xml
@@ -0,0 +1,28 @@
+<?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/das-java/trunk/rdb/src/test/resources/customerMappingWithResultDescriptor.xml b/das-java/trunk/rdb/src/test/resources/customerMappingWithResultDescriptor.xml
new file mode 100644
index 0000000000..587c437423
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/customerMappingWithResultDescriptor.xml
@@ -0,0 +1,31 @@
+<?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="testSelectCustomer" SQL="select * from CUSTOMER where CUSTOMER.ID = 1" kind="Select">
+ 		<ResultDescriptor columnName="ID" tableName="CUSTOMER" columnType="commonj.sdo.IntObject"/>
+ 		<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" primaryKey="true"/>
+  </Table>
+  
+</Config>
diff --git a/das-java/trunk/rdb/src/test/resources/customerOrderRelationshipMapping.xml b/das-java/trunk/rdb/src/test/resources/customerOrderRelationshipMapping.xml
new file mode 100644
index 0000000000..fe8d1c5ece
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/customerOrderRelationshipMapping.xml
@@ -0,0 +1,34 @@
+<?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" primaryKey="true"/>
+  </Table>
+  <Table tableName="ANORDER" typeName="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/das-java/trunk/rdb/src/test/resources/moin-www.png b/das-java/trunk/rdb/src/test/resources/moin-www.png
new file mode 100644
index 0000000000..253471485a
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/moin-www.png
diff --git a/das-java/trunk/rdb/src/test/resources/namedParameter.xml b/das-java/trunk/rdb/src/test/resources/namedParameter.xml
new file mode 100644
index 0000000000..d0b0811e33
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/namedParameter.xml
@@ -0,0 +1,73 @@
+<?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>
+	   <Parameter name="ID" index="1"/>
+	   <Parameter name="LASTNAME" index="1"/>
+	   <Parameter name="ADDRESS" index="3"/>
+	  </Parameters>
+	  </create>
+	  
+	  <update sql="update customer set lastname = ?, address = ? where ID = ?" >
+	  <Parameters>
+	   <Parameter name="LASTNAME" index="1"/>
+	   <Parameter name="ADDRESS" index="2"/>
+	   <Parameter name="ID" index="5"/>
+	  </Parameters>	  
+	  </update>
+      
+      <delete sql="delete from customer where ID = ? and LASTNAME = ?">
+	  <Parameters>
+	   <Parameter name="LASTNAME" columnType="commonj.sdo.String" index="2"/>	   	  
+	   <Parameter name="ID" columnType="commonj.sdo.IntObject" index="1"/>	   
+	  </Parameters>      
+      </delete>
+  </Table>
+	
+  <Command name="getCustomer" SQL="Select * from CUSTOMER where ID = ?" kind="Select">
+  	<Parameter name="ID" index="1"/>
+  </Command>
+  
+  <Command name="createCustomer" SQL="insert into CUSTOMER values ( ?, ?, ?)" kind="Insert">
+   	<Parameter name="ID" index="1"/>
+   	<Parameter name="LASTNAME" index="2"/>
+   	<Parameter name="ADDRESS" index="3"/>
+  </Command>
+
+  <Command name="createCustomerNoParam" SQL="insert into CUSTOMER values ( ?, ?, ?)" kind="Insert"/>
+  
+  <Command name="updateCustomer" SQL="update CUSTOMER set LASTNAME = ? where ID = ?" kind="Update">
+   	<Parameter name="LASTNAME" index="1"/>
+   	<Parameter name="ID" index="2"/>
+  </Command>
+
+  <Command name="updateCustomerNoParam" SQL="update CUSTOMER set LASTNAME = ? where ID = ?" kind="Update">
+  </Command>
+  
+  <Command name="deleteCustomer" SQL="delete from CUSTOMER where ID = ?" kind="Delete">
+   	<Parameter name="ID" index="1"/>  
+  </Command>
+
+  <Command name="deleteCustomerNoParam" SQL="delete from CUSTOMER where ID = ?" kind="Delete"/>
+
+</Config>
diff --git a/das-java/trunk/rdb/src/test/resources/passiveConnection.xml b/das-java/trunk/rdb/src/test/resources/passiveConnection.xml
new file mode 100644
index 0000000000..6a23200d49
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/passiveConnection.xml
@@ -0,0 +1,26 @@
+<?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/das-java/trunk/rdb/src/test/resources/staticCustomer.xml b/das-java/trunk/rdb/src/test/resources/staticCustomer.xml
new file mode 100644
index 0000000000..705e4b34a9
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/staticCustomer.xml
@@ -0,0 +1,23 @@
+<?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/das-java/trunk/rdb/src/test/resources/staticCustomerOrder.xml b/das-java/trunk/rdb/src/test/resources/staticCustomerOrder.xml
new file mode 100644
index 0000000000..afbe2a8cfb
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/staticCustomerOrder.xml
@@ -0,0 +1,36 @@
+<?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/das-java/trunk/rdb/src/test/resources/staticInvalid.xml b/das-java/trunk/rdb/src/test/resources/staticInvalid.xml
new file mode 100644
index 0000000000..965c99717f
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/staticInvalid.xml
@@ -0,0 +1,23 @@
+<?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/das-java/trunk/rdb/src/test/resources/storedProcTest.xml b/das-java/trunk/rdb/src/test/resources/storedProcTest.xml
new file mode 100644
index 0000000000..beb1ca34ac
--- /dev/null
+++ b/das-java/trunk/rdb/src/test/resources/storedProcTest.xml
@@ -0,0 +1,27 @@
+<?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>
diff --git a/das-java/trunk/samples/Readme.htm b/das-java/trunk/samples/Readme.htm
new file mode 100644
index 0000000000..ff4fed6d89
--- /dev/null
+++ b/das-java/trunk/samples/Readme.htm
@@ -0,0 +1,110 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+  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.
+ -->
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DAS Samples</title>
+
+<style>
+.code {
+	font-size: 11px;
+	color: #006699
+}
+
+.codebox {
+	border: 1px solid #6699CC;
+	background-color: #F1F7FA;
+	padding: 15px
+}
+
+.codebox2 {
+	border: 1px solid #6699CC;
+	background-color: #F1F7FA;
+	padding: 15px;
+	width: 85%
+}
+
+.codeboxW {
+	border: 1px solid #6699CC;
+	background-color: #FFFFFF;
+	padding: 15px
+}
+
+.codeboxB {
+	background-color: #C9DBED;
+	padding: 1px 10px 10px 10px
+}
+</style>
+
+</head>
+
+<h1>
+<center>DAS Samples</center>
+</h1>
+
+<br>
+
+<p>The DAS Java Samples demonstrates the DAS features and how to get
+started with them. Below a list of available samples:</p>
+
+<br>
+
+<p><ul>
+	<table align="left">
+		<tr>
+		<th align="left" style="border-right-style: solid; border-left-style: solid; border-top-style: solid; border-bottom-style: solid">
+		Company-webapp
+		</th>
+		<th align="left" style="border-right-style: solid; border-left-style: solid; border-top-style: solid; border-bottom-style: solid">
+		This stand-alone sample demonstrates DAS in the context of a simple web application. 
+		</th>
+		</tr>
+		<tr>
+		<th align="left" style="border-right-style: solid; border-left-style: solid; border-top-style: solid; border-bottom-style: solid">
+		Customer
+		</th>
+		<th align="left" style="border-right-style: solid; border-left-style: solid; border-top-style: solid; border-bottom-style: solid">
+		This stand-alone sample demonstrates DAS in the context of a simple java application 
+		</th>
+		</tr>
+		<tr>
+		<th align="left" style="border-right-style: solid; border-left-style: solid; border-top-style: solid; border-bottom-style: solid">
+		Advanced-webapp
+		</th>
+		<th align="left" style="border-right-style: solid; border-left-style: solid; border-top-style: solid; border-bottom-style: solid">
+		This web sample demonstrates DAS advanced features in the context of a simple web application using Ajax. Some of the features demonstrated are : Basic CRUD, Optimistic Concurrency Control (OCC), Result Set Shape, Column Converter, Integration with dbConfig  
+		</th>
+		</tr>
+		<tr>
+		<th align="left" style='border-right-style: solid; border-left-style: solid; border-top-style: solid; border-bottom-style: solid'>
+		Transaction
+		</th>
+		<th align="left" style="border-right-style: solid; border-left-style: solid; border-top-style: solid; border-bottom-style: solid">
+		This stand-alone sample uses DAS with Geronimo Transaction Manager. Connection is passed to DAS by client. Geronimo TM manages database changes involving multiple DataGraphs under one transaction. 
+		</th>
+		</tr>		
+	</table>
+
+</ul>
+
+
+</p></BODY>
+</HTML>
diff --git a/das-java/trunk/samples/advanced-webapp/build.xml b/das-java/trunk/samples/advanced-webapp/build.xml
new file mode 100644
index 0000000000..e8d9d5fbdf
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/build.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.
+ -->
+<project name="samples" default="compile">
+    <property name="mainDir" value="../../.."/>
+    <path id="javac.classpath">
+        <fileset dir="${mainDir}/lib">
+            <include name="tuscany-runtime-incubating-M1.jar"/>
+        </fileset>
+    </path>
+    <path id="java.classpath">
+        <fileset dir="${mainDir}/lib">
+            <include name="tuscany-runtime-incubating-M1.jar"/>
+        </fileset>
+        <pathelement path="target/sample-das-features.jar"/>
+    </path>
+
+  <target name="init">
+    <mkdir dir="target/classes"/>
+  </target>
+
+    <target name="compile" depends="init">
+      <javac srcdir="src/main/java" destdir="target/classes" debug="on" source="1.5" target="1.5">
+        <classpath refid="javac.classpath"/>
+      </javac>
+      <copy todir="target/classes">
+        <fileset dir="src/main/resources"/>
+      </copy>
+      <war destfile="target/sample-das-features.war" webxml="src/main/webapp/WEB-INF/web.xml">
+        <classes dir="target/classes"/>
+      </war>
+    </target>
+
+    <target name="clean">
+      <delete quiet="true" includeemptydirs="true">
+        <fileset dir="target" excludes="sample-companyweb-incubating-M1.war"/>
+      </delete>
+    </target>
+</project>
diff --git a/das-java/trunk/samples/advanced-webapp/pom.xml b/das-java/trunk/samples/advanced-webapp/pom.xml
new file mode 100644
index 0000000000..84c6bcac75
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/pom.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.
+ -->
+<project>
+	
+    <parent>
+        <groupId>org.apache.tuscany.das.samples</groupId>
+        <artifactId>tuscany-das-samples</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+	
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tuscany-das-sample-advanced-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>Tuscany DAS Advanced Sample</name>
+    <description>Advanced DAS web applicaiton Sample based on Ajax</description>
+
+    <dependencies>
+		
+        <dependency>
+            <groupId>org.apache.tuscany.das</groupId>
+            <artifactId>tuscany-das-rdb</artifactId>
+            <version>${das.version}</version>
+            <scope>compile</scope>
+          </dependency>
+
+         <dependency>
+           <groupId>org.apache.tuscany.sdo</groupId>
+           <artifactId>tuscany-sdo-impl</artifactId>
+           <version>${sdo.version}</version>
+           <scope>compile</scope>
+         </dependency>
+  
+         <dependency>
+           <groupId>org.apache.tuscany.sdo</groupId>
+           <artifactId>tuscany-sdo-api-r2.1</artifactId>
+           <version>${sdo.version}</version>
+           <scope>compile</scope>
+         </dependency>          
+        
+          <dependency>
+            <groupId>org.apache.tuscany.das.samples</groupId>
+            <artifactId>tuscany-das-sample-dbconfig</artifactId>
+            <version>${das.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.derby</groupId>
+	            <artifactId>derby</artifactId>
+                </exclusion>
+            </exclusions>
+          </dependency>
+        
+          <dependency>
+	    <groupId>javax.servlet</groupId>
+	    <artifactId>jstl</artifactId>
+	    <version>1.1.2</version>
+	    <scope>runtime</scope>
+          </dependency>
+
+	  <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <version>1.1.1</version>
+          </dependency>        
+
+	  <dependency>
+	      <groupId>tomcat</groupId>
+	      <artifactId>servlet-api</artifactId>
+	      <version>5.0.18</version>
+	      <scope>provided</scope>
+	  </dependency>
+
+	  <dependency>
+	      <groupId>tomcat</groupId>
+	      <artifactId>jsp-api</artifactId>
+	      <version>5.0.18</version>
+	      <scope>provided</scope>
+	  </dependency>
+    </dependencies>
+    
+    <!-- this will place the java source files inside the war -->
+        <build>
+            <finalName>sample-advanced-webapp</finalName>
+            <sourceDirectory>src/main/java</sourceDirectory>
+            <resources>
+                <resource>
+                    <directory>src/main/java</directory>
+                </resource>
+                <resource>
+                  <directory>src/main/resources</directory>
+                </resource>
+            </resources>
+    </build>
+</project>
diff --git a/das-java/trunk/samples/advanced-webapp/readme.htm b/das-java/trunk/samples/advanced-webapp/readme.htm
new file mode 100644
index 0000000000..1ddba99e5e
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/readme.htm
@@ -0,0 +1,204 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+  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.
+ -->
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Tuscany DAS Sample - Advanced webapp</title>
+
+<style>
+.code {font-size: 11px; color: #006699}
+.codebox {border: 1px solid #6699CC; background-color: #F1F7FA;padding:15px}
+.codebox2 {border: 1px solid #6699CC; background-color: #F1F7FA;padding:15px; width:85%}
+.codeboxW {border: 1px solid #6699CC; background-color: #FFFFFF;padding:15px}
+.codeboxB {background-color: #C9DBED;padding:1px 10px 10px 10px}
+</style>
+
+</head>
+<body>
+
+<h1><center>Advanced DAS web application Sample</center></h1>
+
+<br>
+
+<p>
+This web sample demonstrates DAS advanced features in the context of a simple web application using Ajax.<br>
+The application user can navigate the menu to see examples of different DAS features.<br>
+The application uses "dbConfig" utility to create canned Derby database with required tables and populate initial data in them. For refreshing database data to initial state, user can click on Refresh Button.<br>
+</p>
+
+<ul>
+   <li><b>Adhoc Query</b>  (CRUD operations on COMPANY and DEPARTMENT using adhoc Sql statements)</li>
+   <li><b>DAS Command</b> (CRUD operations on COMPANY and DEPARTMENT using DAS config commands)</li>
+   <li><b>Advanced features:</b>
+      <ul>
+         <li><b>Optimistic Concurrency Control</b> (Using BOOK. NAME)</li>
+         <li><b>Converter</b>(Using CUSTOMER.LASTNAME)</li>
+         <li><b>Result Set Shape</b>(Using CUSTOMER table)</li>
+       </ul>
+    </li>
+</ul>
+
+<p>
+In future more features will get added.
+</p>
+
+
+<h2>Running the sample</h2>
+
+<p>
+There are two options for running this sample:
+
+<ul>
+   <li>Run from Tomcat configured by the build</li>
+   <li>Deploying the sample-advanced-webapp WAR into a Tomcat you configure yourself</li>
+</ul>
+
+<h2>Running from Tomcat configured by the build</h2>
+
+<p>
+You need to download the Tuscany RDB DAS source distribution and run maven build to use this option. When you build using maven from the source root {SRC_ROOT} directory, the sample war file is created under {SRC_ROOT}/samples/sample-ajax-das/target. This sample application is deployed to an instance of Tomcat as part of our automated sample testing.  For this, follow instructions from reademe.htm from {SRC_ROOT}/samples/testing/tomcat. This will in-effect run the htmlunit tests on the sample. The sample deployed on Tomcat instance will be ready this way and you can just point your browser to <a href="http://localhost:8080/sample-advanced-webapp/">http://localhost:8080/sample-advanced-webapp/</a> to test further.
+</p>
+
+<h2>Deploying the sample-ajax-das WAR into a Tomcat you configure yourself</h2>
+
+<p>
+Alternatively, you can deploy the sample to your own configured Tomcat installation by following the instructions below. <br>
+These instructions assume that you have either :
+<ul>
+   <li>1) Downloaded the Tuscany binary distribution or </li>
+   <li>2) Downloaded the Tuscany source and run maven build </li>
+</ul>
+see the following link to more details steps on how to build DAS Sample applications <a href="http://incubator.apache.org/tuscany/das-java-developer-guide.html">http://incubator.apache.org/tuscany/das-java-developer-guide.html</a> .
+</p>
+
+<h3>Set Up - Derby</h3>
+
+<ul>
+   <li>Download and install the most recent stable version of Tomcat 5.5 or Tomcat 6.  You can find it here: http://tomcat.apache.org/download-60.cgi</li>
+   <li>Download the most recent official release of Derby from here: http://db.apache.org/derby/index.html.  The only file you'll need from this download is derby(version).jar</li>
+   <li>Stop Tomcat</li>
+   <li>Copy derby(version).jar (from the derby distribution) to {Tomcat_Home}/common/lib (for Tomcat 5.5) or to {Tomcat_Home}/lib (for Tomcat 6) - e.g. derby-10.2.2.0.jar.</li>
+   <li>Add the sample war file to {Tomcat_Home}/webapps
+      <ul>
+         <li>sample-advanced-webapp.war</li>
+      </ul>
+   </li>
+   <li>Define a DataSource by adding a datasource definition to {Tomcat_Home}/conf/server.xml.
+      <ul>
+         <li>Find the end-of-section marker </GlobalNamingResources> and add the following lines just above it:</li>
+      </ul>
+
+        <pre STYLE="{font-style:italic}">
+        &lt;!-- Global Datasource for Derby ajaxdastest database --&gt;
+        &lt;Resource name="jdbc/ajaxdastest"
+                  type="javax.sql.DataSource" auth="Container"
+                  description="Derby database for DAS Advanced sample"
+                  maxActive="100" maxIdle="30" maxWait="10000"
+                  username="" password=""
+                  driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+                  url="jdbc:derby:{absolute path}Databases/ajaxdastest;create=true"/&gt;
+        </pre>
+
+	   <b>Requirement:</b> You must include the absolute path to the <i>Databases</i> directory in the above url attribute. <br/>
+       Fore example:  url="jdbc:derby:c:\apache-tomcat-6.0.13\Databases/ajaxdastest;create=true "
+       <p/>
+   </li>
+   <li>Start tomcat and point your browser to: <a href="http://localhost:8080/sample-advanced-webapp/">http://localhost:8080/sample-advanced-webapp/</a></li>
+</ul>
+
+<h3>Set Up - MySQL</h3>
+
+<ul>
+   <li>Download and install the most recent stable version of Tomcat 5.5 or Tomcat 6.  You can find it here: http://tomcat.apache.org/download-60.cgi</li>
+   <li>Download the most recent official release of MySQL. The only file you'll need from this download is mysql(version).jar (e.g. mysql-connector-java-5.0.4.jar) </li>
+   <li>Stop Tomcat</li>
+   <li>Copy mysql(version).jar (from the MySQL distribution) to {Tomcat_Home}/common/lib (for Tomcat 5.5) or to {Tomcat_Home}/lib (for Tomcat 6) - e.g. mysql-connector-java-5.0.4.jar.</li>
+   <li>Add the sample war file to {Tomcat_Home}/webapps
+      <ul>
+         <li>sample-advanced-webapp.war</li>
+      </ul>
+   </li>
+   <li>Define a DataSource by adding a datasource definition to {Tomcat_Home}/conf/server.xml.
+      <ul>
+         <li>Find the end-of-section marker </GlobalNamingResources> and add the following lines just above it:</li>
+      </ul>
+
+        <pre STYLE="{font-style:italic}">
+        &lt;!-- Global Datasource for MySQL ajaxdastest database --&gt;
+        &lt;Resource name="jdbc/ajaxdastest"
+                  type="javax.sql.DataSource" auth="Container"
+                  description="MySQL database for DAS Advanced sample"
+                  maxActive="100" maxIdle="30" maxWait="10000"
+                  username="dastest" password="dastest"
+                  driverClassName="com.mysql.jdbc.Driver"
+                  url="jdbc:mysql://localhost/ajaxdastest?createDatabaseIfNotExist=true"/&gt;
+        </pre>
+
+	   <b>Requirement:</b> MySQL service should be up with configured port open for TCPIP communication.
+       <br>
+       <br>
+       As the new utility, dbConfig is embedded in this sample war, the MySQL database "dastest" will get created with
+       required tables and data when the web application gets loaded for the first time in tomcat. Please note that,
+       in the binary distribution, WEB-INF/classes/CompanyWebDBConfig.xml has SQL Table creation syntax for Derby.
+       To make it compatible to MySQL, simply replace GENERATED ALWAYS AS IDENTITY with AUTO_INCREMENT for all
+       table creation statements. (For this unjar the .war, change CompanyWebDBConfig.xml and jar the .war
+       back with changed CompanyWebDBConfig.xml)
+       <br>
+       <br>
+   </li>
+   <li>Start tomcat and point your browser to: <a href="http://localhost:8080/sample-advanced-webapp/">http://localhost:8080/sample-advanced-webapp/</a></li>
+</ul>
+
+
+<h2>Sample Architecture</h2>
+
+<p>The design is modular and reusable by other web samples. There are java servlet, other java classes, jsp, javascript, xml, xsl, css and html files.</p>
+
+<h3><u>Client Side Files</u></h3>
+
+<h4><u>Javascripts</u></h4>
+
+<p></p>
+
+<ul>
+    <li><b>Ajax.js:</b> <br>
+        Ajax.js and dasmenu.js are generic (not DAS specific) and reusable by any web sample.</li>
+    <li><b>Dasmenu.js:</b> <br>
+        Set response handler when request is passed to servlet. Response handler's  job is transform xml response using xsl into html or plain text based on the example�s requirement.</li>
+</ul>
+
+<p>Used for menu/submenu rendering, is quite generic and can be used to display any menu.</p>
+
+<h4><u>HTMLs & jsps (DAS specific files)</u></h4>
+
+<ul>
+    <li><b>DASMenu.html</b> and <b>DASWebSampleFrame.html</b> are for giving frame and menu to web sample. DASMenu.html calls required .jsps like indexAdhoc.jsp, indexCommand.jsp, occ.jsp, converter.jsp. These jsps are all DAS specific. The .jsp file is responsible for deciding the DAS config file required by current sample and relevant .xsl file.</li>
+</ul>
+
+
+<h4><u>Serverside files</u></h4>
+
+<ul>
+   <li><b>CommandServlet.java</b> and <b>ServiceProcessor.java</b> <br>
+       Used for invoking required service and returning results back to ajax.js. These files are not DAS specific.</li>
+
+   <li><b>DASQueryProcessor.java</b> <br>
+       Specific to DAS sample, has logic to invoke required sample example.</li>
+</ul>
+\ No newline at end of file
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java b/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
new file mode 100644
index 0000000000..86b83be235
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
@@ -0,0 +1,464 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.samples.das;
+
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.exception.OptimisticConcurrencyException;
+import org.apache.tuscany.samples.web.ServiceProcessor;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.XMLHelper;
+
+public class DASQueryProcessor extends ServiceProcessor{
+	private DAS das = null;
+	private Command read = null;
+	private Random generator = new Random();
+	private String configFile = null;
+
+	private static DateFormat myformat = new SimpleDateFormat("yyyy.MM.dd");
+    private static Date kbday;
+    private static Date tbday;
+
+	public String execute(String queryOrcommand, String configFile) throws Exception{
+    	String status = null;
+    	this.configFile = configFile;
+
+		try{
+        	Properties props = validate(queryOrcommand);
+
+        	if(props != null){
+        		status = this.getResult((String)props.values().iterator().next(),
+        			(String)props.keys().nextElement());
+        	}
+
+    		if(queryOrcommand.startsWith("occ:")){
+    			status = this.getOcc();
+    		}
+
+    		if(queryOrcommand.startsWith("converter:")){
+    			status = this.getConverter(queryOrcommand.substring(10));
+    		}
+
+    		if(queryOrcommand.startsWith("rss:")){
+    			status = this.getRss(queryOrcommand.substring(4));
+    		}
+        }catch(Exception e){
+        	das.releaseResources();
+        	e.printStackTrace();
+        	throw e;
+        }
+        das.releaseResources();
+        return status ;
+	}
+
+	private Properties validate(String queryOrcommand) throws Exception{
+		if(queryOrcommand == null){
+			throw new Exception("Invalid Command URL -> COMMAND is NULL");
+		}
+
+		if(queryOrcommand.startsWith("query:")){
+			String qry = queryOrcommand.substring(6);
+			if(qry == null || qry.trim().length() == 0){
+				throw new Exception("Invalid Command URL -> COMMAND is NULL");
+			}
+			else{
+				Properties props = new Properties();
+				props.put("query", qry);
+				return props;
+			}
+		}
+
+		if(queryOrcommand.startsWith("command:")){
+			String cmd = queryOrcommand.substring(8);
+			if(cmd == null || cmd.trim().length() == 0){
+				throw new Exception("Invalid Command URL -> COMMAND is NULL");
+			}
+			else{
+				Properties props = new Properties();
+				props.put("command", cmd);
+				return props;
+			}
+		}
+
+
+		return null;
+	}
+
+	/*For any query starting with query: or command: */
+    private String getResult(String qry, String qryOrCommand) throws Exception {
+    	getDAS();
+    	DataObject root = runCommand(qry, qryOrCommand);
+    	//BOOK, COMPANY, DEPARTMENT, CUSTOMER
+    	Vector elemNames = new Vector();
+    	if(root.getList("BOOK") != null && root.getList("BOOK").size() >0){
+    		elemNames.add("BOOK");
+    	}
+    	if(root.getList("COMPANY") != null && root.getList("COMPANY").size() >0){
+    		elemNames.add("COMPANY");
+    	}
+		if(root.getList("DEPARTMENT") != null && root.getList("DEPARTMENT").size() >0){
+			elemNames.add("DEPARTMENT");
+		}
+		if(root.getList("CUSTOMER") != null && root.getList("CUSTOMER").size() >0){
+			elemNames.add("CUSTOMER");
+		}
+
+    	return formatResult(root, elemNames);
+
+    }
+
+    /* Get DAS config */
+	private InputStream getConfig(String fileName) {
+        return getClass().getClassLoader().getResourceAsStream(fileName);
+    }
+
+	/* Instantiate DAS*/
+	private void getDAS(){
+        das = DAS.FACTORY.createDAS(getConfig(configFile));
+	}
+
+	/*For any query starting with query: or command: */
+	private DataObject runCommand(String qry, String qryOrCommand)throws Exception{
+        DataObject root = null;
+
+        //adhoc queries
+		if(qryOrCommand.startsWith("query")){//query can come single or batch, when batch, it will be {}{}
+			if(!qry.startsWith("{")){
+				read = das.createCommand(qry);
+				root = read.executeQuery();
+			}
+			else{
+				Vector batch = formQueries(qry);//separate {}{} in different queries
+
+				if(batch != null){
+					for(int i=0; i<batch.size(); i++){
+						String curQry = (String) batch.get(i);
+						if(curQry.substring(0, 6).equalsIgnoreCase("select")){
+							read = das.createCommand(curQry);
+							root = read.executeQuery();
+						}
+						else{
+							read = das.createCommand(curQry);
+							read.execute();
+						}
+					}
+				}
+			}
+        }
+
+		//DAS config commands
+		if(qryOrCommand.startsWith("command")){
+			String methodName = "get"+qry; //some convention to form method name instead of lenghtening code
+
+			Method commandMethod = this.getClass().getMethod(methodName, new Class[]{String.class});
+			root = (DataObject)commandMethod.invoke(this, new Object[] {qry});
+        }
+        return root;
+	}
+
+	/* Separate batch of queries into vector of queries - for adhoc*/
+	private Vector formQueries(String qry){
+		Vector batch = new Vector();
+		StringTokenizer strTok = new StringTokenizer(qry, "{");
+		while(strTok.hasMoreTokens()){
+			String curQry = strTok.nextToken();
+			curQry = curQry.substring(0, curQry.length()-1);
+			batch.add(curQry);
+		}
+		return batch;
+	}
+
+    public static String formatResult(DataObject root, Vector elementNames){
+    	String xmlStr = "";
+    	XMLHelper helper = XMLHelper.INSTANCE;
+    	for(int elemCount=0; elemCount<elementNames.size(); elemCount++){
+    		String curElemName = (String)elementNames.get(elemCount);
+        	List elemList = root.getList(curElemName);
+        	for(int i=0; i<elemList.size(); i++){
+        		DataObject curComp = (DataObject)elemList.get(i);
+        		xmlStr = xmlStr+helper.save(curComp,null, curElemName);
+
+            	//System.out.println("xmlStr:"+xmlStr);
+
+            	//format xmlstr
+            	while(true){
+                	String rmvStr = "<?xml version=\"1.0\" encoding=\"ASCII\"?>";
+                	int idx = xmlStr.indexOf("<?xml version", 0);
+                	if(idx == -1) break;
+                	xmlStr = xmlStr.substring(0, idx)+xmlStr.substring(idx+rmvStr.length());
+
+                	rmvStr = "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
+                	idx = xmlStr.indexOf("xmlns:xsi=", 0);
+                	if(idx == -1) break;
+                	xmlStr = xmlStr.substring(0, idx)+xmlStr.substring(idx+rmvStr.length());
+
+                	rmvStr = "xmlns:das=\"http:///org.apache.tuscany.das.rdb/das\"";
+                	idx = xmlStr.indexOf("xmlns:das=", 0);
+                	if(idx == -1) break;
+                	xmlStr = xmlStr.substring(0, idx)+xmlStr.substring(idx+rmvStr.length());
+
+                	//System.out.println("xmlStr:"+xmlStr);
+            	}
+
+            	while(true){
+                	String rmvStr =  "xsi:type=\"";
+                	int idx = xmlStr.indexOf(rmvStr, 0);
+                	if(idx == -1) break;
+                	int idxEnd = xmlStr.indexOf("\"", idx+rmvStr.length());
+                	xmlStr = xmlStr.substring(0, idx)+xmlStr.substring(idxEnd+1);
+
+                	//System.out.println("xmlStr:"+xmlStr);
+            	}
+        	}
+    	}
+
+		String add0Str = "<?xml version='1.0' encoding='ISO-8859-1' ?>\n";
+		String add1Str = "<root  xmlns:das='http://org.apache.tuscany.das.rdb/config.xsd'  xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\n";
+		String add2Str = "<das:DataGraphRoot>";
+		String addEndStr = "</das:DataGraphRoot> </root>";
+
+		xmlStr = add0Str+add1Str+add2Str+xmlStr+"\n"+addEndStr;
+		return xmlStr;
+    }
+
+    //below has improper serialization due to SDO bugs
+	/*From DataGraph get contents related to element <das:DataGraphRoot>*/
+	/*private String xmlizeContent(DataGraph graph) throws Exception{
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+        ObjectOutputStream oos = new ObjectOutputStream(out);
+        oos.writeObject(graph);
+        oos.flush();
+        out.flush();
+        //oos.close();
+        out.close();
+
+        //there are UTF-8 chars which are not ISO-8859-1 ones and xsl transformation does not happen due to that
+        //so filter unwanted.
+        byte[] graphBytes = out.toByteArray();
+        InputStreamReader graphBytesFilter = new InputStreamReader(new ByteArrayInputStream(graphBytes),"ISO-8859-1");
+        char[] graphChars = new char[graphBytes.length];
+        int curChar = -1;
+        int j=0;
+        while((curChar = graphBytesFilter.read()) != -1){
+        	graphChars[j] = (char)curChar;
+        	j++;
+        }
+
+        String finalStr = new String(graphChars);
+
+        //remove any junk before first <
+        finalStr = finalStr.substring(finalStr.indexOf("<"), finalStr.indexOf("</sdo:datagraph>")+16);
+        String xmlSerializationContent = filterJunk(finalStr);//further remove extra characters appearing
+        System.out.println("xmlSerializationContent:"+xmlSerializationContent);
+        String xmlContent = XmlUtil.getXmlContents(xmlSerializationContent, "<das:DataGraphRoot>", "</das:DataGraphRoot>");
+        System.out.println("xmlContent:"+xmlContent);
+        return xmlContent;
+	}
+
+	//for some reason control chars are appearing, need to filter those
+    //this is ugly solution, need to know why from SDO DataGraph these
+	//chars are coming in the first place.
+	private String filterJunk(String inStr){
+        char[] myCharArr  = inStr.toCharArray();
+        StringBuffer strBuf = new StringBuffer();
+
+        for(int i=0; i<myCharArr.length; i++){
+        	if((myCharArr[i]>=33 && myCharArr[i]<=125) ||
+        			Character.isWhitespace(myCharArr[i])){
+        		strBuf.append(myCharArr[i]);
+        	}
+        }
+        return strBuf.toString();
+	}*/
+
+    /* Start CRUD example */
+    public DataObject getAllCompanies(String qry) {
+    	read = das.getCommand(qry);
+        DataObject root = read.executeQuery();
+        return root;
+    }
+
+    public DataObject getAllCompaniesAndDepartments(String qry) {
+    	read = das.getCommand(qry);
+        DataObject root = read.executeQuery();
+        return root;
+    }
+
+    public DataObject getAddDepartmentToFirstCompany(String qry) {
+        Command read = das.getCommand("AllCompaniesAndDepartments");
+        DataObject root = read.executeQuery();
+        DataObject firstCompany = root.getDataObject("COMPANY[1]");
+
+        DataObject newDepartment = root.createDataObject("DEPARTMENT");
+        newDepartment.setString("NAME", "Default Name");
+        List deptList = firstCompany.getList("departments");
+
+        deptList.add(newDepartment);
+        das.applyChanges(root);
+
+        root = read.executeQuery();
+        return root;
+    }
+
+    public DataObject getDeleteDepartmentFromFirstCompany(String qry) {
+        Command read = das.getCommand("AllCompaniesAndDepartments");
+        DataObject root = read.executeQuery();
+        DataObject firstCompany = root.getDataObject("COMPANY[1]");
+
+        List departments = firstCompany.getList("departments");
+        DataObject departmentToDelete = (DataObject)departments.get(departments.size()-1);
+        departmentToDelete.delete();
+        das.applyChanges(root);
+        root = read.executeQuery();
+        return root;
+    }
+
+    public  DataObject getUpdateCompanyDepartmentNames(String qry) {
+        Command read = das.getCommand("AllCompaniesAndDepartments");
+        DataObject root = read.executeQuery();
+        DataObject firstCompany = root.getDataObject("COMPANY[1]");
+
+        Iterator i = firstCompany.getList("departments").iterator();
+
+        DataObject department;
+        while (i.hasNext()) {
+            department = (DataObject) i.next();
+            String newName = getRandomDepartmentName();
+            department.setString("NAME", newName);
+            break;
+        }
+        das.applyChanges(root);
+
+        root = read.executeQuery();
+        return root;
+    }
+
+    /* @return random new department name    */
+    private String getRandomDepartmentName() {
+        int number = generator.nextInt(1000) + 1;
+        return "Dept-" + number;
+    }
+    /*End CRUD example */
+
+    /*Start OCC example */
+    public String getOcc() throws Exception{
+    	getDAS();
+    	Command select = das.createCommand("Select * from BOOK where BOOK_ID = 1");
+        DataObject root = select.executeQuery();
+        // Explicitly update the DB to force a collision
+        Command update = das.createCommand("update BOOK set NAME = 'Puss in Hat' where BOOK_ID = 1");
+        update.execute();
+        DataObject book = root.getDataObject("BOOK[1]");
+
+        // Modify customer
+        book.set("NAME", "Puss in Bat");
+
+        // Build apply changes command
+        try {
+            das.applyChanges(root);
+        } catch (OptimisticConcurrencyException ex) {
+            if (!ex.getMessage().equals("An update collision occurred")) {
+                throw ex;
+            }
+            else{
+            	return ex.getMessage();
+            }
+        }
+        return "Success";
+    }
+    /* End OCC example */
+
+    /* Start Result Set Shape example*/
+    public String getRss(String stmt) throws Exception{
+    	getDAS();
+    	read = das.getCommand(stmt);
+		//Read
+		DataObject root = read.executeQuery();
+		Vector elemNames = new Vector();
+		elemNames.add("CUSTOMER");
+		return formatResult(root, elemNames);
+    }
+    /* End Result Set Shape example*/
+
+    /*Converter example start*/
+    static {
+        try {
+            kbday = myformat.parse("1957.09.27");
+            tbday = myformat.parse("1966.12.20");
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public String getConverter(String stmt) throws Exception{
+    	getDAS();
+		read = das.getCommand("testArbitraryConverter");
+		//Read
+		DataObject root = read.executeQuery();
+
+    	if(stmt.equals("stmt0")){//Select * from CUSTOMER where ID = 1;
+    		Vector elemNames = new Vector();
+    		elemNames.add("CUSTOMER");
+    		return this.formatResult(root, elemNames);
+    	}
+
+    	if(stmt.equals("stmt1")){//Check First Customer's LastName is 1957.09.27
+    		return myformat.format(root.getDate("CUSTOMER[1]/LASTNAME"));
+    	}
+
+    	if(stmt.equals("stmt2")||stmt.equals("stmt3")){//Set First Customer's LastName to 1966.12.20 OR
+    												//Check First Customer's LastName is 1966.12.20
+    		root.setDate("CUSTOMER[1]/LASTNAME", tbday);
+    		das.applyChanges(root);
+            // Read
+            root = read.executeQuery();
+    		return myformat.format(root.getDate("CUSTOMER[1]/LASTNAME"));
+    	}
+
+        return null;
+    }
+    /* Converter example end**/
+
+    /*For test*/
+    public static void main(String[] args){
+    	DASQueryProcessor qryProc = new DASQueryProcessor();
+    	try{
+    		qryProc.execute("command:AllCompaniesAndDepartments", "DasConfig.xml");
+    	}catch(Exception e){
+    		e.printStackTrace();
+    	}
+
+    }
+
+}
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/SillyDateStringConverter.java b/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/SillyDateStringConverter.java
new file mode 100644
index 0000000000..f1fe21cfd4
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/SillyDateStringConverter.java
@@ -0,0 +1,75 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.samples.das;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.tuscany.das.rdb.Converter;
+
+public class SillyDateStringConverter implements Converter {
+
+    private static DateFormat myformat = new SimpleDateFormat("yyyy.MM.dd");
+
+    private static Date kbday;
+
+    private static Date tbday;
+
+    public SillyDateStringConverter() {
+        super();
+    }
+
+    static {
+        try {
+            kbday = myformat.parse("1957.09.27");
+            tbday = myformat.parse("1966.12.20");
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public Object getPropertyValue(Object columnData) {
+        if (columnData.equals("Pavick")) {
+            return kbday;
+        }
+
+        if (columnData.equals("Williams")) {
+            return tbday;
+        }
+
+        throw new IllegalArgumentException();
+
+    }
+
+    public Object getColumnValue(Object propertyData) {
+        if (propertyData.equals(kbday)) {
+            return "Pavick";
+        }
+
+        if (propertyData.equals(tbday)) {
+            return "Williams";
+        }
+
+        throw new IllegalArgumentException();
+
+    }
+
+}
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/StringToLongConverter.java b/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/StringToLongConverter.java
new file mode 100644
index 0000000000..fc26164191
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/StringToLongConverter.java
@@ -0,0 +1,37 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.samples.das;
+
+import org.apache.tuscany.das.rdb.Converter;
+
+public class StringToLongConverter implements Converter {
+
+    public StringToLongConverter() {
+        super();
+    }
+
+    public Object getPropertyValue(Object columnData) {
+        return new Long(columnData.toString());
+    }
+
+    public Object getColumnValue(Object columnData) {
+        return columnData.toString();
+    }
+
+}
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/util/XmlUtil.java b/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/util/XmlUtil.java
new file mode 100644
index 0000000000..9a615fa33c
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/util/XmlUtil.java
@@ -0,0 +1,58 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.samples.das.util;
+/**
+ * 
+ * XML utilities
+ *
+ */
+public class XmlUtil {
+	/**
+	 * From the complete serialized DataGraph, get the required portion
+	 *relevant to <das:DataGraphRoot> element.
+	 */    
+    public static String getXmlContents(String xmlString, String xmlStartElement, String xmlEndElement){
+        int posStartElement = xmlString.indexOf(xmlStartElement);
+        int posEndElement = xmlString.indexOf(xmlEndElement) ;
+        
+        //check if startElement was not found
+        if(posStartElement == -1)
+            posStartElement = 0;
+        
+        //check if endElement was not found
+        if(posEndElement == -1)
+            posEndElement = xmlString.length();
+        else
+            //fixup the posEndElement to return the closing element tag
+            posEndElement += + xmlEndElement.length();
+        
+        //return xml contents for the requested element
+        String xmlBody = xmlString.substring(posStartElement, posEndElement);
+        
+        
+        String result = 
+        "<?xml version='1.0' encoding='ISO-8859-1' ?> \n"+
+        "<root  xmlns:das='http://org.apache.tuscany.das.rdb/config.xsd' "+ 
+        " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> \n"+
+        xmlBody+" </root>";
+        
+        return result;
+    }
+
+}
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java b/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
new file mode 100644
index 0000000000..ffab0d107b
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
@@ -0,0 +1,160 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.samples.web;
+
+import java.io.IOException;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.tuscany.das.rdb.dbconfig.DBInitializer;
+/**
+ * This is generic servlet where based on serviceName, it will call the speciliazed processor to
+ * process request and obtain response. This servlet can be used in any web sample, just needs to 
+ * pass appropriate serviceProcessorClassName and rest is generic 
+ *
+ */
+public class CommandServlet extends HttpServlet {
+    final static long serialVersionUID = 1221332432;
+	/*
+     * (non-Java-doc)
+     * 
+     * @see javax.servlet.http.HttpServlet#HttpServlet()
+     */
+    public CommandServlet() {
+        super();
+    }
+    
+    public static void refreshDB() throws ServletException {
+    	try{
+    		DBInitializer dbInitializer = new DBInitializer("AjaxDBConfig.xml");
+	    	dbInitializer.refreshDatabaseData();
+		}catch(Exception e){
+			e.printStackTrace();
+			ServletException se = new ServletException(e.getMessage());
+			throw se;
+		}
+    }
+
+    public void init(ServletConfig config) throws ServletException { 
+    	refreshDB();
+    }
+    
+    /*
+     * (non-Java-doc)
+     * 
+     * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest arg0,
+     *      HttpServletResponse arg1)
+     */
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doTask(request, response);
+    }
+
+    /*
+     * (non-Java-doc)
+     * 
+     * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest arg0,
+     *      HttpServletResponse arg1)
+     */
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doTask(request, response);
+    }
+
+    /**Invoke passed service and return result
+     * 
+     * @param req
+     * @param resp
+     * @throws ServletException
+     * @throws IOException
+     */
+	public void doTask(HttpServletRequest req, HttpServletResponse resp)
+		throws ServletException, IOException {
+		String textContentType= "text/text";
+		String xmlContentType= "text/xml";
+		
+		String refreshRequest = req.getParameter("refreshDB"); 
+		if(refreshRequest != null && refreshRequest.equals("yes")){
+			{
+				try{
+					refreshDB();
+				}catch(ServletException e){
+					throw e;
+				}
+			}
+			this.writeResponse(resp, "Refreshed database!", textContentType);			
+		}
+		else{
+			String serviceName = req.getParameter("serviceName");//e.g. DASQueryProcessor
+			String qry = req.getParameter("Query");//e.g. query:xxx, command:yyy
+			String configFile = req.getParameter("configFile");//name of DAS config file
+			
+			try{
+				ServiceProcessor serviceClassInst = null;
+				//so any subclass of abstract ServiceProcessor can be used
+				Object obj = Class.forName(serviceName).newInstance();
+				
+				if(obj instanceof ServiceProcessor){
+					serviceClassInst = (ServiceProcessor)obj;
+				}
+				
+				String result = serviceClassInst.execute(qry, configFile);
+				this.writeResponse(resp, result, xmlContentType);
+			}catch(Exception e){
+				this.writeResponse(resp, e.getMessage(), textContentType);
+				e.printStackTrace();
+			}			
+		}
+	}
+
+	/**Write response in required content type to servlet response
+	 * 
+	 * @param resp
+	 * @param output
+	 * @param contentType
+	 * @throws IOException
+	 */
+	public void writeResponse(HttpServletResponse resp, String output, String contentType) throws IOException {
+		resp.setContentType(contentType);//"text/text", "text/xml"
+		resp.setHeader("Cache-Control", "no-cache");
+		resp.getWriter().write(output);		
+	}
+	
+    // Utility methods
+
+    public void gotoURL(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response, String url) throws ServletException, IOException {
+        url = response.encodeURL(url);
+        RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url);
+        dispatcher.forward(request, response);
+    }
+
+    public void redirectURL(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response, String url) throws ServletException, IOException {
+        url = response.encodeURL(request.getContextPath() + url);
+        response.sendRedirect(url);
+    }
+
+    public void forwardURL(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response, String url) throws ServletException, IOException {
+        url = response.encodeURL(url);
+        RequestDispatcher dispatch = getServletContext().getRequestDispatcher(url);
+        dispatch.forward(request, response);
+    }    
+}
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/ServiceProcessor.java b/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/ServiceProcessor.java
new file mode 100644
index 0000000000..aefebb8808
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/ServiceProcessor.java
@@ -0,0 +1,24 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.samples.web;
+
+//generic processor
+public abstract class ServiceProcessor {
+	public abstract String execute(String  command, String configFile) throws Exception;
+}
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/resources/AjaxDBConfig.xml b/das-java/trunk/samples/advanced-webapp/src/main/resources/AjaxDBConfig.xml
new file mode 100644
index 0000000000..f172c089c9
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/resources/AjaxDBConfig.xml
@@ -0,0 +1,52 @@
+<?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.
+ -->
+<DBConfig xmlns="http:///org.apache.tuscany.das.rdb/dbconfig.xsd">
+    
+    <!--Uncomment below for web container derby database setup-->
+	<ConnectionInfo dataSource="java:comp/env/jdbc/ajaxdastest">
+	</ConnectionInfo>
+				        
+    <!--<ConnectionInfo>
+		<ConnectionProperties 
+			driverClass="org.apache.derby.jdbc.EmbeddedDriver" 
+			databaseURL="jdbc:derby:target/dastest; create = true" 
+			loginTimeout="600000"/>
+	</ConnectionInfo>-->
+					        
+	<Table name="COMPANY" SQLCreate="CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY, NAME VARCHAR(30))">
+		<row>'ACME Publishing'</row>
+		<row>'Do-rite plumbing'</row>
+		<row>'MegaCorp'</row>
+	</Table>
+	
+	<Table name="DEPARTMENT" SQLCreate="CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY, NAME VARCHAR(30),LOCATION VARCHAR(30), DEPNUMBER VARCHAR(10),COMPANYID INT)">
+		<row>'Advanced Technologies', 'NY', '123', 1</row>
+	</Table>
+	
+	<Table name="CUSTOMER" SQLCreate="CREATE TABLE CUSTOMER (ID INT PRIMARY KEY NOT NULL,LASTNAME VARCHAR(30),ADDRESS VARCHAR(10) )">
+		<row>1, 'Pavick', 'CA'</row>
+		<row>2, 'Williams', 'NJ'</row>
+	</Table>
+			
+	<Table name="BOOK" SQLCreate="CREATE TABLE BOOK (BOOK_ID INT PRIMARY KEY NOT NULL,NAME VARCHAR(30),AUTHOR VARCHAR(30),QUANTITY INT, OCC INT )">
+		<row>1, 'The Brothers Karamazov', 'Fyodor Dostoevsky',5, 17</row>
+	</Table>
+						        
+</DBConfig>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/resources/CustomerConfigWithConverter.xml b/das-java/trunk/samples/advanced-webapp/src/main/resources/CustomerConfigWithConverter.xml
new file mode 100644
index 0000000000..0ef0c5b9b1
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/resources/CustomerConfigWithConverter.xml
@@ -0,0 +1,34 @@
+<?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 dataSource="java:comp/env/jdbc/ajaxdastest"/>
+    
+	<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.samples.das.SillyDateStringConverter"/>
+  </Table>
+	
+</Config>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/resources/CustomerConfigWithIDConverter.xml b/das-java/trunk/samples/advanced-webapp/src/main/resources/CustomerConfigWithIDConverter.xml
new file mode 100644
index 0000000000..f26082a340
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/resources/CustomerConfigWithIDConverter.xml
@@ -0,0 +1,33 @@
+<?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 dataSource="java:comp/env/jdbc/ajaxdastest"/>
+    
+ 	<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.samples.das.StringToLongConverter"/>
+  </Table>
+	
+</Config>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/resources/DasConfig.xml b/das-java/trunk/samples/advanced-webapp/src/main/resources/DasConfig.xml
new file mode 100644
index 0000000000..69ac31895c
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/resources/DasConfig.xml
@@ -0,0 +1,45 @@
+<?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 xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    
+    <ConnectionInfo dataSource="java:comp/env/jdbc/ajaxdastest"/>
+
+    <Command name="AllCompanies" SQL="select * from COMPANY" kind="Select"/>
+    
+    <Command name="AllCompaniesAndDepartments" SQL="select * from COMPANY left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID" 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="BOOK">
+		<Column columnName="BOOK_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/das-java/trunk/samples/advanced-webapp/src/main/resources/META-INF/LICENSE b/das-java/trunk/samples/advanced-webapp/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000000..fb4df3722c
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,353 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+===============================================================================================================
+
+Other components and dependencies under Apache Software License 2.0 : 
+
+   log4j-1.2.14.jar    - Apache Logging Services
+   derby 10.2.2.0.jar  - Apache Derby
+   stax-api-1.0.1.jar  - The Streaming API for XML (StAX)
+   wstx-asl-3.2.0.jar  - WoodStox StAX implementation
+   standard-1.1.1.jar  - The Apache Jackarta Taglibs
+   jstl-1.1.2.jar      - The Apache Jackarta Taglibs
+   *.tld               - The Apache Jackarta Taglibs
+
+===============================================================================================================
+
+
+Apache Tuscany SDO for Java Subcomponents
+=========================================: 
+
+The Tuscany SDO for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
+
+Permission to copy, make derivative works of, and distribute the Service Data Objects 
+JavaDoc and Interface Definition Files files in any medium without fee or royalty as part 
+of a compliant implementation of the Service Data Objects Specification is hereby granted.  
+The Service Data Objects Specification may be found at any of the following locations:
+
+http://dev2dev.bea.com/technologies/commonj/index.jsp
+http://www.ibm.com/developerworks/library/specification/ws-sdo/
+http://oracle.com/technology/webservices/sca
+https://www.sdn.sap.com/
+http://www.xcalia/xdn/specs/sdo
+
+THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES 
+ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS 
+SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES AND THE IMPLEMENTATION OF THEIR CONTENTS, 
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE 
+SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or 
+publicity pertaining to the Service Component Architecture Specification or its contents without specific, 
+written prior permission. Title to copyright in the Service Data Objects Specification and the 
+JavaDoc and Interface Definition Files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+=================================================================================================================
+
+For the Eclipse EMF components
+(codegen-2.2.3.jar
+codegen-ecore-2.2.3.jar
+common-2.2.3.jar
+ecore-2.2.3.jar
+ecore-change-2.2.3.jar
+ecore-xmi-2.2.3.jar
+xsd-2.2.3.jar)
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+===================================================================================================
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/resources/META-INF/NOTICE b/das-java/trunk/samples/advanced-webapp/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000000..c2cf1f95b4
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,32 @@
+Apache Tuscany SDO for Java
+Copyright 2006, 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Apache Tuscany is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Web Services PMC. Incubation is required of all newly accepted
+projects until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with other successful
+ASF projects. While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be fully endorsed
+by the ASF.
+
+Unless otherwise indicated, all distribution made available by the Apache Software Foundation
+is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
+A copy of the AL is provided with this distribution as the LICENSE.txt file present in the
+root directory, and is also available at http://www.apache.org/licenses/.
+
+The terms and conditions governing the distribution may refer to the AL or other license
+agreements, notices or terms and conditions. Some of these other license agreements may
+include (but are not limited to):
+
+  . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
+
+It is your obligation to read and accept all such terms and conditions prior to use of the
+distribution. If term or condition is provided, please contact the Apache Software Foundation
+to determine what terms and conditions govern that particular distribution.
+
+This product also includes software developed by the Open Service Oriented Architecture organisation
+(http://osoa.org). The license for this software may be found in the LICENSE.txt file contained in this
+distribution.
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/resources/META-INF/README b/das-java/trunk/samples/advanced-webapp/src/main/resources/META-INF/README
new file mode 100644
index 0000000000..d1905ee3e8
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/resources/META-INF/README
@@ -0,0 +1,35 @@
+Apache Tuscany M2 build (October, 2006)
+===================================
+
+http://incubator.apache.org/tuscany/
+
+Tuscany is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Web Services PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness or 
+stability of the code, it does indicate that the project has yet to be fully
+endorsed by the ASF.
+
+
+Support
+-------
+
+Any problem with this release can be reported to the Tuscany mailing list 
+or in the JIRA issue tracker.
+
+Mailing list subscription:
+    tuscany-dev-subscribe@ws.apache.org
+
+Jira:
+    http://issues.apache.org/jira/browse/Tuscany
+
+
+Thank you for using Tuscany!
+
+
+The Tuscany Team. 
+
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/resources/log4j.properties b/das-java/trunk/samples/advanced-webapp/src/main/resources/log4j.properties
new file mode 100644
index 0000000000..7f18e4dc72
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/resources/log4j.properties
@@ -0,0 +1,36 @@
+#  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.
+#  
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=INFO, NULL
+
+# NULL Appender
+log4j.appender.NULL=org.apache.log4j.varia.NullAppender
+
+log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
+log4j.appender.NULL.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n
+
+# CONSOLE is set to be a ConsoleAppender.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n
+
+
+# Print only messages of level WARN or above in the package com.foo.
+log4j.logger.org.apache.tuscany=NONE
+\ No newline at end of file
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/META-INF/context.xml b/das-java/trunk/samples/advanced-webapp/src/main/webapp/META-INF/context.xml
new file mode 100644
index 0000000000..e2da613636
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/META-INF/context.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.
+ -->
+<Context path="/DAS Stand alone app" debug="5" reloadable="true" crossContext="true">
+
+   <Manager pathname=""/>
+   <ResourceLink name="jdbc/ajaxdastest" global="jdbc/ajaxdastest" type="javax.sql.DataSource" />
+                        
+</Context>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/c.tld b/das-java/trunk/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/c.tld
new file mode 100644
index 0000000000..22698c97dc
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/c.tld
@@ -0,0 +1,563 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+    version="2.0">
+    
+  <description>JSTL 1.1 core library</description>
+  <display-name>JSTL core</display-name>
+  <tlib-version>1.1</tlib-version>
+  <short-name>c</short-name>
+  <uri>http://java.sun.com/jsp/jstl/core</uri>
+
+  <validator>
+    <description>
+        Provides core validation features for JSTL tags.
+    </description>
+    <validator-class>
+        org.apache.taglibs.standard.tlv.JstlCoreTLV
+    </validator-class>
+  </validator>
+
+  <tag>
+    <description>
+        Catches any Throwable that occurs in its body and optionally
+        exposes it.
+    </description>
+    <name>catch</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.CatchTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+exception thrown from a nested action. The type of the
+scoped variable is the type of the exception thrown.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+	Simple conditional tag that establishes a context for
+	mutually exclusive conditional operations, marked by
+	&lt;when&gt; and &lt;otherwise&gt;
+    </description>
+    <name>choose</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <description>
+	Simple conditional tag, which evalutes its body if the
+	supplied condition is true and optionally exposes a Boolean
+	scripting variable representing the evaluation of this condition
+    </description>
+    <name>if</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.IfTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+The test condition that determines whether or
+not the body content should be processed.
+        </description>
+        <name>test</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+	<type>boolean</type>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+resulting value of the test condition. The type
+of the scoped variable is Boolean.        
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Retrieves an absolute or relative URL and exposes its contents
+        to either the page, a String in 'var', or a Reader in 'varReader'.
+    </description>
+    <name>import</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.ImportTag</tag-class>
+    <tei-class>org.apache.taglibs.standard.tei.ImportTEI</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+The URL of the resource to import.
+        </description>
+        <name>url</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+resource's content. The type of the scoped
+variable is String.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+resource's content. The type of the scoped
+variable is Reader.
+        </description>
+        <name>varReader</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the context when accessing a relative
+URL resource that belongs to a foreign
+context.
+        </description>
+        <name>context</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Character encoding of the content at the input
+resource.
+        </description>
+        <name>charEncoding</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+	The basic iteration tag, accepting many different
+        collection types and supporting subsetting and other
+        functionality
+    </description>
+    <name>forEach</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.ForEachTag</tag-class>
+    <tei-class>org.apache.taglibs.standard.tei.ForEachTEI</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Collection of items to iterate over.
+        </description>
+	<name>items</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+        <description>
+If items specified:
+Iteration begins at the item located at the
+specified index. First item of the collection has
+index 0.
+If items not specified:
+Iteration begins with index set at the value
+specified.
+        </description>
+	<name>begin</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+If items specified:
+Iteration ends at the item located at the
+specified index (inclusive).
+If items not specified:
+Iteration ends when index reaches the value
+specified.
+        </description>
+	<name>end</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration will only process every step items of
+the collection, starting with the first one.
+        </description>
+	<name>step</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+current item of the iteration. This scoped
+variable has nested visibility. Its type depends
+on the object of the underlying collection.
+        </description>
+	<name>var</name>
+	<required>false</required>
+	<rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+status of the iteration. Object exported is of type
+javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+visibility.
+        </description>
+	<name>varStatus</name>
+	<required>false</required>
+	<rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+	Iterates over tokens, separated by the supplied delimeters
+    </description>
+    <name>forTokens</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.ForTokensTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+String of tokens to iterate over.
+        </description>
+	<name>items</name>
+	<required>true</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>java.lang.String</type>
+    </attribute>
+    <attribute>
+        <description>
+The set of delimiters (the characters that
+separate the tokens in the string).
+        </description>
+	<name>delims</name>
+	<required>true</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>java.lang.String</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration begins at the token located at the
+specified index. First token has index 0.
+        </description>
+	<name>begin</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration ends at the token located at the
+specified index (inclusive).
+        </description>
+	<name>end</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration will only process every step tokens
+of the string, starting with the first one.
+        </description>
+	<name>step</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+current item of the iteration. This scoped
+variable has nested visibility.
+        </description>
+	<name>var</name>
+	<required>false</required>
+	<rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+status of the iteration. Object exported is of
+type
+javax.servlet.jsp.jstl.core.LoopTag
+Status. This scoped variable has nested
+visibility.
+        </description>
+	<name>varStatus</name>
+	<required>false</required>
+	<rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Like &lt;%= ... &gt;, but for expressions.
+    </description> 
+    <name>out</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.OutTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Expression to be evaluated.
+        </description>
+        <name>value</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Default value if the resulting value is null.
+        </description>
+        <name>default</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Determines whether characters &lt;,&gt;,&amp;,'," in the
+resulting string should be converted to their
+corresponding character entity codes. Default value is
+true.
+        </description>
+        <name>escapeXml</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+
+  <tag>
+    <description>
+        Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
+        and runs only if all of the prior conditions evaluated to
+        'false'
+    </description>
+    <name>otherwise</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <description>
+        Adds a parameter to a containing 'import' tag's URL.
+    </description>
+    <name>param</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.ParamTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the query string parameter.
+        </description>
+        <name>name</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Value of the parameter.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Redirects to a new URL.
+    </description>
+    <name>redirect</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.RedirectTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+The URL of the resource to redirect to.
+        </description>
+        <name>url</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the context when redirecting to a relative URL
+resource that belongs to a foreign context.
+        </description>
+        <name>context</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Removes a scoped variable (from a particular scope, if specified).
+    </description>
+    <name>remove</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.RemoveTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+        <description>
+Name of the scoped variable to be removed.
+        </description>
+        <name>var</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+ <tag>
+    <description>
+        Sets the result of an expression evaluation in a 'scope'
+    </description>
+    <name>set</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.SetTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the exported scoped variable to hold the value
+specified in the action. The type of the scoped variable is
+whatever type the value expression evaluates to.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Expression to be evaluated.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Target object whose property will be set. Must evaluate to
+a JavaBeans object with setter property property, or to a
+java.util.Map object.
+        </description>
+        <name>target</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the property to be set in the target object.
+        </description>
+        <name>property</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Creates a URL with optional query parameters.
+    </description>
+    <name>url</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.UrlTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+processed url. The type of the scoped variable is
+String.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+URL to be processed.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the context when specifying a relative URL
+resource that belongs to a foreign context.
+        </description>
+        <name>context</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+	Subtag of &lt;choose&gt; that includes its body if its
+	condition evalutes to 'true'
+    </description>
+    <name>when</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.WhenTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+The test condition that determines whether or not the
+body content should be processed.
+        </description>
+        <name>test</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+	<type>boolean</type>
+    </attribute>
+  </tag>
+
+</taglib>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/fmt.tld b/das-java/trunk/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/fmt.tld
new file mode 100644
index 0000000000..3b9a54a87d
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/fmt.tld
@@ -0,0 +1,671 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+    version="2.0">
+    
+  <description>JSTL 1.1 i18n-capable formatting library</description>
+  <display-name>JSTL fmt</display-name>
+  <tlib-version>1.1</tlib-version>
+  <short-name>fmt</short-name>
+  <uri>http://java.sun.com/jsp/jstl/fmt</uri>
+
+  <validator>
+    <description>
+        Provides core validation features for JSTL tags.
+    </description>
+    <validator-class>
+        org.apache.taglibs.standard.tlv.JstlFmtTLV
+    </validator-class>
+  </validator>
+
+  <tag>
+    <description>
+        Sets the request character encoding
+    </description>
+    <name>requestEncoding</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.RequestEncodingTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+        <description>
+Name of character encoding to be applied when
+decoding request parameters.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Stores the given locale in the locale configuration variable
+    </description>
+    <name>setLocale</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetLocaleTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+        <description>
+A String value is interpreted as the
+printable representation of a locale, which
+must contain a two-letter (lower-case)
+language code (as defined by ISO-639),
+and may contain a two-letter (upper-case)
+country code (as defined by ISO-3166).
+Language and country codes must be
+separated by hyphen (-) or underscore
+(_).        
+	</description>
+        <name>value</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Vendor- or browser-specific variant.
+See the java.util.Locale javadocs for
+more information on variants.
+        </description>
+        <name>variant</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope of the locale configuration variable.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Specifies the time zone for any time formatting or parsing actions
+        nested in its body
+    </description>
+    <name>timeZone</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.TimeZoneTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+The time zone. A String value is interpreted as
+a time zone ID. This may be one of the time zone
+IDs supported by the Java platform (such as
+"America/Los_Angeles") or a custom time zone
+ID (such as "GMT-8"). See
+java.util.TimeZone for more information on
+supported time zone formats.
+        </description>
+        <name>value</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Stores the given time zone in the time zone configuration variable
+    </description>
+    <name>setTimeZone</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetTimeZoneTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+        <description>
+The time zone. A String value is interpreted as
+a time zone ID. This may be one of the time zone
+IDs supported by the Java platform (such as
+"America/Los_Angeles") or a custom time zone
+ID (such as "GMT-8"). See java.util.TimeZone for
+more information on supported time zone
+formats.
+        </description>
+        <name>value</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable which
+stores the time zone of type
+java.util.TimeZone.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope of var or the time zone configuration
+variable.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Loads a resource bundle to be used by its tag body
+    </description>
+    <name>bundle</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.BundleTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Resource bundle base name. This is the bundle's
+fully-qualified resource name, which has the same
+form as a fully-qualified class name, that is, it uses
+"." as the package component separator and does not
+have any file type (such as ".class" or ".properties")
+suffix.
+        </description>
+        <name>basename</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Prefix to be prepended to the value of the message
+key of any nested &lt;fmt:message&gt; action.
+        </description>
+        <name>prefix</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Loads a resource bundle and stores it in the named scoped variable or
+        the bundle configuration variable
+    </description>
+    <name>setBundle</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+        <description>
+Resource bundle base name. This is the bundle's
+fully-qualified resource name, which has the same
+form as a fully-qualified class name, that is, it uses
+"." as the package component separator and does not
+have any file type (such as ".class" or ".properties")
+suffix.
+        </description>
+        <name>basename</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable which stores
+the i18n localization context of type
+javax.servlet.jsp.jstl.fmt.LocalizationC
+ontext.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope of var or the localization context
+configuration variable.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Maps key to localized message and performs parametric replacement
+    </description>
+    <name>message</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.MessageTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Message key to be looked up.
+        </description>
+        <name>key</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Localization context in whose resource
+bundle the message key is looked up.
+        </description>
+        <name>bundle</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable
+which stores the localized message.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope of var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Supplies an argument for parametric replacement to a containing
+        &lt;message&gt; tag
+    </description>
+    <name>param</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParamTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Argument used for parametric replacement.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Formats a numeric value as a number, currency, or percentage
+    </description>
+    <name>formatNumber</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatNumberTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Numeric value to be formatted.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Specifies whether the value is to be
+formatted as number, currency, or
+percentage.
+        </description>
+        <name>type</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Custom formatting pattern.
+        </description>
+        <name>pattern</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+ISO 4217 currency code. Applied only
+when formatting currencies (i.e. if type is
+equal to "currency"); ignored otherwise.
+        </description>
+        <name>currencyCode</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Currency symbol. Applied only when
+formatting currencies (i.e. if type is equal
+to "currency"); ignored otherwise.
+        </description>
+        <name>currencySymbol</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Specifies whether the formatted output
+will contain any grouping separators.
+        </description>
+        <name>groupingUsed</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Maximum number of digits in the integer
+portion of the formatted output.
+        </description>
+        <name>maxIntegerDigits</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Minimum number of digits in the integer
+portion of the formatted output.
+        </description>
+        <name>minIntegerDigits</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Maximum number of digits in the
+fractional portion of the formatted output.
+        </description>
+        <name>maxFractionDigits</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Minimum number of digits in the
+fractional portion of the formatted output.
+        </description>
+        <name>minFractionDigits</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable
+which stores the formatted result as a
+String.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope of var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Parses the string representation of a number, currency, or percentage
+    </description>
+    <name>parseNumber</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseNumberTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+String to be parsed.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Specifies whether the string in the value
+attribute should be parsed as a number,
+currency, or percentage.
+        </description>
+        <name>type</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Custom formatting pattern that determines
+how the string in the value attribute is to be
+parsed.
+        </description>
+        <name>pattern</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Locale whose default formatting pattern (for
+numbers, currencies, or percentages,
+respectively) is to be used during the parse
+operation, or to which the pattern specified
+via the pattern attribute (if present) is
+applied.
+        </description>
+        <name>parseLocale</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Specifies whether just the integer portion of
+the given value should be parsed.
+        </description>
+        <name>integerOnly</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable which
+stores the parsed result (of type
+java.lang.Number).
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope of var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Formats a date and/or time using the supplied styles and pattern
+    </description>
+    <name>formatDate</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatDateTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+        <description>
+Date and/or time to be formatted.
+        </description>
+        <name>value</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Specifies whether the time, the date, or both
+the time and date components of the given
+date are to be formatted. 
+        </description>
+        <name>type</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Predefined formatting style for dates. Follows
+the semantics defined in class
+java.text.DateFormat. Applied only
+when formatting a date or both a date and
+time (i.e. if type is missing or is equal to
+"date" or "both"); ignored otherwise.
+        </description>
+        <name>dateStyle</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Predefined formatting style for times. Follows
+the semantics defined in class
+java.text.DateFormat. Applied only
+when formatting a time or both a date and
+time (i.e. if type is equal to "time" or "both");
+ignored otherwise.
+        </description>
+        <name>timeStyle</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Custom formatting style for dates and times.
+        </description>
+        <name>pattern</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Time zone in which to represent the formatted
+time.
+        </description>
+        <name>timeZone</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable which
+stores the formatted result as a String.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope of var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Parses the string representation of a date and/or time
+    </description>
+    <name>parseDate</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseDateTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Date string to be parsed.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Specifies whether the date string in the
+value attribute is supposed to contain a
+time, a date, or both.
+        </description>
+        <name>type</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Predefined formatting style for days
+which determines how the date
+component of the date string is to be
+parsed. Applied only when formatting a
+date or both a date and time (i.e. if type
+is missing or is equal to "date" or "both");
+ignored otherwise.
+        </description>
+        <name>dateStyle</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Predefined formatting styles for times
+which determines how the time
+component in the date string is to be
+parsed. Applied only when formatting a
+time or both a date and time (i.e. if type
+is equal to "time" or "both"); ignored
+otherwise.
+        </description>
+        <name>timeStyle</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Custom formatting pattern which
+determines how the date string is to be
+parsed.
+        </description>
+        <name>pattern</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Time zone in which to interpret any time
+information in the date string.
+        </description>
+        <name>timeZone</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Locale whose predefined formatting styles
+for dates and times are to be used during
+the parse operation, or to which the
+pattern specified via the pattern
+attribute (if present) is applied.
+        </description>
+        <name>parseLocale</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable in
+which the parsing result (of type
+java.util.Date) is stored.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope of var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+</taglib>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/WEB-INF/web.xml b/das-java/trunk/samples/advanced-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..c60d36566b
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  Licensed 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.
+ -->
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app id="WebApp">
+	<display-name>Tuscany DAS Features</display-name>
+    <welcome-file-list id="WelcomeFileList">
+        <welcome-file>html/DASWebSampleFrame.html</welcome-file>
+    </welcome-file-list>
+
+   	<!-- Command Servlet -->
+	<servlet>
+		<display-name>CommandServlet</display-name>
+		<servlet-name>CommandServlet</servlet-name>
+		<servlet-class>org.apache.tuscany.samples.web.CommandServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>CommandServlet</servlet-name>
+		<url-pattern>/CommandServlet</url-pattern>
+	</servlet-mapping>
+	
+	<!-- JSTL Tag Library Descriptors -->
+        <taglib>
+		<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
+		<taglib-location>/WEB-INF/tld/c.tld</taglib-location>
+	</taglib>    
+	<taglib>
+		<taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
+		<taglib-location>/WEB-INF/tld/fmt.tld</taglib-location>
+	</taglib>	
+</web-app>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/html/DASWebSampleFrame.html b/das-java/trunk/samples/advanced-webapp/src/main/webapp/html/DASWebSampleFrame.html
new file mode 100644
index 0000000000..49f913eaec
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/html/DASWebSampleFrame.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+   "http://www.w3.org/TR/html4/frameset.dtd">
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  Licensed 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.
+ -->
+ 
+<HTML>
+<HEAD>
+<TITLE>Tuscany DAS Web Sample</TITLE>
+</HEAD>
+<FRAMESET rows="40%,70%">
+   <FRAME name="fixed" src="jsp/DASMenu.jsp">
+   <FRAME name="dynamic" src="html/blank.html">
+</FRAMESET>
+</HTML>
+\ No newline at end of file
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/html/blank.html b/das-java/trunk/samples/advanced-webapp/src/main/webapp/html/blank.html
new file mode 100644
index 0000000000..0bc2a49864
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/html/blank.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+   "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  Licensed 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.
+ -->
+ 
+<HTML>
+<HEAD>
+<TITLE></TITLE>
+</HEAD>
+<BODY>
+</BODY>
+</HTML>
+\ No newline at end of file
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/js/ajax.js b/das-java/trunk/samples/advanced-webapp/src/main/webapp/js/ajax.js
new file mode 100644
index 0000000000..c0b0be5e54
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/js/ajax.js
@@ -0,0 +1,188 @@
+//<!--
+//  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+//
+//  Licensed 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.
+// -->
+
+var req;
+var url;
+var xslFileName;
+var brwsr;
+var htmlunitlimit;
+
+function startup(pageName) {
+	if(pageName == 'adhoc'){
+		document.forms[0].sqlQuery.focus = true;
+	}
+	
+	if(pageName == 'command') {
+		document.forms[0].DasCommand.focus = true;
+	}
+}
+
+function init() {
+	if (window.XMLHttpRequest) {
+		brwsr="NOIE";
+		req = new XMLHttpRequest();
+	} else if (window.ActiveXObject) {
+		brwsr="IE";
+		req = new ActiveXObject("Microsoft.XMLHTTP");
+	}
+	var url = "../CommandServlet";
+	req.open("POST", url, true);
+	req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+}
+
+function formWaitMessage(){
+    var swappableSection = document.getElementById('msg');    
+    if (window.XSLTProcessor)
+    {
+        swappableSection.innerHTML = '';
+        var x = document.createTextNode('Retreiving result..please wait');        
+        swappableSection.appendChild(x);
+    }
+    else if(window.ActiveXObject)
+    {
+        swappableSection.innerHTML = 'Retreiving result..please wait' ;
+    }
+}
+
+function executeQuery(reqParams, xslFileNameVal) {
+	init();
+	req.onreadystatechange = resultHandler;
+	xslFileName = xslFileNameVal;
+	//alert(reqParams);
+	xsldocloaded = false;
+	loadXsl();
+	req.send(reqParams);
+	//alert('req sent');
+}
+
+	var xsldocloaded = false;
+	var xsldoc;
+
+function loadXsl(){
+	if(xslFileName != ''){
+		if (window.XSLTProcessor)
+		{
+		    // support Mozilla/Gecko based browsers
+		    xsldoc = document.implementation.createDocument("", "", null);
+		    xsldoc.addEventListener("load", onXslLoad, false);
+		    xsldoc.load(xslFileName);
+		    //alert("done loadXsl Mozilla");
+		    htmlunitlimit='false';
+		}
+		else if(window.ActiveXObject)
+		{
+		    // support Windows / ActiveX
+		    xsldoc = new ActiveXObject("Microsoft.XMLDOM");
+		    xsldoc.ondataavailable = onXslLoad;
+		    xsldoc.load(xslFileName);
+		    //alert("done loadXsl IE");
+		    htmlunitlimit='false';
+		}
+		else{
+			//alert('setiing htmlunitlimit true');
+			htmlunitlimit='true';
+		}
+	}
+}
+
+function onXslLoad()
+{
+    // flag that the xsl is loaded
+    xsldocloaded = true;
+} 
+
+function resultHandler()
+{
+    // Make sure the request is loaded (readyState = 4)
+    if (req.readyState == 4)
+    {
+        // Make sure the status is "OK"
+        if (req.status == 200)
+        {
+            // Make sure the XSL document is loaded
+            if (!xsldocloaded && xslFileName != '')
+            {
+				if(htmlunitlimit=='false'){
+					alert("Unable to transform data.  XSL is not yet loaded.");
+					// break out of the function
+					return;
+				}
+				else{
+					var swappableSectionUT = document.getElementById('msg');
+					if(brwsr=='NOIE'){
+						//alert('limit case, xsl present, noie');
+						swappableSectionUT.removeChild(swappableSectionUT.childNodes[0]);//remove wait message
+					        var x = document.createTextNode(req.responseText);
+					        swappableSectionUT.appendChild(x);
+					}
+					else{
+						swappableSectionUT.innerHTML = req.responseText;
+					}
+					//alert('returning result:'+req.responseText);
+					return;
+				}
+            }
+            
+            var swappableSection = document.getElementById("msg");
+            
+            if (window.XSLTProcessor)
+            {
+				if(xslFileName == ''){
+					swappableSection.removeChild(swappableSection.childNodes[0]);//remove wait message
+			        var x = document.createTextNode(req.responseText);
+			        swappableSection.appendChild(x);
+				}
+				else{
+	                // support Mozilla/Gecko based browsers
+	                var xsltProcessor = new XSLTProcessor();
+	                xsltProcessor.importStylesheet(xsldoc);
+	                var outputXHTML = xsltProcessor
+	                        .transformToFragment(req.responseXML, document);
+	                swappableSection.innerHTML = "";
+	                swappableSection.appendChild(outputXHTML);
+				}
+            }
+            else if(window.ActiveXObject)
+            {
+				if(xslFileName == ''){
+   	                swappableSection.innerHTML = req.responseText;
+				}
+				else{
+	                // support Windows/ActiveX enabled browsers
+	                var outputXHTML = req.responseXML.transformNode(xsldoc);
+	                swappableSection.innerHTML = outputXHTML;
+				}
+            }
+            else{
+				var swappableSectionUT = document.getElementById('msg');
+				if(brwsr=='NOIE'){
+					swappableSectionUT.removeChild(swappableSectionUT.childNodes[0]);//remove wait message
+		        	var x = document.createTextNode(req.responseText);
+		        	swappableSectionUT.appendChild(x);
+				}
+				else{
+					swappableSectionUT.innerHTML = req.responseText;
+				}
+				return;            	
+            }
+        }
+        else
+        {
+            alert("There was a problem retrieving the XML data:\n" +
+                req.statusText);
+        }
+    }
+} 
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/js/dasmenu.js b/das-java/trunk/samples/advanced-webapp/src/main/webapp/js/dasmenu.js
new file mode 100644
index 0000000000..96b5d5288e
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/js/dasmenu.js
@@ -0,0 +1,112 @@
+//<!--
+//  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+//
+//  Licensed 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.
+// -->
+var dbstatus;
+var brwsrDB;
+var reqDB;
+
+function showSubMenu(){
+	var objThis = this;	
+
+	for(var i = 0; i  < objThis.childNodes.length; i++)
+	{
+		if(objThis.childNodes.item(i).nodeName == "UL")			
+		{							
+			objThis.childNodes.item(i).style.display = "block";						
+		}		
+	}	
+}
+
+function hideSubMenu()
+{								
+	var objThis = this;	
+	
+	for(var i = 0; i  < objThis.childNodes.length; i++)			
+	{
+		if(objThis.childNodes.item(i).nodeName == "UL")
+		{				
+			objThis.childNodes.item(i).style.display = "none";			
+			return;
+		}			
+	}	
+}			
+
+function initialiseMenu()
+{
+	var objLICollection = document.body.getElementsByTagName("LI");		
+	for(var i = 0; i < objLICollection.length; i++)
+	{		
+		var objLI = objLICollection[i];										
+		for(var j = 0; j  < objLI.childNodes.length; j++)
+		{
+			if(objLI.childNodes.item(j).nodeName == "UL")
+			{
+				objLI.onmouseover=showSubMenu;
+				objLI.onmouseout=hideSubMenu;
+				
+				for(var j = 0; j  < objLI.childNodes.length; j++)
+				{
+					if(objLI.childNodes.item(j).nodeName == "A")
+					{					
+						objLI.childNodes.item(j).className = "hassubmenu";								
+					}
+				}
+			}
+		}
+	}	
+}
+
+function refreshdb(){
+	if (window.XMLHttpRequest) {
+		brwsrDB='NOIE';
+		reqDB = new XMLHttpRequest();
+	} else if (window.ActiveXObject) {
+		brwsrDB='IE';
+		reqDB = new ActiveXObject("Microsoft.XMLHTTP");
+	}
+	
+	var dbRefreshMsg = document.getElementById('dbmsg');
+	if(brwsrDB=='NOIE'){
+        var x = document.createTextNode('Refreshing database..please wait');
+        dbRefreshMsg.appendChild(x);
+	}
+	else{
+		dbmsg.innerHTML = 'Refreshing database..please wait';
+	}
+
+	//TODO
+	var urlDB = "../CommandServlet";
+	reqDB.open("POST", urlDB, true);
+	reqDB.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+	reqDB.onreadystatechange = dbresultHandler;
+	reqDB.send('refreshDB=yes');
+}
+
+function dbresultHandler() {
+	if (reqDB.readyState == 4) {
+		if (reqDB.status == 200) {
+			var dbRefreshMsg = document.getElementById('dbmsg');
+			if(brwsrDB=='NOIE'){
+			  dbRefreshMsg.removeChild(dbRefreshMsg.childNodes[0]);//remove wait message
+		      var x = document.createTextNode('Refreshed database!');
+		      dbRefreshMsg.appendChild(x);
+			}
+			else{
+			  dbmsg.innerHTML = 'Refreshed database!';
+			}
+			return;
+		}	
+	}
+}
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/DASMenu.jsp b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/DASMenu.jsp
new file mode 100644
index 0000000000..041e05c8bb
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/DASMenu.jsp
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  Licensed 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.
+ -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<link rel="stylesheet" type="text/css" href="main.css" media="screen, print" />
+		<script type="text/javascript" src="../js/dasmenu.js" >
+		</script>
+
+		<title>DASMenu: Web Sample</title>
+		<meta name="description" content="DAS Features Demo" />
+		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+		<meta http-equiv="expires" content="-1" />
+		<meta http-equiv="pragma" content="no-cache" />
+	</head>
+	<body onload="initialiseMenu();
+				  
+				  ">	
+		<h1>Tuscany DAS Web Sample</h1>
+		<ul id="mainmenu">
+			<li><a href="../html/blank.html"  target="dynamic">Advanced Features</a>
+				<ul>
+					<li><a href="./occ.jsp" target="dynamic">OCC</a></li>
+					<li><a href="./converter.jsp" target="dynamic">Converter</a></li>
+					<li><a href="./rss.jsp" target="dynamic">Result Set Shape</a></li>
+				</ul>
+			</li>
+			<li><a href="./indexAdhoc.jsp" target="dynamic">Adhoc Query</a></li>
+			<li><a href="./indexCommand.jsp"  target="dynamic">Command</a></li>
+		</ul>
+		<p>Tuscany DAS web sample demonstrates - simple adhoc queries, DAS predefined commands execution and
+		some advanced features like Optimistic Concurrency Control (OCC), Converter, Result Set Shape etc.
+		</p>
+		<p>Check more details by navigating menu.
+		Press <b>Refresh!</b> button anytime for database refresh.
+		</p>
+		
+		<FORM name='MenuForm'>		
+		   <INPUT TYPE="button" id="refreshButton" name="refreshButton" value="Refresh!" 
+			onClick="	refreshdb();
+					"
+			>
+			</INPUT>				
+			<!-- Font for Status Message -->
+			<font face="Arial,Helvetica,Verdana" size="2" color="#FF0000">
+			<b id="dbmsg"></b>
+			</font>
+		</FORM>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/converter.jsp b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/converter.jsp
new file mode 100644
index 0000000000..a3610e7639
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/converter.jsp
@@ -0,0 +1,117 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<%-- 
+ *  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.
+ --%>
+
+<%-- JSTL tags --%>
+<%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<html>
+
+<head>
+<link href="default.css" rel="stylesheet" type="text/css">
+<script type="text/javascript" src="../js/ajax.js" >
+</script>
+
+</head>
+
+<body onload="startup()">
+
+<%@ page import="java.util.*" %>
+
+<font face="Arial,Helvetica,Verdana" size="3">
+     
+<form name="DasForm" >
+
+<input type="hidden" id="serviceName" name="serviceName" value="org.apache.tuscany.samples.das.DASQueryProcessor"/>
+<input type="hidden" id="configFile" name="configFile" value="CustomerConfigWithConverter.xml"/>
+<input type="hidden" id="type" name="type" value="converter:"/>
+<input type="hidden" id="param" name="param" value=""/>
+<input type="hidden" id="xslFileName" name="xslFileName" value=""/>
+
+<b>Arbitrary Converter: </b>
+     The column converted is a VARCAHAR. 
+     ResultSetShape is used to specify that the property will be a SDODataTypes.DATE.
+     So this example uses a converter that transforms a string column into a date property 
+     and conversely, a date property back to a string for the underlying column.
+	<br>
+     The converter returns 1957.09.27 if the column value is "Pavick" and 1966.12.20 if 
+     the value is "Williams"
+    <br>  
+      On write, the converter returns "Williams" if the property value is 1966.12.20 and "Pavick" 
+      if the property value is 1957.09.27
+    <br>
+      Check using direct database connection that the database table rows's column values are 
+      either "Williams" or "Pavick".
+<br>
+<hr width="90%" size="1">
+<input type="radio" name="stmt" id="stmt" checked="checked" value="stmt0">
+Select * from CUSTOMER where ID = 1;
+<br>
+<input type="radio" name="stmt" id="stmt" value="stmt1">
+Check First Customer's LastName is 1957.09.27
+<br>
+<input type="radio" name="stmt" id="stmt" value="stmt2">
+Set First Customer's LastName to 1966.12.20
+<br>
+<input type="radio" name="stmt" id="stmt" value="stmt3">
+Check First Customer's LastName is 1966.12.20
+<br>
+
+
+&nbsp; &nbsp;
+<input type="button" id="converterButton" name="converterButton" value="ExecuteTransaction" 
+	onclick="				
+		var varVal;
+		if(this.form.stmt[0].checked){
+			varVal = 'stmt0';
+			xslFileName.value = '../xsl/customer.xsl';
+		}
+		if(this.form.stmt[1].checked){
+			varVal = 'stmt1';
+			xslFileName.value = '';
+		}
+		if(this.form.stmt[2].checked){
+			varVal = 'stmt2';
+			xslFileName.value = '';
+		}
+		if(this.form.stmt[3].checked){
+			varVal = 'stmt3';
+			xslFileName.value = '';
+		}
+		
+		param.value = 'Query=' + this.form.type.value+varVal;
+		param.value += '&serviceName='+this.form.serviceName.value;
+		param.value += '&configFile='+this.form.configFile.value;		
+	executeQuery(param.value, xslFileName.value);
+	formWaitMessage();
+	">
+</input>
+<hr>
+
+<!-- Font for Status Message -->
+<font face="Arial,Helvetica,Verdana" size="2" color="#FF0000">
+<div  id="msg">&nbsp;</div>
+</font>
+<!--  Font End -->
+
+</form>
+
+</font>
+
+</body>
+</html>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/default.css b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/default.css
new file mode 100644
index 0000000000..5680fab9ed
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/default.css
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+BODY {BACKGROUND-COLOR: #FFFFFF; COLOR: #333366;  FONT-FAMILY: 'Times New Roman'}
+H1 {COLOR: #6666CC; FONT-FAMILY: 'Times New Roman'; TEXT-TRANSFORM: capitalize }
+H2 {COLOR: #6666CC; FONT-FAMILY: 'Times New Roman'; TEXT-TRANSFORM: capitalize }
+H3 {COLOR: #6666CC; FONT-FAMILY: 'Times New Roman'; TEXT-TRANSFORM: capitalize }
+H4 {COLOR: #6666CC; FONT-FAMILY: 'Times New Roman'; TEXT-TRANSFORM: capitalize }
+H5 {COLOR: #6666CC; FONT-FAMILY: 'Times New Roman'; TEXT-TRANSFORM: capitalize }
+H6 {COLOR: #6666CC; FONT-FAMILY: 'Times New Roman'; TEXT-TRANSFORM: capitalize }
+TH {COLOR: #000000; font-weight: bold }
+
+#TRowEven {background-color: #ccff99}
+#TRowOdd  {background-color: #ffffcc}
+
+A:link		{cursor:hand; color: #3300FF; text-decoration: none;}
+A:visited	{cursor:hand; color: #3300FF; text-decoration: none; }
+A:active	{cursor:hand; color:#FEAA02;  text-decoration: none;}
+A:hover		{cursor:hand; color:#FEAA02;}
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/indexAdhoc.jsp b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/indexAdhoc.jsp
new file mode 100644
index 0000000000..f212d744f1
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/indexAdhoc.jsp
@@ -0,0 +1,87 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<%-- 
+ *  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.
+ --%>
+
+<%-- JSTL tags --%>
+<%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<html>
+
+<head>
+<link href="default.css" rel="stylesheet" type="text/css">
+<script type="text/javascript" src="../js/ajax.js" >
+</script>
+
+</head>
+
+<body onload="startup()">
+
+<%@ page import="java.util.*" %>
+
+<font face="Arial,Helvetica,Verdana" size="3">
+     
+<form name="DasForm" >
+
+<input type="hidden" id="serviceName" name="serviceName" value="org.apache.tuscany.samples.das.DASQueryProcessor"/>
+<input type="hidden" id="configFile" name="configFile" value="DasConfig.xml"/>
+<input type="hidden" id="type" name="type" value="query:"/>
+<input type="hidden" id="param" name="param" value=""/>
+<input type="hidden" id="xslFileName" name="xslFileName" value=""/>
+
+<b>Adhoc SQL Query: </b><br>
+<select id="sqlQuery" name="sqlQuery" 	
+	onfocus="this.form.queryButton.disabled=false;">
+<option value="NullQuery"></option>
+<option value="SELECT * FROM COMPANY">SELECT * FROM COMPANY</option>
+<option value="SELECT * FROM COMPANY LEFT OUTER JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID">SELECT * FROM COMPANY LEFT OUTER JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID</option>
+<option value="{INSERT INTO DEPARTMENT (NAME, COMPANYID) VALUES ('MyDept',1)}{SELECT * FROM COMPANY LEFT OUTER JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID}">
+		INSERT INTO DEPARTMENT (NAME, COMPANYID) VALUES ('MyDept',1)</option>
+<option value="{DELETE FROM DEPARTMENT WHERE DEPARTMENT.COMPANYID=1 and DEPARTMENT.ID>1}{SELECT * FROM COMPANY LEFT OUTER JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID}">
+		DELETE FROM DEPARTMENT WHERE COMPANYID=1 and ID>1</option>
+<option value="{UPDATE DEPARTMENT SET NAME='MyUpdDept' WHERE COMPANYID=1 AND ID=1}{SELECT * FROM COMPANY LEFT OUTER JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID}">
+		UPDATE DEPARTMENT SET NAME='MyUpdDept' WHERE COMPANYID=1 AND ID=1</option>
+</select>
+&nbsp; &nbsp;
+<input type="button" id="queryButton" name="queryButton" value="ExecuteQuery" 
+	onclick="
+		if(this.form.sqlQuery.value=='SELECT * FROM COMPANY'){
+			this.form.xslFileName.value = '../xsl/company.xsl';
+		}
+		else{
+			this.form.xslFileName.value = '../xsl/companyDepartment.xsl';
+		}
+		param.value = 'Query=' + this.form.type.value+this.form.sqlQuery.value;
+		param.value += '&serviceName='+this.form.serviceName.value;
+		param.value += '&configFile='+this.form.configFile.value;		
+	executeQuery(param.value, xslFileName.value);
+	formWaitMessage();
+	" >
+</input>
+<hr>
+
+<!-- Font for Status Message -->
+<font face="Arial,Helvetica,Verdana" size="2" color="#FF0000">
+<div id="msg">&nbsp;</div>
+</font>
+<!--  Font End -->
+</form>
+
+</font>
+
+</body>
+</html>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/indexCommand.jsp b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/indexCommand.jsp
new file mode 100644
index 0000000000..55dcb56e38
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/indexCommand.jsp
@@ -0,0 +1,85 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<%-- 
+ *  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.
+ --%>
+
+<%-- JSTL tags --%>
+<%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<html>
+
+<head>
+<link href="default.css" rel="stylesheet" type="text/css">
+<script src="../js/ajax.js" language="javascript" type="text/javascript"></script>
+
+</head>
+
+<body onload="startup()">
+
+<%@ page import="java.util.*" %>
+
+<font face="Arial,Helvetica,Verdana" size="3">
+
+<form name="DasForm" >
+
+<input type="hidden" id="serviceName" name="serviceName" value="org.apache.tuscany.samples.das.DASQueryProcessor"/>
+<input type="hidden" id="configFile" name="configFile" value="DasConfig.xml"/>
+<input type="hidden" id="type" name="type" value="command:"/>
+<input type="hidden" id="param" name="param" value=""/>
+<input type="hidden" id="xslFileName" name="xslFileName" value=""/>
+
+<b>DAS Command: </b>
+
+<select id="DasCommand" name="DasCommand" 	
+	onfocus="this.form.commandButton.disabled=false;">
+<option value="NullCommand"></option>
+<option value="AllCompanies">all companies</option>
+<option value="AllCompaniesAndDepartments">all companies and departments</option>
+<option value="AddDepartmentToFirstCompany">Add department to first company</option>
+<option value="DeleteDepartmentFromFirstCompany">Delete department from first company</option>
+<option value="UpdateCompanyDepartmentNames">Update one department name from first company</option>
+</select>
+
+
+<input type="button" id="commandButton" name="commandButton" value="ExecuteCommand" 
+	onclick="this.form.type.value='command:';
+			if(this.form.DasCommand.value=='AllCompanies'){
+				this.form.xslFileName.value = '../xsl/company.xsl';
+			}
+			else{
+				this.form.xslFileName.value = '../xsl/companyDepartment.xsl';
+			}
+			
+			param.value = 'Query=' + this.form.type.value+this.form.DasCommand.value;
+			param.value += '&serviceName='+this.form.serviceName.value;
+			param.value += '&configFile='+this.form.configFile.value;		
+			executeQuery(param.value, this.form.xslFileName.value);			
+			formWaitMessage();
+			" >
+</input>	
+<hr>
+<!-- Font for Status Message -->
+<font face="Arial,Helvetica,Verdana" size="2" color="#FF0000">
+<div  id="msg">&nbsp;</div>
+</font>
+<!--  Font End -->
+</form>
+
+</font>
+
+</body>
+</html>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/main.css b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/main.css
new file mode 100644
index 0000000000..264facc985
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/main.css
@@ -0,0 +1,120 @@
+/*
+ * 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.
+ */
+
+body
+{
+	margin: 0px;
+	border: 0px;
+	padding: 0px;
+	font-family: Verdana, Arial, Sans-Serif;
+	font-size: 0px;
+}
+
+img
+{
+	border: none 0px #ffffff;
+}
+
+h1
+{
+	background-color: #ffcc00;
+	border-bottom: solid 1px #333333;
+	padding: 5px;
+	margin: 0px;
+	font-size: x-large;
+}
+
+h2
+{
+	font-size: large;
+}
+
+p
+{
+	font-size: small;
+}
+
+/* Real menu */
+ul, li
+{
+	font-size: small;
+	margin-top: 0px;
+	margin-right: 0px;
+	margin-bottom: 0px;
+	display: block;
+}
+
+ul
+{
+	width: 130px;
+	border: solid 1px #333333;
+	border-top: solid 5px #333333;
+	border-right: solid 2px #333333;
+	padding: 0px;
+}
+
+li ul
+{
+	display: none;
+	position: absolute;
+	margin-left: 100px;
+	margin-top: -20px;
+}
+
+li a
+{
+	padding: 2px;
+	text-decoration: none;
+	color: #000000;
+	background-color: #ffffee;
+	width: 100%;
+	display: block;
+	border-bottom: dashed 1px #333333;
+	text-indent: 2px;
+	font-size: small;
+}
+
+li a:hover
+{
+	background-color: #ffcc00;
+	font-weight: bold;
+	border-bottom: solid 1px #333333;
+}
+
+li
+{	
+	float: left;
+	width: 98%;
+}
+
+a.hassubmenu
+{
+	background-image: url(../img/lay_dmnuhassub.gif);
+	background-repeat: no-repeat;
+	background-position: 120px 7px;
+}
+
+#mainmenu
+{
+	margin: 10px;	
+	margin-left: 5px;	
+	float: left;
+	border-bottom: solid 2px #333333;
+	margin-bottom: 100%;	
+}
+\ No newline at end of file
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/occ.jsp b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/occ.jsp
new file mode 100644
index 0000000000..ed5a7ee0c1
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/occ.jsp
@@ -0,0 +1,77 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<%-- 
+ *  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.
+ --%>
+
+<%-- JSTL tags --%>
+<%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<html>
+
+<head>
+<link href="default.css" rel="stylesheet" type="text/css">
+<script type="text/javascript" src="../js/ajax.js" >
+</script>
+
+</head>
+
+<body onload="startup()">
+
+<%@ page import="java.util.*" %>
+
+<font face="Arial,Helvetica,Verdana" size="3">
+     
+<form name="DasForm" >
+
+<input type="hidden" id="serviceName" name="serviceName" value="org.apache.tuscany.samples.das.DASQueryProcessor"/>
+<input type="hidden" id="configFile" name="configFile" value="DasConfig.xml"/>
+<input type="hidden" id="type" name="type" value="occ:"/>
+<input type="hidden" id="param" name="param" value=""/>
+<input type="hidden" id="xslFileName" name="xslFileName" value=""/>
+
+<b>Automatic Optimistic Concurrency Control: </b>
+     Try to modify same column in same database table row twice in one transaction.
+<br>
+<TEXTAREA name="occTransactions" id="occTransactions" rows="3" cols="60" readonly="true">
+   Select * from BOOK where BOOK_ID = 1;
+   update BOOK set NAME = 'Puss in Hat' where BOOK_ID = 1;
+   'UpdateNameForFirstBook'   
+</TEXTAREA>
+
+&nbsp; &nbsp;
+<input type="button" id="occButton" name="occButton" value="ExecuteTransaction" 
+	onclick="
+		param.value = 'Query=' + this.form.type.value;
+		param.value += '&serviceName='+this.form.serviceName.value;
+		param.value += '&configFile='+this.form.configFile.value;		
+	executeQuery(param.value, xslFileName.value);
+	formWaitMessage();
+	">
+</input>
+<hr>
+
+<!-- Font for Status Message -->
+<font face="Arial,Helvetica,Verdana" size="2" color="#FF0000">
+<div  id="msg">&nbsp;</div>
+</font>
+<!--  Font End -->
+</form>
+
+</font>
+
+</body>
+</html>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/rss.jsp b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/rss.jsp
new file mode 100644
index 0000000000..2d217d68b3
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/jsp/rss.jsp
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<%-- 
+ *  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.
+ --%>
+
+<%-- JSTL tags --%>
+<%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<html>
+
+<head>
+<link href="default.css" rel="stylesheet" type="text/css">
+<script type="text/javascript" src="../js/ajax.js" >
+</script>
+
+</head>
+
+<body onload="startup()">
+
+<%@ page import="java.util.*" %>
+
+<font face="Arial,Helvetica,Verdana" size="3">
+     
+<form name="DasForm" >
+
+<input type="hidden" id="serviceName" name="serviceName" value="org.apache.tuscany.samples.das.DASQueryProcessor"/>
+<input type="hidden" id="configFile" name="configFile" value="CustomerConfigWithIDConverter.xml"/>
+<input type="hidden" id="type" name="type" value="rss:"/>
+<input type="hidden" id="param" name="param" value=""/>
+<input type="hidden" id="xslFileName" name="xslFileName" value=""/>
+
+<b>Result Set Shape: </b>
+ DAS has ability to specify format(shape) of the ResultSet. This is necessary
+ when the JDBC driver in use does not provide adequate support for ResultSetMetadata. 
+ Also, we expect that specifying the result set shape will increase performance.
+<br>
+<hr width="90%" size="1">
+<input type="text" name="stmt" id="stmt" value="literal" size="20">
+(Select 99, 'Roosevelt', '1600 Pennsylvania Avenue' from customer)
+
+&nbsp; &nbsp;
+<input type="button" id="rssButton" name="rssButton" value="ExecuteQuery" 
+	onclick="	
+		this.form.xslFileName.value='../xsl/customer.xsl';
+		param.value = 'Query=' + this.form.type.value+this.form.stmt.value;
+		param.value += '&serviceName='+this.form.serviceName.value;
+		param.value += '&configFile='+this.form.configFile.value;		
+	executeQuery(param.value, xslFileName.value);
+	formWaitMessage();
+	" >
+</input>
+<hr>
+
+<!-- Font for Status Message -->
+<font face="Arial,Helvetica,Verdana" size="2" color="#FF0000">
+<div  id="msg">&nbsp;</div>
+</font>
+<!--  Font End -->
+</form>
+
+</font>
+
+</body>
+</html>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/xsl/company.xsl b/das-java/trunk/samples/advanced-webapp/src/main/webapp/xsl/company.xsl
new file mode 100644
index 0000000000..99d9dc1fad
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/xsl/company.xsl
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  Licensed 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.
+ -->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:das="http://org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<xsl:output method="html" version="1.0" encoding="Unicode" indent="yes"/>
+	<xsl:template match="/root/das:DataGraphRoot">
+		<html>
+			<body>
+				<h2>Query Result</h2>
+				<xsl:apply-templates select="COMPANY"/>
+			</body>
+		</html>
+	</xsl:template>
+	<xsl:template match="COMPANY">
+		<table border="1">
+			<tr bgcolor="#9acd32">
+				<th align="left">COMPANYID</th>
+				<th align="left">COMPANYNAME</th>
+			</tr>
+			<tr>
+				<td>
+					<xsl:value-of select="ID"/>
+				</td>
+				<td>
+					<xsl:value-of select="NAME"/>
+				</td>
+			</tr>
+		</table>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/xsl/companyDepartment.xsl b/das-java/trunk/samples/advanced-webapp/src/main/webapp/xsl/companyDepartment.xsl
new file mode 100644
index 0000000000..f79d30595e
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/xsl/companyDepartment.xsl
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  Licensed 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.
+ -->
+ 
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:das="http://org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<xsl:output method="html" version="1.0" encoding="Unicode" indent="yes"/>
+	<xsl:key name="companyidkey" match="/root/das:DataGraphRoot/DEPARTMENT" use="COMPANYID"/>
+	<xsl:template match="/root/das:DataGraphRoot">
+		<html>
+			<body>
+				<h2>Query Result</h2>
+				<xsl:apply-templates select="COMPANY"/>
+			</body>
+		</html>
+	</xsl:template>
+	<xsl:template match="COMPANY">				
+				<table border="1">
+					<tr bgcolor="#9acd32">
+						<th align="left">COMPANYID</th>
+						<th align="left">COMPANYNAME</th>
+					</tr>
+							
+					<tr>
+						<td>
+							<xsl:value-of select="ID"/>
+						</td>
+						<td>
+							<xsl:value-of select="NAME"/>
+						</td>
+						<table border="1">
+							<tr bgcolor="#9acd32">
+								<th align="left">DEPID</th>
+								<th align="left">DEPNAME</th>
+							</tr>
+					
+							<xsl:variable name="tmp" select="ID"/>
+							<xsl:for-each select="key('companyidkey', $tmp)">
+							<tr>
+							   <td>
+								<xsl:value-of select="ID"/>
+								</td>
+								<td>
+								<xsl:value-of select="NAME"/>
+								</td>
+							</tr>					
+							</xsl:for-each>
+						</table>
+					</tr>
+				</table>
+				
+</xsl:template>
+</xsl:stylesheet>
diff --git a/das-java/trunk/samples/advanced-webapp/src/main/webapp/xsl/customer.xsl b/das-java/trunk/samples/advanced-webapp/src/main/webapp/xsl/customer.xsl
new file mode 100644
index 0000000000..40e260bcce
--- /dev/null
+++ b/das-java/trunk/samples/advanced-webapp/src/main/webapp/xsl/customer.xsl
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  Licensed 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.
+ -->
+ 
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:das="http://org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<xsl:output method="html" version="1.0" encoding="UTF-8" indent="yes"/>
+	<xsl:template match="/">
+		<html>
+			<body>
+				<h2>Query Result</h2>
+				<table border="1">
+					<tr bgcolor="#9acd32">
+						<th align="left">ID</th>
+						<th align="left">LASTNAME</th>
+						<th align="left">ADDRESS</th>
+					</tr>
+					<xsl:for-each select="root">
+						<xsl:for-each select="das:DataGraphRoot">
+							<tr>
+								<td>
+									<xsl:value-of select="CUSTOMER/ID"/>
+								</td>
+								<td>
+									<xsl:value-of select="CUSTOMER/LASTNAME"/>
+								</td>
+								<td>
+									<xsl:value-of select="CUSTOMER/ADDRESS"/>
+								</td>
+							</tr>
+						</xsl:for-each>
+					</xsl:for-each>
+				</table>
+			</body>
+		</html>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/das-java/trunk/samples/build.xml b/das-java/trunk/samples/build.xml
new file mode 100644
index 0000000000..f78ca9a3c8
--- /dev/null
+++ b/das-java/trunk/samples/build.xml
@@ -0,0 +1,29 @@
+<?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.
+ -->
+<project name="samples" default="compile">
+
+    <target name="compile">
+      <ant dir="companyweb"/>
+    </target>
+
+    <target name="clean">
+      <ant dir="companyweb" target="clean"/>
+    </target>
+</project>
diff --git a/das-java/trunk/samples/company-webapp/build.xml b/das-java/trunk/samples/company-webapp/build.xml
new file mode 100644
index 0000000000..dd269b628e
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/build.xml
@@ -0,0 +1,55 @@
+<?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.
+ -->
+<project name="samples" default="compile">
+    <property name="mainDir" value="../../.."/>
+    <path id="javac.classpath">
+        <fileset dir="${mainDir}/lib">
+            <include name="tuscany-runtime-incubating-M1.jar"/>
+        </fileset>
+    </path>
+    <path id="java.classpath">
+        <fileset dir="${mainDir}/lib">
+            <include name="tuscany-runtime-incubating-M1.jar"/>
+        </fileset>
+        <pathelement path="target/sample-companyweb.jar"/>
+    </path>
+
+  <target name="init">
+    <mkdir dir="target/classes"/>
+  </target>
+
+    <target name="compile" depends="init">
+      <javac srcdir="src/main/java" destdir="target/classes" debug="on" source="1.5" target="1.5">
+        <classpath refid="javac.classpath"/>
+      </javac>
+      <copy todir="target/classes">
+        <fileset dir="src/main/resources"/>
+      </copy>
+      <war destfile="target/sample-companyweb.war" webxml="src/main/webapp/WEB-INF/web.xml">
+        <classes dir="target/classes"/>
+      </war>
+    </target>
+
+    <target name="clean">
+      <delete quiet="true" includeemptydirs="true">
+        <fileset dir="target" excludes="sample-companyweb-incubating-M1.war"/>
+      </delete>
+    </target>
+</project>
diff --git a/das-java/trunk/samples/company-webapp/dastest/db.lck b/das-java/trunk/samples/company-webapp/dastest/db.lck
new file mode 100644
index 0000000000..9f6b4b3d4b
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/db.lck
diff --git a/das-java/trunk/samples/company-webapp/dastest/log/log.ctrl b/das-java/trunk/samples/company-webapp/dastest/log/log.ctrl
new file mode 100644
index 0000000000..edbd775299
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/log/log.ctrl
diff --git a/das-java/trunk/samples/company-webapp/dastest/log/log1.dat b/das-java/trunk/samples/company-webapp/dastest/log/log1.dat
new file mode 100644
index 0000000000..7e85ac8e8f
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/log/log1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/log/logmirror.ctrl b/das-java/trunk/samples/company-webapp/dastest/log/logmirror.ctrl
new file mode 100644
index 0000000000..edbd775299
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/log/logmirror.ctrl
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c10.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c10.dat
new file mode 100644
index 0000000000..5d8ecaa10f
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c10.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c101.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c101.dat
new file mode 100644
index 0000000000..0f79fa7574
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c101.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c111.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c111.dat
new file mode 100644
index 0000000000..39d49e3d19
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c111.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c121.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c121.dat
new file mode 100644
index 0000000000..2a4311779b
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c121.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c130.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c130.dat
new file mode 100644
index 0000000000..64e3c18d62
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c130.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c141.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c141.dat
new file mode 100644
index 0000000000..0632d04164
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c141.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c150.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c150.dat
new file mode 100644
index 0000000000..d7541026f6
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c150.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c161.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c161.dat
new file mode 100644
index 0000000000..6673bf1873
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c161.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c171.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c171.dat
new file mode 100644
index 0000000000..c2a753cc5d
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c171.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c180.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c180.dat
new file mode 100644
index 0000000000..cb9391aed1
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c180.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c191.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c191.dat
new file mode 100644
index 0000000000..d3cf1d6364
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c191.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c1a1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c1a1.dat
new file mode 100644
index 0000000000..a7a2d536e9
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c1a1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c1b1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c1b1.dat
new file mode 100644
index 0000000000..19097e69e7
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c1b1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c1c0.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c1c0.dat
new file mode 100644
index 0000000000..359525a31a
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c1c0.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c1d1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c1d1.dat
new file mode 100644
index 0000000000..9f257df932
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c1d1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c1e0.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c1e0.dat
new file mode 100644
index 0000000000..e43e52fb7f
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c1e0.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c1f1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c1f1.dat
new file mode 100644
index 0000000000..7e6ee3b1e0
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c1f1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c20.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c20.dat
new file mode 100644
index 0000000000..1be6390f06
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c20.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c200.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c200.dat
new file mode 100644
index 0000000000..b15d56855c
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c200.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c211.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c211.dat
new file mode 100644
index 0000000000..84b0022312
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c211.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c221.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c221.dat
new file mode 100644
index 0000000000..63106a9523
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c221.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c230.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c230.dat
new file mode 100644
index 0000000000..9975f27c1f
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c230.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c241.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c241.dat
new file mode 100644
index 0000000000..835c645a16
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c241.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c251.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c251.dat
new file mode 100644
index 0000000000..d3d6adf4fb
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c251.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c260.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c260.dat
new file mode 100644
index 0000000000..8d7333df7d
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c260.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c271.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c271.dat
new file mode 100644
index 0000000000..af722f7d73
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c271.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c281.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c281.dat
new file mode 100644
index 0000000000..3972983c2e
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c281.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c290.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c290.dat
new file mode 100644
index 0000000000..31577b8124
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c290.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c2a1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c2a1.dat
new file mode 100644
index 0000000000..0f700d13a7
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c2a1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c2b1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c2b1.dat
new file mode 100644
index 0000000000..1d6382fb3d
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c2b1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c2c1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c2c1.dat
new file mode 100644
index 0000000000..3bc60d886b
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c2c1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c2d0.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c2d0.dat
new file mode 100644
index 0000000000..c542d3c91c
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c2d0.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c2e1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c2e1.dat
new file mode 100644
index 0000000000..16abd20b5f
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c2e1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c2f0.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c2f0.dat
new file mode 100644
index 0000000000..eb26be5932
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c2f0.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c300.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c300.dat
new file mode 100644
index 0000000000..1214f1df4b
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c300.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c31.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c31.dat
new file mode 100644
index 0000000000..18c16f1123
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c31.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c311.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c311.dat
new file mode 100644
index 0000000000..926cbf25b5
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c311.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c320.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c320.dat
new file mode 100644
index 0000000000..07e7bc023c
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c320.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c331.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c331.dat
new file mode 100644
index 0000000000..fd827f9dc2
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c331.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c340.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c340.dat
new file mode 100644
index 0000000000..ca70319886
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c340.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c351.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c351.dat
new file mode 100644
index 0000000000..8fbe2a527c
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c351.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c360.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c360.dat
new file mode 100644
index 0000000000..dcf9c746e1
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c360.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c371.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c371.dat
new file mode 100644
index 0000000000..6f21a840ea
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c371.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c380.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c380.dat
new file mode 100644
index 0000000000..b512e8065f
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c380.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c391.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c391.dat
new file mode 100644
index 0000000000..27006e95a1
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c391.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c3a0.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c3a0.dat
new file mode 100644
index 0000000000..565dca97ac
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c3a0.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c3b1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c3b1.dat
new file mode 100644
index 0000000000..36894c9818
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c3b1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c3c0.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c3c0.dat
new file mode 100644
index 0000000000..d0c538aede
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c3c0.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c3d1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c3d1.dat
new file mode 100644
index 0000000000..65bcec5527
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c3d1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c3e0.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c3e0.dat
new file mode 100644
index 0000000000..bdab359420
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c3e0.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c3f1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c3f1.dat
new file mode 100644
index 0000000000..dc2d278b57
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c3f1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c400.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c400.dat
new file mode 100644
index 0000000000..3072709cec
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c400.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c41.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c41.dat
new file mode 100644
index 0000000000..61086690f2
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c41.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c411.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c411.dat
new file mode 100644
index 0000000000..ca551d8249
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c411.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c420.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c420.dat
new file mode 100644
index 0000000000..f04de0840e
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c420.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c431.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c431.dat
new file mode 100644
index 0000000000..398b1672cc
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c431.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c440.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c440.dat
new file mode 100644
index 0000000000..af259d0872
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c440.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c451.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c451.dat
new file mode 100644
index 0000000000..772a18c658
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c451.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c460.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c460.dat
new file mode 100644
index 0000000000..505428362d
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c460.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c471.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c471.dat
new file mode 100644
index 0000000000..484d0df42d
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c471.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c481.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c481.dat
new file mode 100644
index 0000000000..faac073076
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c481.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c490.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c490.dat
new file mode 100644
index 0000000000..7585319d21
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c490.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c4a1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c4a1.dat
new file mode 100644
index 0000000000..4fe8b786e3
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c4a1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c51.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c51.dat
new file mode 100644
index 0000000000..7fc7937b15
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c51.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c60.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c60.dat
new file mode 100644
index 0000000000..d1fb08c946
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c60.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c71.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c71.dat
new file mode 100644
index 0000000000..d4c2090a3b
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c71.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c81.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c81.dat
new file mode 100644
index 0000000000..38b6ea6520
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c81.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/c90.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/c90.dat
new file mode 100644
index 0000000000..a607a5969c
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/c90.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/ca1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/ca1.dat
new file mode 100644
index 0000000000..19b4c9e340
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/ca1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/cb1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/cb1.dat
new file mode 100644
index 0000000000..73dc986572
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/cb1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/cc0.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/cc0.dat
new file mode 100644
index 0000000000..d1eef3bb56
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/cc0.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/cd1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/cd1.dat
new file mode 100644
index 0000000000..c7e6db3ef7
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/cd1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/ce1.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/ce1.dat
new file mode 100644
index 0000000000..8fd3bf17a8
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/ce1.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/seg0/cf0.dat b/das-java/trunk/samples/company-webapp/dastest/seg0/cf0.dat
new file mode 100644
index 0000000000..332b3d9a8a
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/seg0/cf0.dat
diff --git a/das-java/trunk/samples/company-webapp/dastest/service.properties b/das-java/trunk/samples/company-webapp/dastest/service.properties
new file mode 100644
index 0000000000..8cfe3b09a5
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/dastest/service.properties
@@ -0,0 +1,22 @@
+#C:\apacheSVN\java\target\dastest
+# ********************************************************************
+# ***                Please do NOT edit this file.                 ***
+# *** CHANGING THE CONTENT OF THIS FILE MAY CAUSE DATA CORRUPTION. ***
+# ********************************************************************
+#Fri Feb 17 08:55:29 MST 2006
+SysschemasIndex2Identifier=225
+SyscolumnsIdentifier=144
+SysconglomeratesIndex1Identifier=49
+SysconglomeratesIdentifier=32
+SyscolumnsIndex2Identifier=177
+SysschemasIndex1Identifier=209
+SysconglomeratesIndex3Identifier=81
+SystablesIndex2Identifier=129
+SyscolumnsIndex1Identifier=161
+derby.serviceProtocol=org.apache.derby.database.Database
+SysschemasIdentifier=192
+derby.storage.propertiesId=16
+SysconglomeratesIndex2Identifier=65
+derby.serviceLocale=en_US
+SystablesIdentifier=96
+SystablesIndex1Identifier=113
diff --git a/das-java/trunk/samples/company-webapp/pom.xml b/das-java/trunk/samples/company-webapp/pom.xml
new file mode 100644
index 0000000000..5cab332043
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/pom.xml
@@ -0,0 +1,89 @@
+<?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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.das.samples</groupId>
+        <artifactId>tuscany-das-samples</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>tuscany-das-sample-company-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>Tuscany DAS Company Sample</name>
+    <description>Sample use of RDB DAS in a Web application</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.das</groupId>
+            <artifactId>tuscany-das-rdb</artifactId>
+            <version>${das.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+       <dependency>
+           <groupId>org.apache.tuscany.sdo</groupId>
+           <artifactId>tuscany-sdo-impl</artifactId>
+           <version>${sdo.version}</version>
+           <scope>compile</scope>
+       </dependency>
+
+       <dependency>
+           <groupId>org.apache.tuscany.sdo</groupId>
+           <artifactId>tuscany-sdo-api-r2.1</artifactId>
+           <version>${sdo.version}</version>
+           <scope>compile</scope>
+       </dependency>
+       
+        <dependency>
+            <groupId>org.apache.tuscany.das.samples</groupId>
+            <artifactId>tuscany-das-sample-dbconfig</artifactId>
+            <version>${das.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.derby</groupId>
+	            <artifactId>derby</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <!-- this will place the java source files inside the war -->
+    <build>
+        <finalName>sample-company-webapp</finalName>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+            </resource>
+            <resource>
+              <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+</project>
diff --git a/das-java/trunk/samples/company-webapp/readme.htm b/das-java/trunk/samples/company-webapp/readme.htm
new file mode 100644
index 0000000000..f632162b2a
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/readme.htm
@@ -0,0 +1,201 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+  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.
+ -->
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Tuscany DAS Sample - Company webapp</title>
+
+<style>
+.code {font-size: 11px; color: #006699}
+.codebox {border: 1px solid #6699CC; background-color: #F1F7FA;padding:15px}
+.codebox2 {border: 1px solid #6699CC; background-color: #F1F7FA;padding:15px; width:85%}
+.codeboxW {border: 1px solid #6699CC; background-color: #FFFFFF;padding:15px}
+.codeboxB {background-color: #C9DBED;padding:1px 10px 10px 10px}
+</style>
+
+</head>
+
+<body>
+
+<h1><center>DAS Company web application Sample</center></h1>
+
+<br>
+<br>
+
+<p>
+This stand-alone sample demonstrates the SDO RDB Data Access Service in the context of a simple web application<br>
+<p>
+<p>
+The application starts with a database of Companies and their related Departments.Through the web page interface, a user can:<br>
+<br>
+
+<ol start=1 type=1>
+ <li>Display all Companies in the database</li>
+ <li>Display all Companies and related Departments</li>
+ <li>Add a new Department to a Company</li>
+ <li>Delete all Departments from a Company</li>
+ <li>Change the names of Departments in a Company</li>
+</ol>
+
+<p>This simple application covers all CRUD operations as well as some relationship manipulation (adding a Department associates that
+Department with the Company).The sample runs on Tomcat 6.0 and employs a Derby database (default) accessed via a DataSource.</p>
+
+<h2>Running the sample</h2>
+
+<p>There are two options for running this sample:</p>
+
+<ol start=1 type=1>
+ <li>Run from Tomcat configured by the build</li>
+ <li>Deploying the Company-webapp WAR into a Tomcat you configure yourself</li>
+</ol>
+
+<h3>Running from Tomcat configured by the build</h3>
+
+<p>
+You need to download the Tuscany RDB DAS source distribution and run maven build to use this option.
+When you build using maven from the source root {SRC_ROOT} directory, the sample war file is created
+under {SRC_ROOT}/samples/company-webapp/target. This sample application is deployed to an instance
+of Tomcat as part of our automated sample testing. For this, follow readme.htm instructions from
+{SRC_ROOT}/samples/testing/tomcat. This will in-effect run the htmlunit tests on the sample.
+The sample deployed on Tomcat instance will be ready this way and you can just point your browser
+to <a href="http://localhost:8080/sample-company-webapp/">http://localhost:8080/sample-company-webapp/</a>
+to test further.
+</p>
+
+<h3>Deploying the Company-webapp WAR into a Tomcat you configured yourself</h3>
+
+<p>
+Alternatively, you can deploy the sample to your own configured Tomcat installation by following
+the instructions below.These instructions assume that you have either 1) downloaded the Tuscany
+binary distribution or 2) Downloaded the Tuscany source and run maven build.See the following
+link for more details steps on how to build DAS Sample applications <a
+href="http://incubator.apache.org/tuscany/das-java-developer-guide.html">
+http://incubator.apache.org/tuscany/das-java-developer-guide.html</a>.
+</p>
+
+<b>Set Up - Derby</b>
+
+<ul>
+   <li>Download and install the most recent stable version of Tomcat 5.5 or Tomcat 6.  You can find it here: http://tomcat.apache.org/download-60.cgi</li>
+   <li>Download the most recent official release of Derby from here: http://db.apache.org/derby/index.html.  The only file you'll need from this download is derby(version).jar</li>
+   <li>Stop Tomcat</li>
+   <li>Copy derby(version).jar (from the derby distribution) to {Tomcat_Home}/common/lib (for Tomcat 5.5) or to {Tomcat_Home}/lib (for Tomcat 6) - e.g. derby-10.2.2.0.jar.</li>
+   <li>Add the sample war file to {Tomcat_Home}/webapps
+      <ul>
+         <li>sample-company-webapp.war</li>
+      </ul>
+   </li>
+   <li>Define a DataSource by adding a datasource definition to {Tomcat_Home}/conf/server.xml.
+      <ul>
+         <li>Find the end-of-section marker </GlobalNamingResources> and add the following lines just above it:</li>
+      </ul>
+
+        <pre STYLE="{font-style:italic}">
+        &lt;!-- Global Datasource for Derby dastest database --&gt;
+        &lt;Resource name="jdbc/dastest"
+                  type="javax.sql.DataSource" auth="Container"
+                  description="Derby database for DAS Company sample"
+                  maxActive="100" maxIdle="30" maxWait="10000"
+                  username="" password=""
+                  driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+                  url="jdbc:derby:{absolute path}Databases/dastest;create=true"/&gt;
+        </pre>
+
+	   <b>Requirement:</b> You must include the absolute path to the <i>Databases</i> directory in the above url attribute. <br/>
+       Fore example: &lt;url="jdbc:derby:c:\apache-tomcat-6.0.13\Databases/ajaxdastest;create=true"/&gt;
+       <br><br>
+       As the new utility, dbConfig is embedded in this sample war, the Derby database "dastest" will get
+       created with required tables and data when the web application gets loaded for the first time in tomcat.
+       <br><br>
+   </li>
+   <li>Start tomcat and point your browser to: <a href="http://localhost:8080/sample-company-webapp/">http://localhost:8080/sample-company-webapp/</a></li>
+</ul>
+
+
+<b>Set Up - MySQL</b>
+
+<ul>
+   <li>Download and install the most recent stable version of Tomcat 5.5 or Tomcat 6.  You can find it here: http://tomcat.apache.org/download-60.cgi</li>
+   <li>Download the most recent official release of MySQL driver, e.g. mysql-connector-java-5.0.4.jar</li>
+   <li>Stop Tomcat</li>
+   <li>Copy mysql(version).jar (from the MySQL distribution) to {Tomcat_Home}/common/lib (for Tomcat 5.5) or to {Tomcat_Home}/lib (for Tomcat 6) - e.g. mysql-connector-java-5.0.4.jar.</li>
+   <li>Add the sample war file to {Tomcat_Home}/webapps
+      <ul>
+         <li>sample-company-webapp.war</li>
+      </ul>
+   </li>
+   <li>Define a DataSource by adding a datasource definition to {Tomcat_Home}/conf/server.xml.
+      <ul>
+         <li>Find the end-of-section marker </GlobalNamingResources> and add the following lines just above it:</li>
+      </ul>
+
+        <pre STYLE="{font-style:italic}">
+        &lt;!-- Global Datasource for MySQL dastest database --&gt;
+        &lt;Resource name="jdbc/dastest"
+                  type="javax.sql.DataSource" auth="Container"
+                  description="MySQL database for DAS Company sample"
+                  maxActive="100" maxIdle="30" maxWait="10000"
+                  username="dastest" password="dastest"
+                  driverClassName="com.mysql.jdbc.Driver"
+                  url="jdbc:mysql://localhost/dastest?createDatabaseIfNotExist=true"/&gt;
+        </pre>
+
+	   <b>Requirement:</b>MySQL service should be up with configured port open for TCPIP communication.<br/>
+       <br><br>
+       As the new utility, dbConfig is embedded in this sample war, the MySQL database "dastest" will get created with
+       required tables and data when the web application gets loaded for the first time in tomcat. Please note that,
+       in the binary distribution, WEB-INF/classes/CompanyWebDBConfig.xml has SQL Table creation syntax for Derby.
+       To make it compatible to MySQL, simply replace GENERATED ALWAYS AS IDENTITY with AUTO_INCREMENT for all
+       table creation statements. (For this unjar the .war, change CompanyWebDBConfig.xml and jar the .war
+       back with changed CompanyWebDBConfig.xml)
+       <br>
+       <br>
+   </li>
+   <li>Start tomcat and point your browser to: <a href="http://localhost:8080/sample-advanced-webapp/">http://localhost:8080/sample-advanced-webapp/</a></li>
+</ul>
+
+
+<h2>Sample Architecture</h2>
+
+<p>
+This is a simple, single-page, web application.The main components of this application are:
+</p>
+
+<ul type=disc>
+ <li>The RDB Data Access Service (DAS)</li>
+ <li>SDO</li>
+ <li>CompanyClient.java</li>
+ <li>Company.jsp</li>
+</ul>
+
+<p>The <b>CompanyClient</b> uses the <b>DAS</b> directly and provides high-level services to the jsp such as:</p>
+<p style='margin-left:.5in'>public final List getCompanies()</p>
+
+<p>This is a good place to look for how you might use the DAS in your own application.</p>
+
+<p>The <b>Company.jsp</b> responds to client interaction by invoking services of the CompanyClient.It receives data
+from the CompanyClient as SDO data graphs and manipulates SDOs directly to display data.</p>
+
+<p>The <b>DAS</b> accepts directives (commands) from the <b>CompanyClient</b> and reads and writes to the derby
+database instance appropriately.</p>
+
+</body>
+
+</html>
diff --git a/das-java/trunk/samples/company-webapp/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java b/das-java/trunk/samples/company-webapp/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java
new file mode 100644
index 0000000000..d0519ecc08
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java
@@ -0,0 +1,151 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.samples.das.companyweb;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+
+import commonj.sdo.DataObject;
+
+public class CompanyClient {
+
+    private Random generator = new Random();
+
+    private DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"));
+
+    public final List getCompanies() {
+
+        Command read = das.getCommand("all companies");
+        DataObject root = read.executeQuery();
+        return root.getList("COMPANY");
+
+    }
+
+    public final List getCompaniesWithDepartments() {
+
+        Command read = das.getCommand("all companies and departments");
+        DataObject root = read.executeQuery();
+        return root.getList("COMPANY");
+    }
+
+    public final List getDepartmentsForCompany(int id) {
+        Command read = das.getCommand("all departments for company");
+        read.setParameter(1, new Integer(id));
+        DataObject root = read.executeQuery();
+        return root.getList("COMPANY");
+    }
+
+    public final void addDepartmentToFirstCompany() {
+        Command read = das.getCommand("all companies and departments");
+        DataObject root = read.executeQuery();
+        DataObject firstCustomer = root.getDataObject("COMPANY[1]");
+
+        DataObject newDepartment = root.createDataObject("DEPARTMENT");
+        newDepartment.setString("NAME", "Default Name");
+        firstCustomer.getList("departments").add(newDepartment);
+
+        das.applyChanges(root);
+
+    }
+
+    public final void deleteDepartmentsFromFirstCompany() {
+
+        // This section gets the ID of the first Company just so I can
+        // demonstrate a parameterized command next
+        Command readAll = das.getCommand("all companies and departments");
+        DataObject root = readAll.executeQuery();
+        int idOfFirstCustomer = root.getInt("COMPANY[1]/ID");
+        System.out.println("ID of first company is: " + idOfFirstCustomer);
+
+        // Read a specific company based on the known ID
+        Command readCust = das.getCommand("company by id with departments");
+        readCust.setParameter(1, new Integer(idOfFirstCustomer));
+        root = readCust.executeQuery();
+
+        // Delete all the comany's departments from the graph
+        DataObject firstCustomer = root.getDataObject("COMPANY[1]");
+
+        // Shallow copy of list for deleting. This is required to avoid the
+        // dreaded
+        // ConcurrentModificationException since #delete operation also removes
+        // from the original list
+        List allDepartments = new ArrayList(firstCustomer.getList("departments"));
+
+        Iterator i = allDepartments.iterator();
+        DataObject department;
+        while (i.hasNext()) {
+            department = (DataObject) i.next();
+            System.out.println("Deleting department named: " + department.getString("NAME"));
+            department.delete();
+        }
+
+        das.applyChanges(root);
+
+    }
+
+    public final void changeFirstCompanysDepartmentNames() {
+
+        // This section gets the ID of the first Company just so I can
+        // demonstrate a parameterized command next
+        Command readAll = das.getCommand("all companies and departments");
+        DataObject root = readAll.executeQuery();
+        int idOfFirstCustomer = root.getInt("COMPANY[1]/ID");
+        System.out.println("ID of first company is: " + idOfFirstCustomer);
+
+        // Read a specific company based on the known ID
+        Command readCust = das.getCommand("company by id with departments");
+        readCust.setParameter(1, new Integer(idOfFirstCustomer));
+        root = readCust.executeQuery();
+
+        // Modify all the comany's department names
+        DataObject firstCustomer = root.getDataObject("COMPANY[1]");
+        Iterator i = firstCustomer.getList("departments").iterator();
+        DataObject department;
+        while (i.hasNext()) {
+            department = (DataObject) i.next();
+            System.out.println("Modifying department: " + department.getString("NAME"));
+            department.setString("NAME", getRandomDepartmentName());
+        }
+        das.applyChanges(root);
+
+    }
+    
+    
+    public void releaseResources() {
+        das.releaseResources();
+    }
+
+    // Utilities
+
+    private String getRandomDepartmentName() {
+        int number = generator.nextInt(1000) + 1;
+        return "Dept-" + number;
+    }
+
+    private InputStream getConfig(String fileName) {
+        return getClass().getClassLoader().getResourceAsStream(fileName);
+    }
+
+}
diff --git a/das-java/trunk/samples/company-webapp/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyDBInit.java b/das-java/trunk/samples/company-webapp/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyDBInit.java
new file mode 100644
index 0000000000..edd62e6f30
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyDBInit.java
@@ -0,0 +1,70 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.samples.das.companyweb;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.tuscany.das.rdb.dbconfig.DBInitializer;
+
+public class CompanyDBInit extends HttpServlet {
+    private static final long serialVersionUID = -4795999792460944805L;
+    private static final String dbConfigFile = "CompanyWebDBConfig.xml";
+
+    public void init() throws ServletException {
+        try {
+            DBInitializer dbInitializer;
+            dbInitializer = new DBInitializer(getConfig(dbConfigFile)); 
+            if (! dbInitializer.isDatabaseReady()) {
+                dbInitializer.initializeDatabase(true);
+            }
+        } catch (Exception e) {
+
+            e.printStackTrace();
+            log(e.toString(), e);
+            throw new ServletException(e);
+        }
+    }
+
+    /*
+     * (non-Java-doc)
+     * 
+     * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest arg0, HttpServletResponse arg1)
+     */
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        response.setContentType("text/html");
+
+        PrintWriter out = response.getWriter();
+
+        out.println();
+        out.println("<center><h2>CompanyWeb database initialization servlet !<h2></center>");
+        out.println();
+    }
+    
+    private InputStream getConfig(String fileName) {
+        return getClass().getClassLoader().getResourceAsStream(fileName);
+    }
+
+}
diff --git a/das-java/trunk/samples/company-webapp/src/main/resources/CompanyConfig.xml b/das-java/trunk/samples/company-webapp/src/main/resources/CompanyConfig.xml
new file mode 100644
index 0000000000..a674724323
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/src/main/resources/CompanyConfig.xml
@@ -0,0 +1,46 @@
+<?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"> 
+    
+    <ConnectionInfo dataSource="java:comp/env/jdbc/dastest"/>
+    
+    <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/das-java/trunk/samples/company-webapp/src/main/resources/CompanyWebDBConfig.xml b/das-java/trunk/samples/company-webapp/src/main/resources/CompanyWebDBConfig.xml
new file mode 100644
index 0000000000..c064045fd5
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/src/main/resources/CompanyWebDBConfig.xml
@@ -0,0 +1,51 @@
+<?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.
+ -->
+<DBConfig xmlns="http:///org.apache.tuscany.das.rdb/dbconfig.xsd">
+	
+	<!--ConnectionInfo>
+		<ConnectionProperties 
+			driverClass="org.apache.derby.jdbc.EmbeddedDriver" 
+			databaseURL="jdbc:derby:../Databases/dastest; create = true" 
+			loginTimeout="600000"/>
+	</ConnectionInfo-->
+    <ConnectionInfo dataSource="java:comp/env/jdbc/dastest"/>
+    
+	<Table name="COMPANY" SQLCreate="CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY , NAME VARCHAR(30))" >
+		<row>'ACME Publishing'</row>
+		<row>'Do-rite plumbing'</row>
+		<row>'MegaCorp'</row>
+	</Table>
+	<Table name="DEPARTMENT" SQLCreate="CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY, NAME VARCHAR(30),LOCATION VARCHAR(30), DEPNUMBER VARCHAR(10),COMPANYID INT)">
+		<row>'Advanced Technologies', 'NY', '123', 1</row>
+		<row>'Default Name 2', '', '', 1</row>
+		<row>'Default Name 3', '', '', 1</row>
+		<row>'Default Name 4', '', '', 1</row>
+		<row>'Default Name 5', '', '', 1</row>
+		<row>'Default Name 6', '', '', 1</row>
+		<row>'Default Name 7', '', '', 1</row>
+		<row>'Default Name 8', '', '', 1</row>
+	</Table>
+	<Table name="EMPLOYEE" SQLCreate="CREATE TABLE EMPLOYEE (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY,NAME VARCHAR(30),SN VARCHAR(10), MANAGER SMALLINT, DEPARTMENTID INT)">
+		<row>'John Jones','E0001',0,1</row>
+		<row>'Mary Smith','E0002',1,null</row>
+		<row>'Jane Doe','E0003',0,1</row>
+		<row>'Al Smith','E0004',1,1</row>
+	</Table>
+</DBConfig>
diff --git a/das-java/trunk/samples/company-webapp/src/main/resources/META-INF/LICENSE b/das-java/trunk/samples/company-webapp/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000000..9597d92eb3
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,353 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+===============================================================================================================
+
+Other components and dependencies under Apache Software License 2.0 : 
+
+   log4j-1.2.14.jar    - Apache Logging Services
+   derby 10.2.2.0.jar  - Apache Derby
+   stax-api-1.0.1.jar  - The Streaming API for XML (StAX)
+   wstx-asl-3.2.0.jar  - WoodStox StAX implementation
+   standard-1.1.1.jar  - The Apache Jackarta Taglibs
+   jstl-1.1.2.jar      - The Apache Jackarta Taglibs
+   *.tld               - The Apache Jackarta Taglibs
+
+===============================================================================================================
+
+
+Apache Tuscany SDO for Java Subcomponents
+=========================================: 
+
+The Tuscany SDO for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
+
+Permission to copy, make derivative works of, and distribute the Service Data Objects 
+JavaDoc and Interface Definition Files files in any medium without fee or royalty as part 
+of a compliant implementation of the Service Data Objects Specification is hereby granted.  
+The Service Data Objects Specification may be found at any of the following locations:
+
+http://dev2dev.bea.com/technologies/commonj/index.jsp
+http://www.ibm.com/developerworks/library/specification/ws-sdo/
+http://oracle.com/technology/webservices/sca
+https://www.sdn.sap.com/
+http://www.xcalia/xdn/specs/sdo
+
+THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES 
+ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS 
+SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES AND THE IMPLEMENTATION OF THEIR CONTENTS, 
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE 
+SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or 
+publicity pertaining to the Service Component Architecture Specification or its contents without specific, 
+written prior permission. Title to copyright in the Service Data Objects Specification and the 
+JavaDoc and Interface Definition Files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+=================================================================================================================
+
+For the Eclipse EMF components
+(codegen-2.2.3.jar
+codegen-ecore-2.2.3.jar
+common-2.2.3.jar
+ecore-2.2.3.jar
+ecore-change-2.2.3.jar
+ecore-xmi-2.2.3.jar
+xsd-2.2.3.jar)
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+===================================================================================================
diff --git a/das-java/trunk/samples/company-webapp/src/main/resources/META-INF/NOTICE b/das-java/trunk/samples/company-webapp/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000000..e9d98fc7f5
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,32 @@
+Apache Tuscany SDO for Java
+Copyright 2006, 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Apache Tuscany is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Web Services PMC. Incubation is required of all newly accepted
+projects until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with other successful
+ASF projects. While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be fully endorsed
+by the ASF.
+
+Unless otherwise indicated, all distribution made available by the Apache Software Foundation
+is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
+A copy of the AL is provided with this distribution as the LICENSE.txt file present in the
+root directory, and is also available at http://www.apache.org/licenses/.
+
+The terms and conditions governing the distribution may refer to the AL or other license
+agreements, notices or terms and conditions. Some of these other license agreements may
+include (but are not limited to):
+
+  . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
+
+It is your obligation to read and accept all such terms and conditions prior to use of the
+distribution. If term or condition is provided, please contact the Apache Software Foundation
+to determine what terms and conditions govern that particular distribution.
+
+This product also includes software developed by the Open Service Oriented Architecture organisation
+(http://osoa.org). The license for this software may be found in the LICENSE.txt file contained in this
+distribution.
diff --git a/das-java/trunk/samples/company-webapp/src/main/resources/META-INF/README b/das-java/trunk/samples/company-webapp/src/main/resources/META-INF/README
new file mode 100644
index 0000000000..107de8c3ca
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/src/main/resources/META-INF/README
@@ -0,0 +1,35 @@
+Apache Tuscany M2 build (October, 2006)
+===================================
+
+http://incubator.apache.org/tuscany/
+
+Tuscany is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Web Services PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness or 
+stability of the code, it does indicate that the project has yet to be fully
+endorsed by the ASF.
+
+
+Support
+-------
+
+Any problem with this release can be reported to the Tuscany mailing list 
+or in the JIRA issue tracker.
+
+Mailing list subscription:
+    tuscany-dev-subscribe@ws.apache.org
+
+Jira:
+    http://issues.apache.org/jira/browse/Tuscany
+
+
+Thank you for using Tuscany!
+
+
+The Tuscany Team. 
+
diff --git a/das-java/trunk/samples/company-webapp/src/main/resources/log4j.properties b/das-java/trunk/samples/company-webapp/src/main/resources/log4j.properties
new file mode 100644
index 0000000000..ab4ebbb785
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/src/main/resources/log4j.properties
@@ -0,0 +1,36 @@
+#  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.
+#  
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=INFO, NULL
+
+# NULL Appender
+log4j.appender.NULL=org.apache.log4j.varia.NullAppender
+
+log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
+log4j.appender.NULL.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n
+
+# CONSOLE is set to be a ConsoleAppender.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n
+
+
+# Print only messages of level WARN or above in the package com.foo.
+log4j.logger.org.apache.tuscany=NONE
+\ No newline at end of file
diff --git a/das-java/trunk/samples/company-webapp/src/main/webapp/Company.jsp b/das-java/trunk/samples/company-webapp/src/main/webapp/Company.jsp
new file mode 100644
index 0000000000..9b74f0a357
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/src/main/webapp/Company.jsp
@@ -0,0 +1,155 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!--
+  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.
+ -->
+<html>
+<head>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"
+   import="commonj.sdo.*"
+
+   import="org.apache.tuscany.samples.das.companyweb.CompanyClient"
+%>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Company Test</title>
+</head>
+<body>
+
+<H2>Tuscany DAS Companies WEB Example</H2>
+
+
+<form>
+<input type="submit" id="doFill" name="doFill" value="All Companies">
+<input type="submit" id="doFillAll" name="doFillAll" value="All Companies/Departments">
+<input type="submit" id="doAddDepartment" name="doAddDepartment" value="Add department to first company">
+<input type="submit" id="doChangeDepartmentNames" name="doChangeDepartmentNames" value="Change Company(1) Dept names">
+<input type="submit" id="doDeleteDepartments" name="doDeleteDepartments" value="Delete Company(1) Depts">
+<hr>
+
+<!-- Do Fill -->
+<%if(request.getParameter("doFill") != null){%>
+
+<table border>
+	<thead>
+		<tr>
+			<th>ID</th>
+			<th>Name</th>
+		</tr>
+	</thead>
+	<tbody>
+
+		<%
+		CompanyClient companyClient = new CompanyClient();
+		java.util.Iterator i = companyClient.getCompaniesWithDepartments().iterator();
+		while (i.hasNext()) {
+			DataObject company = (DataObject)i.next();
+		%>
+			<tr>
+				<td><%=company.getInt("ID")%></td>
+				<td><%=company.getString("NAME")%></td>
+			<tr>
+		<%	
+		}
+		companyClient.releaseResources();
+		%>
+		
+	</tbody>
+</table>
+<%}%>
+
+
+<!-- Do Add Department -->
+<%
+if(request.getParameter("doAddDepartment") != null){
+    CompanyClient companyClient = new CompanyClient();
+    companyClient.addDepartmentToFirstCompany();
+    companyClient.releaseResources();
+}
+%>
+
+<!-- Do Delete Departments from first company -->
+<%
+if(request.getParameter("doDeleteDepartments") != null){
+    CompanyClient companyClient = new CompanyClient();
+    companyClient.deleteDepartmentsFromFirstCompany();
+    companyClient.releaseResources();
+}
+%>
+
+<!-- Do Change First Company's Department Names -->
+<%
+if(request.getParameter("doChangeDepartmentNames") != null){
+    CompanyClient companyClient = new CompanyClient();
+    companyClient.changeFirstCompanysDepartmentNames();
+    companyClient.releaseResources();
+}
+%>
+
+
+<!-- Do FillAll -->
+<%if(request.getParameter("doFill") == null) {%>
+
+<table border>
+	<thead>
+		<tr>
+			<th>ID</th>
+			<th>Name</th>
+			<th>Department_ID</th>
+			<th>Department_Name</th>
+		</tr>
+	</thead>
+	<tbody>
+
+		<%
+		CompanyClient companyClient = new CompanyClient();
+		java.util.Iterator i = companyClient.getCompaniesWithDepartments().iterator();
+		while (i.hasNext()) {
+			DataObject company = (DataObject)i.next();
+		%>
+			<tr>
+				<td><%=company.getInt("ID")%></td>
+				<td><%=company.getString("NAME")%></td>
+			<tr>
+
+			
+
+			<%
+			java.util.Iterator j = company.getList("departments").iterator();
+			while (j.hasNext()) {
+				DataObject department = (DataObject)j.next();
+			%>
+				<tr>
+					<td></td><td></td><td><%=department.getInt("ID")%></td>
+					<td><%=department.getString("NAME")%></td>
+				<tr>
+			<%	
+			}
+			%>
+		<%	
+		}
+		companyClient.releaseResources();
+		%>
+		
+	</tbody>
+</table>
+<%}%>
+
+
+
+</form>
+</body>
+</html>
diff --git a/das-java/trunk/samples/company-webapp/src/main/webapp/META-INF/context.xml b/das-java/trunk/samples/company-webapp/src/main/webapp/META-INF/context.xml
new file mode 100644
index 0000000000..5f0af32dd5
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/src/main/webapp/META-INF/context.xml
@@ -0,0 +1,25 @@
+<?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.
+ -->
+<Context path="/DAS Stand alone app" debug="5" reloadable="true" crossContext="true">
+
+   <Manager pathname=""/>
+   <ResourceLink name="jdbc/dastest" global="jdbc/dastest" type="javax.sql.DataSource" />
+                        
+</Context>
diff --git a/das-java/trunk/samples/company-webapp/src/main/webapp/WEB-INF/web.xml b/das-java/trunk/samples/company-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..a0abb6a655
--- /dev/null
+++ b/das-java/trunk/samples/company-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  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.
+ -->
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+    <display-name>Tuscany DAS sample Company  WEB</display-name>
+
+    <welcome-file-list id="WelcomeFileList">
+        <welcome-file>Company.jsp</welcome-file>
+    </welcome-file-list>
+
+    <!-- Initialize Company database -->
+    <servlet>
+        <servlet-name>CompanyDBInit</servlet-name>
+        <servlet-class>org.apache.tuscany.samples.das.companyweb.CompanyDBInit</servlet-class>
+        <load-on-startup>2</load-on-startup>
+  </servlet>
+</web-app>
diff --git a/das-java/trunk/samples/customer/build.xml b/das-java/trunk/samples/customer/build.xml
new file mode 100644
index 0000000000..94ce30e1ca
--- /dev/null
+++ b/das-java/trunk/samples/customer/build.xml
@@ -0,0 +1,38 @@
+<!--
+ * 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.    
+-->
+<project name="customer" default="run">
+    <property name="test.class" value="org.apache.tuscany.samples.das.customer.CustomerClient" />
+	<property name="test.jar"   value="sample-customer.jar" />
+	
+	
+    <target name="run">
+        <java classname="${test.class}"
+              fork="true">
+	    <classpath>
+	      <pathelement path="${classpath}"/>
+	      <fileset dir="../../lib">
+		<include name="**/*.jar"/>
+	      </fileset>
+	      <pathelement location="derby-10.2.2.0.jar"/>
+              <pathelement path="${test.jar}"/>
+	    </classpath>        
+        </java>    	
+    </target>	
+	
+</project>
diff --git a/das-java/trunk/samples/customer/pom.xml b/das-java/trunk/samples/customer/pom.xml
new file mode 100644
index 0000000000..f8665da523
--- /dev/null
+++ b/das-java/trunk/samples/customer/pom.xml
@@ -0,0 +1,92 @@
+<?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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.das.samples</groupId>
+        <artifactId>tuscany-das-samples</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>tuscany-das-sample-customer</artifactId>
+    <packaging>jar</packaging>
+    <name>Tuscany DAS Customer Sample</name>
+    <description>Sample use of RDB DAS in a J2SE application</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.das</groupId>
+            <artifactId>tuscany-das-rdb</artifactId>
+            <version>${das.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>${sdo.version}</version>
+            <scope>compile</scope>
+        </dependency>
+ 
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-api-r2.1</artifactId>
+            <version>${sdo.version}</version>
+            <scope>compile</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.2.2.0</version>
+            <scope>compile</scope>
+        </dependency>        
+    </dependencies>
+
+    <!-- this will place the java source files inside the jar -->
+    <build>
+        <finalName>sample-customer</finalName>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+            </resource>
+            <resource>
+              <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+	   <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest> 
+                    <mainClass>org.apache.tuscany.samples.das.customer.CustomerClient</mainClass> 
+                    <addClasspath>true</addClasspath> 
+                    <!-- classpathPrefix>../../lib/</classpathPrefix --> 
+                   </manifest> 
+
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/das-java/trunk/samples/customer/readme.htm b/das-java/trunk/samples/customer/readme.htm
new file mode 100644
index 0000000000..0c1f6f715d
--- /dev/null
+++ b/das-java/trunk/samples/customer/readme.htm
@@ -0,0 +1,156 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+  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.
+ -->
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Tuscany DAS Sample - Customer</title>
+
+<style>
+.code {font-size: 11px; color: #006699}
+.codebox {border: 1px solid #6699CC; background-color: #F1F7FA;padding:15px}
+.codebox2 {border: 1px solid #6699CC; background-color: #F1F7FA;padding:15px; width:85%}
+.codeboxW {border: 1px solid #6699CC; background-color: #FFFFFF;padding:15px}
+.codeboxB {background-color: #C9DBED;padding:1px 10px 10px 10px}
+</style>
+
+</head>
+
+<h1><center>Customer J2SE sample application</center></h1>
+
+<br>
+
+<p>
+This stand-alone sample demonstrates the RDB Data Access Service in the context of a simple java application.
+</p>
+
+<br>
+
+<h2>Building and Running</h2>
+
+<ul>
+	<li>Apache Ant latest version installed.
+		<ul>
+			<li>Download Apache Ant latest version on and extract into folder &lt;apache_ant_folder&gt;. You can find it here: <a href="http://ant.apache.org/bindownload.cgi">http://ant.apache.org/bindownload.cgi</a>.</li>
+			<li>Add &lt;apache_ant_folder&gt;/bin directory to your OS path variable.</p></li>
+		</ul>
+	</li>
+
+	<li>On console change the actual directory to &lt;tuscany_das_java_distribution&gt;/samples/customer/ and execute ant application:
+	  <ul>
+		<li>&lt;tuscany_das_java_distribution&gt;/samples/customer/&gt; ant</li>
+	  </ul>
+	</li>
+</ul>
+
+<p>
+The sample will run and output the following:
+</p>
+
+<p>
+<pre style="code">
+Buildfile: build.xml
+
+run:
+     [java] ************* Initializing database *************
+     [java] ** DB type  : derby
+     [java] ** Database : jdbc:derby:target/dastest; create = true
+     [java] ** User     :
+     [java] ** Password :
+     [java] ************************************************
+     [java] Setting up for derby run!
+     [java] Dropping tables
+     [java] Dropping procedures
+     [java] Creating tables
+     [java] Creating procedures
+     [java] Inserting data in tables
+     [java] Database setup complete!
+     [java]
+     [java] Result:select all customers
+     [java]    ID:1 LASTNAME:John ADDRESS:USA
+     [java]    ID:2 LASTNAME:Amita ADDRESS:INDIA
+     [java]    ID:3 LASTNAME:Patrick ADDRESS:UK
+     [java]    ID:4 LASTNAME:Jane ADDRESS:UN
+     [java]
+     [java] Result:insert new customer
+     [java]    ID:1 LASTNAME:John ADDRESS:USA
+     [java]    ID:2 LASTNAME:Amita ADDRESS:INDIA
+     [java]    ID:3 LASTNAME:Patrick ADDRESS:UK
+     [java]    ID:4 LASTNAME:Jane ADDRESS:UN
+     [java]    ID:5 LASTNAME:Jenny ADDRESS:USA
+     [java]
+     [java] Result:update first customer
+     [java]    ID:1 LASTNAME:BlueBerry ADDRESS:USA
+     [java]    ID:2 LASTNAME:Amita ADDRESS:INDIA
+     [java]    ID:3 LASTNAME:Patrick ADDRESS:UK
+     [java]    ID:4 LASTNAME:Jane ADDRESS:UN
+     [java]    ID:5 LASTNAME:Jenny ADDRESS:USA
+     [java]
+     [java] Result:delete last customer
+     [java] Deleting customer named: Jenny
+     [java]    ID:1 LASTNAME:BlueBerry ADDRESS:USA
+     [java]    ID:2 LASTNAME:Amita ADDRESS:INDIA
+     [java]    ID:3 LASTNAME:Patrick ADDRESS:UK
+     [java]    ID:4 LASTNAME:Jane ADDRESS:UN
+
+BUILD SUCCESSFUL
+</pre>
+</p>
+
+<br>
+
+<p>
+<b>Observation:</b>The build.xml ant file only works on DAS Java binary distribution.
+</p>
+
+
+
+<h2>Running  Sample with MySQL</h2>
+<br>
+<p>
+The sample is pre-configured to run using an embedded Derby database.Follow below instructions to run the sample on another database (e.g MySQL).<br>
+</p>
+
+<ul>
+   <li>Expand sample-customer.jar under <tuscany_das_java_distribution>/samples/customer to access CustomersConfig.xml</li>
+   <li>Change CustomersConfig.xml - comment Derby connection info and uncomment MySQL connection info. Check for correct userName, password, and other configuration information </li>
+   <li>Change <tuscany_das_java_distribution>/samples/customer /build.xml to replace pathelement location from Derby jar to MySQL jar like -
+      <ul>
+         <li>&lt;pathelement location="mysql-connector-java-5.0.4.jar"/&gt;</li>
+      </ul>
+   </li>
+   <li>Create new sample-customer.jar to use the changed CustomersConfig.xml , replacing the one from binary distribution under <tuscany_das_java_distribution>/samples/customer.</li>
+   <li>Place required mysql jar (e.g. mysql-connector-java-5.0.4.jar) under <tuscany_das_java_distribution>/samples/customer.</li>
+   <li>From command prompt run the sample application using ant -
+      <ul>
+         <li>&lt;tuscany_das_java_distribution>/samples/customer/&gt; ant</li>
+      </ul>
+   </li>
+ </ul>
+
+<p>
+<b>Observations:</b>
+<ul>
+   <li>These instructions apply only for DAS Java binary distribution.</li>
+   <li>MySQL Database will be created and populated with necessary structure and data if not present</li>
+</ul>
+
+</BODY>
+</HTML>
+\ No newline at end of file
diff --git a/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerClient.java b/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerClient.java
new file mode 100644
index 0000000000..ca66c5bf4f
--- /dev/null
+++ b/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerClient.java
@@ -0,0 +1,197 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.samples.das.customer;
+
+import java.io.InputStream;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+
+import commonj.sdo.DataObject;
+
+public class CustomerClient {
+    private static final String DEFAULT_CUSTOMER_CONFIG = "CustomersConfig.xml";
+    
+	private DAS das = null;
+    private final String configFile;
+    
+    /**
+     * Default constructor
+     *
+     */
+	public CustomerClient(){	
+        this.configFile = DEFAULT_CUSTOMER_CONFIG;
+	}
+    
+    /**
+     * Constructor receiving the das config file to be used
+     * @param configFile DAS configuration file
+     */
+    public CustomerClient(String configFile) {
+        this.configFile = configFile;
+    }
+    
+    /**
+     * Helper method to get a stream from the customer config file 
+     * @param fileName
+     * @return
+     */
+    protected InputStream getConfig(String fileName) {
+        return getClass().getClassLoader().getResourceAsStream(fileName);
+    }
+    
+    /**
+     * Get a reference to DAS, initialize it if necessary
+     * @return DAS reference
+     */
+    protected DAS getDAS() {
+        if (this.das == null ) {
+            this.das = DAS.FACTORY.createDAS(getConfig(this.configFile));
+        }
+        return this.das;
+    }
+
+	
+	/**
+	 * select
+	 * @return
+	 */
+    public final List getCustomers() {
+        Command read = this.getDAS().getCommand("AllCustomers");
+        DataObject root = read.executeQuery();
+        return root.getList("CUSTOMER");
+    }
+
+    /**
+     * insert
+     *
+     */
+    public final void addCustomer() {
+        Command read = this.getDAS().getCommand("AllCustomers");
+        DataObject root = read.executeQuery();
+
+        DataObject newCustomer = root.createDataObject("CUSTOMER");
+        newCustomer.setInt("ID", 5);
+        newCustomer.setString("LASTNAME", "Jenny");
+        newCustomer.setString("ADDRESS", "USA");
+
+        das.applyChanges(root);
+    }
+
+    /**
+     * delete
+     *
+     */
+    public final void deleteCustomer() {
+        Command readAll = this.getDAS().getCommand("AllCustomers");
+        DataObject root = readAll.executeQuery();
+
+        List allCustomers = root.getList("CUSTOMER");
+
+        DataObject lastCustomer = (DataObject)allCustomers.get(allCustomers.size()-1);
+        if(lastCustomer != null){
+        	System.out.println("Deleting customer named: " + lastCustomer.getString("LASTNAME"));
+        	lastCustomer.delete();
+        }
+
+        das.applyChanges(root);
+    }
+
+    /**
+     * update
+     *
+     */
+    public final void changeFirstCustomerName() {
+        Command readAll = this.getDAS().getCommand("AllCustomers");
+        DataObject root = readAll.executeQuery();
+
+        DataObject firstCustomer = root.getDataObject("CUSTOMER[1]");
+        firstCustomer.set("LASTNAME", "BlueBerry");
+        
+        das.applyChanges(root);
+    }
+
+    /**
+     * display result 
+     * @param customers
+     */
+    public static void printList(List customers){
+        for(int i=0; i<customers.size(); i++){
+            System.out.println("   ID:"+(((DataObject)customers.get(i)).getInt("ID"))+
+                        " LASTNAME:"+(((DataObject)customers.get(i)).getString("LASTNAME"))+ 
+                        " ADDRESS:"+(((DataObject)customers.get(i)).getString("ADDRESS")));
+        }
+    }
+    
+    /**
+     * cleanup
+     *
+     */
+    public void releaseResources() {
+        das.releaseResources();
+    }   
+    
+    /**
+     * Main customer application
+     */    
+    public static void main(String[] args){
+        String customerConfigFile = "CustomersConfig.xml"; //this can be from input params too as below
+        
+        if(args != null && args.length >0){
+            customerConfigFile = args[0];
+        }
+        
+        
+        //initialize customer database using helper class
+        CustomerDatabaseInitializer dbInitializer = new CustomerDatabaseInitializer(customerConfigFile);
+        try {
+            dbInitializer.Initialize();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return;
+        }
+        
+        
+        //perform customer operations using DAS
+        CustomerClient customerClient = new CustomerClient(customerConfigFile);        
+        //test select
+        System.out.println();
+        System.out.println("Result:select all customers");
+        printList(customerClient.getCustomers());
+        
+        //test insert
+        System.out.println();
+        System.out.println("Result:insert new customer");
+        customerClient.addCustomer();
+        printList(customerClient.getCustomers());
+        
+        //test update
+        System.out.println();
+        System.out.println("Result:update first customer");
+        customerClient.changeFirstCustomerName();
+        printList(customerClient.getCustomers());
+        
+        //test delete
+        System.out.println();
+        System.out.println("Result:delete last customer");
+        customerClient.deleteCustomer();
+        printList(customerClient.getCustomers());
+    }
+}
+\ No newline at end of file
diff --git a/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerDatabaseInitializer.java b/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerDatabaseInitializer.java
new file mode 100644
index 0000000000..260fc330fd
--- /dev/null
+++ b/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerDatabaseInitializer.java
@@ -0,0 +1,92 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.samples.das.customer;
+
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.util.ConfigUtil;
+import org.apache.tuscany.samples.das.databaseSetup.DerbySetup;
+import org.apache.tuscany.samples.das.databaseSetup.MySQLSetup;
+
+public class CustomerDatabaseInitializer {
+    public static final String DERBY = "derby";
+    public static final String MYSQL = "mysql";
+
+    private final Config config;
+    
+    private final String dbType;
+    private final String dbURL;
+    private final String user;
+    private final String password;
+    
+    
+    
+    public CustomerDatabaseInitializer(String configFile) {
+        this.config = ConfigUtil.loadConfig(this.getClass().getClassLoader().getResourceAsStream(configFile));
+
+        if(config.getConnectionInfo().getConnectionProperties().getDriverClass().indexOf(DERBY) != -1) {
+            dbType = DERBY;
+        } else if(config.getConnectionInfo().getConnectionProperties().getDriverClass().indexOf(MYSQL) != -1) {
+            dbType = MYSQL;
+        } else {
+            dbType = null;
+        }
+            
+        //get connection info from config
+        dbURL = config.getConnectionInfo().getConnectionProperties().getDatabaseURL();
+        user = config.getConnectionInfo().getConnectionProperties().getUserName();
+        password = config.getConnectionInfo().getConnectionProperties().getPassword();
+    }
+    
+    
+
+    /**
+     * If database is present connect to it and create necessary tables, procedures, data etc.
+     * If database is not present create database and then create the above elements. Create database
+     * is implemented for MySQL and Derby.
+     */
+    public void Initialize() {
+        
+        //display DB configuration iformation
+        DisplayDatabaseConfiguration();
+        
+        //initialize DB
+        try {
+            if(dbType.equals(DERBY)){
+                new DerbySetup(dbURL+"-"+user+"-"+password);
+            }
+                        
+            if(dbType.equals(MYSQL)){
+                new MySQLSetup(dbURL+"-"+user+"-"+password);
+            }
+            
+        } catch(Exception e){
+            throw new RuntimeException("Error initializing database !", e);
+        }
+    }
+    
+    public void DisplayDatabaseConfiguration() {
+        
+        System.out.println("************* Initializing database *************");
+        System.out.println("** DB type  : " + dbType );
+        System.out.println("** Database : " + dbURL );
+        System.out.println("** User     : " + user );
+        System.out.println("** Password : " + password);
+        System.out.println("************************************************");
+    }
+}
diff --git a/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetup.java b/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetup.java
new file mode 100644
index 0000000000..4195dbcac7
--- /dev/null
+++ b/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetup.java
@@ -0,0 +1,206 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.samples.das.databaseSetup;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+public class DatabaseSetup{
+    protected Statement s;
+    protected String platformName = "Not initialized";
+    protected String driverName = "Not initialized";
+    protected String databaseURL = "Not initialized";
+    protected String databaseName = null; 
+    protected String userName;
+    protected String password;
+    
+    // Data Types
+    public static final String stringType = "VARCHAR";
+    public static final String integerType = "INT";
+    public static final String timestampType = "TIMESTAMP";
+    public static final String floatType = "FLOAT";
+    public static final String decimalType = "DECIMAL";
+    protected Connection connection;
+    
+    //database types
+    public static final String DERBY = "derby";
+    public static final String MYSQL = "mysql";
+    public static final String DB2 = "db2";
+    
+    public DatabaseSetup(String databaseInfo){
+    	StringTokenizer strTok = new StringTokenizer(databaseInfo, "-");
+    	
+    	if(strTok.hasMoreTokens()){
+    		databaseName =  strTok.nextToken();
+    	}
+    	
+    	if(strTok.hasMoreTokens()){
+    		userName = strTok.nextToken();
+    	}
+    	
+    	if(strTok.hasMoreTokens()){
+    		password = strTok.nextToken();
+    	}
+    	
+        initConnectionProtocol(databaseName);
+        initConnection();
+        try{
+        	this.setUp();
+        }catch(Exception e){
+        	e.printStackTrace();
+        }
+    }
+
+    protected void initConnectionProtocol( String databaseName){
+    }
+
+    private void initConnection() {
+
+        try {
+            Class.forName(driverName).newInstance();
+            Properties props = new Properties();
+            //System.out.println("platform name:"+this.platformName);
+            
+            if(this.platformName.equals(DERBY)){
+                if (userName != null) {
+                	//System.out.println("derby trying for "+userName+","+password+","+databaseURL);
+                    connection = DriverManager.getConnection(databaseURL, userName, password);
+                } else {
+                  	//System.out.println("derby trying for "+databaseURL);                                  	
+                    connection = DriverManager.getConnection(databaseURL);
+                }            	
+            }
+            if(this.platformName.equals(DB2)){
+            	if (userName != null && password != null) {
+            		props.put("user", userName);
+            		props.put("password", password);
+            		
+            		//System.out.println("db2 trying for "+databaseURL+"user,pwd"+userName+","+password);
+            		connection = DriverManager.getConnection(databaseURL, props);            		
+            	}else{
+            		//System.out.println("db2 trying for "+databaseURL);
+            		connection = DriverManager.getConnection(databaseURL);
+            	}            	
+            }
+            if(this.platformName.equals(MYSQL)){
+            	databaseURL=databaseURL+"?user="+userName+"&password="+password+"&createDatabaseIfNotExist="+"true";
+              	//System.out.println("mysql trying for "+userName+","+password+","+databaseURL);                
+            	connection = DriverManager.getConnection(databaseURL, props);
+            }
+
+            connection.setAutoCommit(true);
+        } catch (SQLException e) {
+        	e.printStackTrace();
+            if (e.getNextException() != null) {
+                e.getNextException().printStackTrace();
+            } else {
+                e.printStackTrace();
+            }
+
+            throw new RuntimeException(e);
+        } catch (IllegalAccessException e) {
+        	e.printStackTrace();
+            throw new RuntimeException(e);
+        } catch (InstantiationException e) {
+        	e.printStackTrace();
+            throw new RuntimeException(e);
+        } catch (ClassNotFoundException e) {
+        	e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+    
+    public Connection getConnection(){
+    	return this.connection;
+    }
+    
+    protected void setUp() throws Exception {
+        System.out.println("Setting up for " + platformName + " run!");
+    }
+
+    private void insertData(){
+    }
+    
+    private void dropTables() {        
+    }
+
+    protected void dropTriggers() {
+    }
+
+    protected void createTriggers() {
+    }
+
+    protected void dropSequences() {
+    }
+
+    protected void createSequences() {
+    }
+
+    protected void dropProcedures() {
+    }
+
+    private void createTables() {
+    }
+
+    protected void createProcedures() {
+    }
+
+    //
+    // This section povides methods that return strings for table creation.
+    // Platform-specific sublcasses
+    // can override these as necessary
+    //
+
+    protected String getCreateCustomer() {
+    	return null;
+    }
+    // /////////////////
+
+    protected String getForeignKeyConstraint(String pkTable, String pkColumn, String foreignKey) {
+    	return null;
+    }
+
+    protected String getStringColumn(String name, int length) {
+    	return null;
+    }
+
+    protected String getIntegerColumn(String name) {
+    	return null;
+    }
+
+    protected String getGeneratedKeyClause() {
+    	return null;
+    }
+
+    protected String getDecimalColumn(String name, int size1, int size2) {
+    	return null;
+    }
+
+    protected String getFloatColumn(String name) {
+    	return null;
+    }
+
+    protected String getTimestampColumn(String name) {
+    	return null;
+    }        
+}
+\ No newline at end of file
diff --git a/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java b/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java
new file mode 100644
index 0000000000..339cac3587
--- /dev/null
+++ b/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java
@@ -0,0 +1,209 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.samples.das.databaseSetup;
+
+import java.sql.SQLException;
+
+public class DerbySetup extends DatabaseSetup {
+	
+	public DerbySetup(String databaseInfo){
+        super(databaseInfo);
+    }
+
+    protected void initConnectionProtocol(String databaseURL){
+        this.platformName=DERBY;
+        this.driverName = "org.apache.derby.jdbc.EmbeddedDriver";
+        this.databaseURL = databaseURL;
+    }
+    
+    public void setUp(){
+    	try{
+    		super.setUp();    		
+
+            try {
+            	s = connection.createStatement();
+            	
+                dropTriggers();
+                dropSequences();
+                dropTables();
+                dropProcedures();
+
+                createSequences();
+                createTables();
+                createTriggers();
+                createProcedures();
+                connection.commit();
+               
+                insertData();
+                connection.commit();
+            } catch (SQLException e) {
+                connection.rollback();
+            }
+    	}catch(Exception e){
+    		e.printStackTrace();
+    	}  
+    	
+    	System.out.println("Database setup complete!");
+    }
+    
+    private void insertData(){
+    	System.out.println("Inserting data in tables");
+    	
+        String[] statements = {"INSERT INTO CUSTOMER VALUES (1,'John','USA')",
+        		"INSERT INTO CUSTOMER VALUES (2,'Amita','INDIA')",
+        		"INSERT INTO CUSTOMER VALUES (3,'Patrick','UK')",
+        		"INSERT INTO CUSTOMER VALUES (4,'Jane','UN')"};
+
+        for (int i = 0; i < statements.length; i++) {
+            try {                	
+                s.execute(statements[i]);
+            } catch (SQLException e) {
+                // If the table does not exist then ignore the exception on drop
+                if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0)) 
+                        && (!(e.getMessage().indexOf("42704") >= 0))) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+    
+    private void dropTables() {
+        System.out.println("Dropping tables");
+        String[] statements = {"DROP TABLE CUSTOMER" };
+
+        for (int i = 0; i < statements.length; i++) {
+            try {
+                s.execute(statements[i]);
+            } catch (SQLException e) {
+                // If the table does not exist then ignore the exception on drop
+                if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0)) 
+                        && (!(e.getMessage().indexOf("42704") >= 0))) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+    protected void dropTriggers() {
+
+    }
+
+    protected void createTriggers() {
+
+    }
+
+    protected void dropSequences() {
+
+    }
+
+    protected void createSequences() {
+
+    }
+
+    protected void dropProcedures() {
+
+        System.out.println("Dropping procedures");
+
+        String[] statements = {"DROP PROCEDURE GETNAMEDCUSTOMERS"};
+
+        for (int i = 0; i < statements.length; i++) {
+            try {
+                s.execute(statements[i]);
+            } catch (SQLException e) {
+                // If the proc does not exist then ignore the exception on drop
+                if (!(e.getMessage().indexOf("does not exist") >= 0) && !(e.getMessage().indexOf("42704") >= 0)) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+    private void createTables() {
+         System.out.println("Creating tables");
+
+        try {
+            s.execute(getCreateCustomer());
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected void createProcedures() {
+
+        System.out.println("Creating procedures");
+        try {
+
+            s.execute("CREATE PROCEDURE GETNAMEDCUSTOMERS(theName VARCHAR(100), OUT theCount INTEGER) " 
+                    + "PARAMETER STYLE JAVA LANGUAGE JAVA READS SQL DATA DYNAMIC RESULT SETS 1 EXTERNAL NAME " 
+                    + "'org.apache.tuscany.samples.das.orders.MyStoredProcs.getNamedCustomers'");
+        } catch (SQLException e) {
+        	e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+   
+    //
+    // This section povides methods that return strings for table creation.
+    // Platform-specific sublcasses
+    // can override these as necessary
+    //
+
+    protected String getCreateCustomer() {
+        return "CREATE TABLE CUSTOMER (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, " 
+            + getStringColumn("LASTNAME", 30)
+                + " DEFAULT 'Garfugengheist', " + getStringColumn("ADDRESS", 30) + ")";
+    }
+
+    protected String getForeignKeyConstraint(String pkTable, String pkColumn, String foreignKey) {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("CONSTRAINT FK1 FOREIGN KEY (");
+        buffer.append(foreignKey);
+        buffer.append(") REFERENCES ");
+        buffer.append(pkTable);
+        buffer.append("(");
+        buffer.append(pkColumn);
+        buffer.append(") ON DELETE NO ACTION ON UPDATE NO ACTION");
+        return buffer.toString();
+    }
+
+    protected String getStringColumn(String name, int length) {
+        return name + ' ' + stringType + "(" + new Integer(length).toString() + ")";
+    }
+
+    protected String getIntegerColumn(String name) {
+        return name + ' ' + integerType;
+    }
+
+    protected String getGeneratedKeyClause() {
+        return "GENERATED ALWAYS AS IDENTITY";
+    }
+
+    protected String getDecimalColumn(String name, int size1, int size2) {
+        return name + ' ' + decimalType + "(" + new Integer(size1).toString() + ',' 
+            + new Integer(size2).toString() + ")";
+    }
+
+    protected String getFloatColumn(String name) {
+        return name + ' ' + floatType;
+    }
+
+    protected String getTimestampColumn(String name) {
+        return name + ' ' + timestampType;
+    }        
+}
diff --git a/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java b/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java
new file mode 100644
index 0000000000..f64b16e2db
--- /dev/null
+++ b/das-java/trunk/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java
@@ -0,0 +1,211 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.samples.das.databaseSetup;
+
+import java.sql.SQLException;
+
+public class MySQLSetup extends DatabaseSetup {
+
+    public MySQLSetup(String databaseInfo){
+        super(databaseInfo);        
+    }
+
+    protected void initConnectionProtocol(String databaseURL){
+    	this.platformName=MYSQL;
+        this.driverName = "com.mysql.jdbc.Driver";
+        this.databaseURL = databaseURL;
+    }
+
+    public void setUp(){
+    	try{
+    		super.setUp();    		
+
+            try {
+            	s = connection.createStatement();
+            	
+                dropTriggers();
+                dropSequences();
+                dropTables();
+                dropProcedures();
+
+                createSequences();
+                createTables();
+                createTriggers();
+                createProcedures();
+                insertData();
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
+    	}catch(Exception e){
+    		e.printStackTrace();
+    	}  
+    	
+    	System.out.println("Database setup complete!");
+    }
+    
+    private void insertData(){
+    	System.out.println("Inserting data in tables");
+    	
+        String[] statements = {"INSERT INTO CUSTOMER VALUES (1,'John','USA')",
+        		"INSERT INTO CUSTOMER VALUES (2,'Amita','INDIA')",
+        		"INSERT INTO CUSTOMER VALUES (3,'Patrick','UK')",
+        		"INSERT INTO CUSTOMER VALUES (4,'Jane','UN')"};
+
+        for (int i = 0; i < statements.length; i++) {
+            try {                	
+                s.execute(statements[i]);
+            } catch (SQLException e) {
+                // If the table does not exist then ignore the exception on drop
+                if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0)) 
+                        && (!(e.getMessage().indexOf("42704") >= 0))) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+    
+    private void dropTables() {
+        System.out.println("Dropping tables");
+
+        String[] statements = {"DROP TABLE CUSTOMER"};
+
+        for (int i = 0; i < statements.length; i++) {
+            try {
+                s.execute(statements[i]);
+            } catch (SQLException e) {
+                // If the table does not exist then ignore the exception on drop
+                if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0)) 
+                        && (!(e.getMessage().indexOf("42704") >= 0))) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+    protected void dropTriggers() {
+
+    }
+
+    protected void createTriggers() {
+
+    }
+
+    protected void dropSequences() {
+
+    }
+
+    protected void createSequences() {
+
+    }
+
+    protected void dropProcedures() {
+
+        System.out.println("Dropping procedures");
+
+        String[] statements = {"DROP PROCEDURE GETNAMEDCUSTOMERS"};
+
+        for (int i = 0; i < statements.length; i++) {
+            try {
+                s.execute(statements[i]);
+            } catch (SQLException e) {
+                // If the proc does not exist then ignore the exception on drop
+                if (!(e.getMessage().indexOf("does not exist") >= 0) && !(e.getMessage().indexOf("42704") >= 0)) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+    private void createTables() {
+         System.out.println("Creating tables");
+
+        try {
+
+            s.execute(getCreateCustomer());
+
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+  
+    //
+    // This section povides methods that return strings for table creation.
+    // Platform-specific sublcasses
+    // can override these as necessary
+    //
+
+    protected String getCreateCustomer() {
+        return "CREATE TABLE CUSTOMER (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, " 
+            + getStringColumn("LASTNAME", 30)
+                + " DEFAULT 'Garfugengheist', " + getStringColumn("ADDRESS", 30) + ")";
+    }
+
+    // /////////////////
+
+    protected String getForeignKeyConstraint(String pkTable, String pkColumn, String foreignKey) {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("CONSTRAINT FK1 FOREIGN KEY (");
+        buffer.append(foreignKey);
+        buffer.append(") REFERENCES ");
+        buffer.append(pkTable);
+        buffer.append("(");
+        buffer.append(pkColumn);
+        buffer.append(") ON DELETE NO ACTION ON UPDATE NO ACTION");
+        return buffer.toString();
+    }
+
+    protected String getStringColumn(String name, int length) {
+        return name + ' ' + stringType + "(" + new Integer(length).toString() + ")";
+    }
+
+    protected String getIntegerColumn(String name) {
+        return name + ' ' + integerType;
+    }
+
+    protected String getDecimalColumn(String name, int size1, int size2) {
+        return name + ' ' + decimalType + "(" + new Integer(size1).toString() + ',' 
+            + new Integer(size2).toString() + ")";
+    }
+
+    protected String getFloatColumn(String name) {
+        return name + ' ' + floatType;
+    }
+
+    protected String getTimestampColumn(String name) {
+        return name + ' ' + timestampType;
+    }        
+    
+    protected void createProcedures() {
+        String createGetNamedCustomers = "CREATE PROCEDURE `dastest`.`GETNAMEDCUSTOMERS`(IN thename VARCHAR(30), "
+                + "OUT theCount INTEGER ) " + " BEGIN "
+                + "  SELECT * FROM CUSTOMER AS CUSTOMER WHERE LASTNAME = theName; "
+                + "  SET theCount =  (SELECT COUNT(*) FROM CUSTOMER WHERE LASTNAME = theName); " + " END ";
+        
+        System.out.println("Creating procedures");
+        try {
+            s.execute(createGetNamedCustomers);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected String getGeneratedKeyClause() {
+        return "AUTO_INCREMENT";
+    }
+}
diff --git a/das-java/trunk/samples/customer/src/main/resources/CustomersConfig.xml b/das-java/trunk/samples/customer/src/main/resources/CustomersConfig.xml
new file mode 100644
index 0000000000..41fa03ba2b
--- /dev/null
+++ b/das-java/trunk/samples/customer/src/main/resources/CustomersConfig.xml
@@ -0,0 +1,53 @@
+<?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"> 
+    
+    <!--Uncomment below for derby test-->
+	<ConnectionInfo>
+		<ConnectionProperties
+			driverClass="org.apache.derby.jdbc.EmbeddedDriver"
+			databaseURL="jdbc:derby:target/dastest; create = true"
+			loginTimeout="600000"/>
+	</ConnectionInfo>
+	
+	<!--Uncomment below for MySQL test-->
+	<!-- 
+	<ConnectionInfo>
+		<ConnectionProperties 
+			driverClass="com.mysql.jdbc.Driver"
+			databaseURL="jdbc:mysql://localhost/dastest"
+			userName="dastest"
+			password="dastest"
+			loginTimeout="600000"/>
+	</ConnectionInfo>
+	-->
+			
+    <Command name="AllCustomers" SQL="select * from CUSTOMER" kind="Select"/>
+
+    <Table tableName="CUSTOMER">
+        <Column columnName="ID" primaryKey="true"/>
+    </Table>
+    
+	<Command name="NamedCustomers" SQL="{call GETNAMEDCUSTOMERS(?,?)}" kind="procedure">		
+		<Parameter direction="IN" index="1" columnType="commonj.sdo.String"/>
+        <Parameter direction="OUT" index="2" columnType="commonj.sdo.IntObject"/>
+	</Command>
+	
+</Config>
diff --git a/das-java/trunk/samples/customer/src/main/resources/META-INF/LICENSE b/das-java/trunk/samples/customer/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000000..fb4df3722c
--- /dev/null
+++ b/das-java/trunk/samples/customer/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,353 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+===============================================================================================================
+
+Other components and dependencies under Apache Software License 2.0 : 
+
+   log4j-1.2.14.jar    - Apache Logging Services
+   derby 10.2.2.0.jar  - Apache Derby
+   stax-api-1.0.1.jar  - The Streaming API for XML (StAX)
+   wstx-asl-3.2.0.jar  - WoodStox StAX implementation
+   standard-1.1.1.jar  - The Apache Jackarta Taglibs
+   jstl-1.1.2.jar      - The Apache Jackarta Taglibs
+   *.tld               - The Apache Jackarta Taglibs
+
+===============================================================================================================
+
+
+Apache Tuscany SDO for Java Subcomponents
+=========================================: 
+
+The Tuscany SDO for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
+
+Permission to copy, make derivative works of, and distribute the Service Data Objects 
+JavaDoc and Interface Definition Files files in any medium without fee or royalty as part 
+of a compliant implementation of the Service Data Objects Specification is hereby granted.  
+The Service Data Objects Specification may be found at any of the following locations:
+
+http://dev2dev.bea.com/technologies/commonj/index.jsp
+http://www.ibm.com/developerworks/library/specification/ws-sdo/
+http://oracle.com/technology/webservices/sca
+https://www.sdn.sap.com/
+http://www.xcalia/xdn/specs/sdo
+
+THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES 
+ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS 
+SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES AND THE IMPLEMENTATION OF THEIR CONTENTS, 
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE 
+SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or 
+publicity pertaining to the Service Component Architecture Specification or its contents without specific, 
+written prior permission. Title to copyright in the Service Data Objects Specification and the 
+JavaDoc and Interface Definition Files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+=================================================================================================================
+
+For the Eclipse EMF components
+(codegen-2.2.3.jar
+codegen-ecore-2.2.3.jar
+common-2.2.3.jar
+ecore-2.2.3.jar
+ecore-change-2.2.3.jar
+ecore-xmi-2.2.3.jar
+xsd-2.2.3.jar)
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+===================================================================================================
diff --git a/das-java/trunk/samples/customer/src/main/resources/META-INF/NOTICE b/das-java/trunk/samples/customer/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000000..c2cf1f95b4
--- /dev/null
+++ b/das-java/trunk/samples/customer/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,32 @@
+Apache Tuscany SDO for Java
+Copyright 2006, 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Apache Tuscany is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Web Services PMC. Incubation is required of all newly accepted
+projects until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with other successful
+ASF projects. While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be fully endorsed
+by the ASF.
+
+Unless otherwise indicated, all distribution made available by the Apache Software Foundation
+is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
+A copy of the AL is provided with this distribution as the LICENSE.txt file present in the
+root directory, and is also available at http://www.apache.org/licenses/.
+
+The terms and conditions governing the distribution may refer to the AL or other license
+agreements, notices or terms and conditions. Some of these other license agreements may
+include (but are not limited to):
+
+  . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
+
+It is your obligation to read and accept all such terms and conditions prior to use of the
+distribution. If term or condition is provided, please contact the Apache Software Foundation
+to determine what terms and conditions govern that particular distribution.
+
+This product also includes software developed by the Open Service Oriented Architecture organisation
+(http://osoa.org). The license for this software may be found in the LICENSE.txt file contained in this
+distribution.
diff --git a/das-java/trunk/samples/customer/src/main/resources/META-INF/README b/das-java/trunk/samples/customer/src/main/resources/META-INF/README
new file mode 100644
index 0000000000..d1905ee3e8
--- /dev/null
+++ b/das-java/trunk/samples/customer/src/main/resources/META-INF/README
@@ -0,0 +1,35 @@
+Apache Tuscany M2 build (October, 2006)
+===================================
+
+http://incubator.apache.org/tuscany/
+
+Tuscany is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Web Services PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness or 
+stability of the code, it does indicate that the project has yet to be fully
+endorsed by the ASF.
+
+
+Support
+-------
+
+Any problem with this release can be reported to the Tuscany mailing list 
+or in the JIRA issue tracker.
+
+Mailing list subscription:
+    tuscany-dev-subscribe@ws.apache.org
+
+Jira:
+    http://issues.apache.org/jira/browse/Tuscany
+
+
+Thank you for using Tuscany!
+
+
+The Tuscany Team. 
+
diff --git a/das-java/trunk/samples/customer/src/main/resources/log4j.properties b/das-java/trunk/samples/customer/src/main/resources/log4j.properties
new file mode 100644
index 0000000000..ab4ebbb785
--- /dev/null
+++ b/das-java/trunk/samples/customer/src/main/resources/log4j.properties
@@ -0,0 +1,36 @@
+#  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.
+#  
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=INFO, NULL
+
+# NULL Appender
+log4j.appender.NULL=org.apache.log4j.varia.NullAppender
+
+log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
+log4j.appender.NULL.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n
+
+# CONSOLE is set to be a ConsoleAppender.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n
+
+
+# Print only messages of level WARN or above in the package com.foo.
+log4j.logger.org.apache.tuscany=NONE
+\ No newline at end of file
diff --git a/das-java/trunk/samples/dbconfig/pom.xml b/das-java/trunk/samples/dbconfig/pom.xml
new file mode 100644
index 0000000000..372bcbc302
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/pom.xml
@@ -0,0 +1,123 @@
+<?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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.das.samples</groupId>
+        <artifactId>tuscany-das-samples</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>tuscany-das-sample-dbconfig</artifactId>
+    <packaging>jar</packaging>
+    <name>Tuscany DAS Canned DB Initializer Utility</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.das</groupId>
+            <artifactId>tuscany-das-rdb</artifactId>
+            <version>${das.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+       <dependency>
+           <groupId>org.apache.tuscany.sdo</groupId>
+           <artifactId>tuscany-sdo-impl</artifactId>
+           <version>${sdo.version}</version>
+           <scope>compile</scope>
+       </dependency>
+
+       <dependency>
+           <groupId>org.apache.tuscany.sdo</groupId>
+           <artifactId>tuscany-sdo-api-r2.1</artifactId>
+           <version>${sdo.version}</version>
+           <scope>compile</scope>
+       </dependency>
+       
+       <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.2.2.0</version>
+            <scope>compile</scope>
+       </dependency>
+
+       <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
+            <scope>compile</scope>
+       </dependency>
+        
+       <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+	        <scope>test</scope>
+       </dependency>
+    </dependencies>
+
+    <!-- this will place the java source files inside the jar -->
+    <build>
+        <finalName>sample-dbconfig</finalName>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+            </resource>
+            <resource>
+              <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+
+		<plugins>
+		    <plugin>
+			<groupId>org.apache.tuscany.sdo</groupId>
+			<artifactId>tuscany-sdo-plugin</artifactId>
+			<version>${sdo.version}</version>
+			<executions>
+			    <execution>
+				<id>config</id>
+				<configuration>
+				    <schemaFile>${basedir}/src/main/resources/DBConfig.xsd</schemaFile>
+				    <noNotification>true</noNotification>
+				    <noUnsettable>true</noUnsettable>
+				</configuration>
+				<goals>
+				    <goal>generate</goal>
+				</goals>
+			    </execution>
+			</executions>
+		    </plugin>
+
+		    <plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-surefire-plugin</artifactId>
+			<configuration>
+			    <includes>
+				<include>**/*TestCase.java</include>
+			    </includes>
+			</configuration>
+		    </plugin>
+		</plugins>
+
+    </build>
+    
+    
+</project>
diff --git a/das-java/trunk/samples/dbconfig/readme.html b/das-java/trunk/samples/dbconfig/readme.html
new file mode 100644
index 0000000000..da8c83a824
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/readme.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+  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.
+ -->
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Tuscany RDB DAS Database Setup Utility</title>
+
+<style>
+.code {font-size: 11px; color: #006699}
+.codebox {border: 1px solid #6699CC; background-color: #F1F7FA;padding:15px}
+.codebox2 {border: 1px solid #6699CC; background-color: #F1F7FA;padding:15px; width:85%}
+.codeboxW {border: 1px solid #6699CC; background-color: #FFFFFF;padding:15px}
+.codeboxB {background-color: #C9DBED;padding:1px 10px 10px 10px}
+</style>
+
+</head>
+
+<h1><center>Tuscany RDB DAS Database Setup Utility</center></h1>
+
+<br>
+
+<p>This utility provides a jar file to be used by RDB DAS sample
+applications (web or standalone) to do database setup. So far the
+samples provided canned pre-created Derby database with tables and data.
+There was no convenient way to refresh table data during the samples
+execution. This utility supports Derby database at present and uses a
+config file to get the setup information.</p>
+
+<h2>APIs</h2>
+
+<ul style="border-right-style: solid; border-left-style: solid; border-top-style: solid; border-bottom-style: solid">
+public DBInitializer() – uses default provided ConfigFile CannedSampleDBConfig.xml <br>
+public DBInitializer(String ConfigFileLocation) <br>
+public DBInitializer (InputStream ConfigFileStream) <br>
+public void initializeDatabase(boolean clean) - Create database tables and fill data. If clean=true, all tables will be dropped and recreated. <br> 
+public void initializeDatabaseData(boolean clean) - create database data (with clean=true, if a table has pre-existing data, it will be deleted first) <br>
+public void refreshDatabaseData() – calls initializeDatabase(clean=true) <br>
+public boolean isDatabaseReady() - will return true, if the tables exist in the database <br>
+public boolean isDatabasePopulated() - will return true, if the tables have data <br>
+</ul>
+
+<h2>Assumptions:</h2>
+<p>&lt;table&gt; element lists tables in proper sequence, i.e. parent tables
+first and then child tables. This sequence will be used in
+create,insert,delete,drop to take care of referential integrity. The
+config file required by utility supports the following features through
+different attributes and elements. Sample xml file is shown at the end.
+
+</p>
+
+<h2>&lt;ConnectionInfo&gt;</h2>
+<p>This element provides connection specific information - like vendor
+specific database URL, user name, password etc. If the DataSource is
+provided by the web container, user needs to only fill dataSource
+attribute in this. In case of standalone J2SE samples, user needs to
+fill ConnectionProperties element inside ConnectionInfo. These two ways
+of connection specification are mutually exclusive.</p>
+
+<h2>&lt;table&gt;</h2>
+<p>This element needs to specify the table names required by the
+sample. Only these tables will be considered for creation, data
+population. This gives flexibility to the user to choose the required
+set of tables based on the sample's requirement. It also needs to
+specify in the attributes, the Create SQL command used to create this
+table.&lt;table&gt; has sequence element &lt;row&gt; which is used to provide 
+the data to be populated in the table.
+</p>
+
+	<h2>Set Up</h2>
+
+	<p>To use this utility, include its jar and required database
+	driver's jar in the classpath. Provide the config file used by this
+	utility , similar to the example below, in the source folder of the
+	sample.<br>
+	</p>
+
+	<h2>DBConfig.xml example</h2>
+
+	<ul style="border-right-style: solid; border-left-style: solid; border-top-style: solid; border-bottom-style: solid">
+		&lt;?xml version="1.0" encoding="ASCII"?&gt;<br>
+	&lt;!-- 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. --&gt; <br><br>
+	&lt;DBConfig
+	xmlns="http:///org.apache.tuscany.das.rdb/dbconfig.xsd"&gt;<br><br>
+	&lt;ConnectionInfo&gt;<br>
+	   &lt;ConnectionProperties
+	driverClass="org.apache.derby.jdbc.EmbeddedDriver"
+	databaseURL="jdbc:derby:target/dastest; create = true"
+	loginTimeout="600000" /&gt;<br>
+	&lt;/ConnectionInfo&gt; <br><br>
+	&lt;Table
+	name="COMPANY" SQLCreate="CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT
+	NULL, NAME VARCHAR(30), EOTMID INTEGER)"&gt; <br>
+	&lt;row&gt; 51, 'ACME Publishing', 0 &lt;/row&gt; <br>
+	&lt;row&gt; 52, 'Do-rite plumbing', 0 &lt;/row&gt;<br> 
+	&lt;row&gt; 53, 'MegaCorp', 0 &lt;/row&gt;<br> 
+	&lt;/Table&gt;<br><br>
+	&lt;Table name="DEPARTMENT" SQLCreate="CREATE TABLE DEPARTMENT (ID INT
+	PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY, NAME
+	VARCHAR(30),LOCATION VARCHAR(30), DEPNUMBER VARCHAR(10),COMPANYID
+	INT)"&gt; <br>
+	&lt;row&gt; 'Advanced Technologies', 'NY', '123', 1	&lt;/row&gt; <br>
+	&lt;row&gt; 'Default Name', '', '', 51 &lt;/row&gt;<br>
+	&lt;row&gt; 'Default Name', '', '', 51 &lt;/row&gt; <br>
+	&lt;row&gt; 'Default Name', '', '', 51 &lt;/row&gt; <br>
+	&lt;row&gt; 'Default Name', '',	'', 51 &lt;/row&gt; <br>
+	&lt;row&gt; 'Default Name', '', '', 51 &lt;/row&gt;<br>
+	&lt;row&gt; 'Default Name', '', '', 51 &lt;/row&gt; <br>
+	&lt;/Table&gt;<br><br>
+	
+	&lt;Table name="EMPLOYEE" SQLCreate="CREATE TABLE EMPLOYEE (ID INT
+	PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY,NAME VARCHAR(30),SN
+	VARCHAR(10), MANAGER SMALLINT, DEPARTMENTID INT)"&gt; <br>
+	&lt;row&gt; 'John Jones','E0001',0,12 &lt;/row&gt; <br>
+	&lt;row&gt; 'Mary Smith','E0002',1,null &lt;/row&gt; <br>
+	&lt;row&gt; 'Jane Doe','E0003',0,12	&lt;/row&gt; <br>
+	&lt;row&gt; 'Al Smith','E0004',1,12 &lt;/row&gt;<br>
+	&lt;/Table&gt; <br><br>&lt;/DBConfig&gt;<br>
+
+</ul>
+
+
+	</BODY>
+</HTML>
diff --git a/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java
new file mode 100644
index 0000000000..783f822bc4
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java
@@ -0,0 +1,57 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.dbconfig;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLHelper;
+import commonj.sdo.impl.HelperProvider;
+
+/**
+ * Config util provides config-related utilities such as loading a Config
+ * instance from an InputStream
+ * 
+ */
+public final class DBConfigUtil {
+
+    private DBConfigUtil() {
+    }
+    
+    public static DBConfig loadDBConfig(InputStream dbconfigStream) {
+
+        if (dbconfigStream == null) {
+            throw new RuntimeException("Cannot load configuration from a null InputStream. "
+                    + "Possibly caused by an incorrect config xml file name");
+        }
+
+        HelperContext context = HelperProvider.getDefaultContext();
+        DbconfigFactory.INSTANCE.register(context);
+        XMLHelper helper = context.getXMLHelper();
+
+        try {
+            return (DBConfig) helper.load(dbconfigStream).getRootObject();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConnectionHelper.java b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConnectionHelper.java
new file mode 100644
index 0000000000..5f64145c58
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConnectionHelper.java
@@ -0,0 +1,179 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.das.rdb.dbconfig;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+public class DBConnectionHelper {
+	private static final Logger logger = Logger.getLogger(DBConnectionHelper.class);
+
+	protected DBConnectionHelper(){
+        if(logger.isDebugEnabled()) {
+            logger.log(Level.DEBUG, "DBConnectionHelper()");
+        }
+	}
+
+    /**
+     * Basic validation of Config for connection information and call to
+     * connection helper to establish database connection. Connection using
+     * DriverManager or DataSource are supported.
+     *
+     */
+    public static Connection createConnection(ConnectionInfo connectionInfo) {
+        if (logger.isDebugEnabled()) {
+            logger.log(Level.DEBUG, "DBConnectionHelper.createConnection(ConnectionInfo)");
+        }
+
+        if (connectionInfo == null ||
+                (connectionInfo.getDataSource() == null &&
+                		(connectionInfo.getConnectionProperties() == null || connectionInfo.getConnectionProperties().getDatabaseURL() == null
+                		|| connectionInfo.getConnectionProperties().getDriverClass() == null)) ) {
+                throw new RuntimeException("No connection has been provided and no data source has been specified");
+        }
+
+        if(connectionInfo.getDataSource() != null &&
+        		(connectionInfo.getConnectionProperties() != null && connectionInfo.getConnectionProperties().getDatabaseURL() != null) ){
+            throw new RuntimeException("Use either dataSource or databaseURL. Can't use both !");
+        }
+
+        Connection connection = null;
+
+        if(connectionInfo.getDataSource() != null){
+        	connection = initializeDatasourceConnection(connectionInfo);
+        }else{
+        	connection = initializeDriverManagerConnection(connectionInfo);
+        }
+
+        return connection;
+
+    }
+    /**
+     * Initializes a DB connection on a managed environmet (e.g inside Tomcat)
+     */
+	private static Connection initializeDatasourceConnection(ConnectionInfo connectionInfo){
+        if (logger.isDebugEnabled()) {
+            logger.log(Level.DEBUG, "DBConnectionHelper.initializeDatasourceConnection(ConnectionInfo)");
+        }
+
+        InitialContext ctx;
+        Connection connection;
+
+        try {
+            ctx = new InitialContext();
+        } catch (NamingException e) {
+            throw new RuntimeException(e);
+        }
+        try {
+            DataSource ds = (DataSource) ctx.lookup(connectionInfo.getDataSource());
+            try {
+            	try {
+	            	if(connectionInfo.getConnectionProperties() != null &&
+	            	   connectionInfo.getConnectionProperties().getUserName() != null &&
+	            	   connectionInfo.getConnectionProperties().getPassword() != null ) {
+	            		connection = ds.getConnection(connectionInfo.getConnectionProperties().getUserName(), connectionInfo.getConnectionProperties().getPassword());
+	            	} else {
+	            		connection = ds.getConnection();
+	            	}
+            	}catch(Exception e) {
+            		connection = ds.getConnection();
+            	}
+
+                if (connection == null) {
+                    throw new RuntimeException("Could not obtain a Connection from DataSource");
+                }
+                connection.setAutoCommit(true);
+
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+        } catch (NamingException e) {
+            throw new RuntimeException(e);
+        }
+
+        if( logger.isDebugEnabled()) {
+            logger.log(Level.DEBUG, "DBConnectionHelper.initializeDatasourceConnection() exit");
+        }
+        return connection;
+    }
+
+    /**
+     * Initialize a DB connection on a J2SE environment
+     * For more info, see http://java.sun.com/j2se/1.3/docs/guide/jdbc/getstart/drivermanager.html
+     */
+	private static Connection initializeDriverManagerConnection(ConnectionInfo connectionInfo) {
+		if (logger.isDebugEnabled()) {
+		    logger.log(Level.DEBUG, "DBConnectionHelper.initializeDriverManagerConnection(ConnectionInfo)");
+        }
+
+        if (connectionInfo.getConnectionProperties() == null) {
+            throw new DataSourceInitializationException("No existing context and no connection properties");
+        }
+
+        if (connectionInfo.getConnectionProperties().getDriverClass() == null) {
+            throw new DataSourceInitializationException("No jdbc driver class specified!");
+        }
+
+        Connection connection;
+
+        try {
+            //initialize driver and register it with DriverManager
+            Class.forName(connectionInfo.getConnectionProperties().getDriverClass());
+
+            //prepare to initialize connection
+            String databaseUrl = connectionInfo.getConnectionProperties().getDatabaseURL();
+            String userName = connectionInfo.getConnectionProperties().getUserName();
+            String userPassword = connectionInfo.getConnectionProperties().getPassword();
+            int loginTimeout = connectionInfo.getConnectionProperties().getLoginTimeout();
+
+            DriverManager.setLoginTimeout(loginTimeout);
+            if( (userName == null || userName.length() ==0) && (userPassword == null || userPassword.length()==0) ){
+                //no username or password suplied
+                connection = DriverManager.getConnection(databaseUrl);
+            }else{
+                connection = DriverManager.getConnection(databaseUrl, userName, userPassword);
+            }
+
+            if(connection == null){
+                throw new DataSourceInitializationException("Error initializing connection : null");
+            }
+
+            connection.setAutoCommit(true);
+        }catch(ClassNotFoundException cnf){
+            throw new DataSourceInitializationException("JDBC Driver '" + connectionInfo.getConnectionProperties().getDriverClass() + "' not found", cnf);
+        }catch(SQLException sqle){
+            throw new DataSourceInitializationException(sqle.getMessage(), sqle);
+        }
+
+        if (logger.isDebugEnabled()) {
+            logger.log(Level.DEBUG, "DBConnectionHelper.initializeDriverManagerConnection() exit");
+        }
+
+        return connection;
+    }
+}
diff --git a/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBDataHelper.java b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBDataHelper.java
new file mode 100644
index 0000000000..2ef25bdf81
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBDataHelper.java
@@ -0,0 +1,251 @@
+/*
+ * 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.    
+ */
+
+package org.apache.tuscany.das.rdb.dbconfig;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+public class DBDataHelper {
+    private static final String CLASS_NAME = "DBDataHelper";
+
+    private final Logger logger = Logger.getLogger(DBDataHelper.class);
+
+    private final DBConfig dbConfig;
+
+    protected DBDataHelper(DBConfig dbConfig) {
+        if (logger.isDebugEnabled()) {
+            this.logger.log(Level.DEBUG, "DBDataHelper()");
+        }
+        
+        this.dbConfig = dbConfig;
+    }
+
+    public boolean isDatabasePopulated() {
+        boolean isPopulated = true;
+
+        if (logger.isDebugEnabled()) {
+            this.logger.log(Level.DEBUG, CLASS_NAME + ".isDatabasePopulated()");
+        }
+
+        Iterator tableIterator = dbConfig.getTable().iterator();
+        while (tableIterator.hasNext()) {
+            Table table = (Table) tableIterator.next();
+
+            if (logger.isDebugEnabled()) {
+                this.logger.log(Level.DEBUG, CLASS_NAME + ".isDatabasePopulated() calling isTablePopulated() for '" + table.getName() + "'");
+            }
+            
+            isPopulated = this.isTablePopulated(table.getName());
+            if (isPopulated == false) {
+                break;
+            }
+        }
+        return isPopulated;
+    }
+
+    /**
+     * 
+     * @param tableName
+     * @return Count of rows present in the table specified by tableName
+     */
+    protected boolean isTablePopulated(String tableName) {
+        boolean isPopulated = false;
+        Connection dbConnection = null;
+        Statement dbStatement = null;
+
+        try {
+            dbConnection = DBConnectionHelper.createConnection(dbConfig.getConnectionInfo());
+            dbStatement = dbConnection.createStatement();
+            String sqlString = "select count(*) from " + tableName;
+
+            this.logger.log(Level.DEBUG, CLASS_NAME + ".isTablePopulated()=> sqlString => '" + sqlString + "'");
+
+            ResultSet rs = dbStatement.executeQuery(sqlString);
+            rs.next();
+
+            if (rs != null) {
+                if (logger.isDebugEnabled()) {
+                    this.logger.log(Level.DEBUG, CLASS_NAME + ".isTablePopulated()=> pointer set");
+                }
+            }
+
+            int count = rs.getInt(1);
+            
+            if (logger.isDebugEnabled()) {
+                this.logger.log(Level.DEBUG, CLASS_NAME + ".isTablePopulated()=> '" + tableName + "' => " + count);
+            }
+
+            if (count > 0) {
+                isPopulated = true;
+            }
+
+        } catch (SQLException e) {
+            // ignore and return false
+        } finally {
+            try {
+                dbStatement.close();
+                dbConnection.close();
+            } catch (SQLException e1) {
+                // ignore and return false
+            }
+        }
+
+        return isPopulated;
+    }
+
+    protected String generateInsertSQL(Connection dbConnection, String tableName, String rowValues) throws SQLException {
+        StringBuffer sqlBuffer = new StringBuffer(50); 
+        
+        Statement dbStatement = dbConnection.createStatement();
+        ResultSet dummyRS = dbStatement.executeQuery("SELECT * FROM "+tableName);
+        ResultSetMetaData rsMetaData = dummyRS.getMetaData(); 
+        	
+        
+        sqlBuffer.append("INSERT INTO ").append(tableName).append(" (");
+
+        int numberOfColumns = rsMetaData.getColumnCount();
+        String columnName = null;
+        int i;
+        for (i = 1; i <= numberOfColumns -1; i++) {
+            //get the column's name.
+        	columnName = rsMetaData.getColumnName(i);
+          if(!rsMetaData.isAutoIncrement(i)){
+              sqlBuffer.append(columnName).append(",");
+          	}
+          	else{
+                if (logger.isDebugEnabled()) {
+                    this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData()=> auto increment column => " + i + " "+columnName);
+                }
+          	}
+        }
+        sqlBuffer.append(rsMetaData.getColumnName(i)).append(") ");
+        sqlBuffer.append("VALUES (").append(rowValues).append(")");
+
+        if (logger.isDebugEnabled()) {
+            this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData()=> SQL Clause => " + sqlBuffer);
+        }
+        
+        return sqlBuffer.toString();
+    }
+    
+    public void initializeDatabaseData() {
+        Connection dbConnection = null;
+        Statement dbStatement = null;
+
+        try {
+            dbConnection = DBConnectionHelper.createConnection(dbConfig.getConnectionInfo());
+            dbStatement = dbConnection.createStatement();
+
+            Iterator tableIterator = dbConfig.getTable().iterator();
+            while (tableIterator.hasNext()) {
+                Table table = (Table) tableIterator.next();
+                
+                if (logger.isDebugEnabled()) {
+                    this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData()=> INSERT FOR TABLE => '" + table.getName() + "'");
+                }
+         
+                //String columnClause = generateInsertSQL(dbConnection, table.getName());
+                                
+                String tableName = table.getName();
+                Iterator dataIterator = table.getRow().iterator();
+                while (dataIterator.hasNext()) {
+                    String tableRow = (String) dataIterator.next();                    
+                    String sqlString = generateInsertSQL(dbConnection, tableName, tableRow);
+
+                    if (logger.isDebugEnabled()) {
+                        this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData()=> sqlString => '" + sqlString + "'");
+                    }
+
+                    try {
+                        dbStatement.executeUpdate(sqlString);
+                    }catch(SQLException e){
+                    	//e.printStackTrace();
+                        //ignore and jump to new table
+                        if (logger.isDebugEnabled()) {
+                            this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData() - Error inserting table data : " + e.getMessage(), e);
+                        }
+                    }
+                }
+            }
+        } catch (SQLException e) {
+            // ignore and return false
+            if (logger.isDebugEnabled()) {
+                this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData() - Internal error : " +  e.getMessage(), e);
+            }
+        } finally {
+            try {
+                dbStatement.close();
+                dbConnection.close();
+            } catch (SQLException e1) {
+                // ignore and return false
+            }
+        }
+    }
+
+    public void deleteDatabaseData() {
+        Connection dbConnection = null;
+        Statement dbStatement = null;
+
+        try {
+            dbConnection = DBConnectionHelper.createConnection(dbConfig.getConnectionInfo());
+            dbStatement = dbConnection.createStatement();
+            //inverse order - to take care of parent-child
+            List tables = dbConfig.getTable();
+            for(int i=tables.size()-1; i>-1; i-- ){
+                Table table = (Table) tables.get(i);
+                String sqlString = "DELETE FROM " + table.getName() ;
+               
+                if (logger.isDebugEnabled()) {
+                    this.logger.log(Level.DEBUG, CLASS_NAME + ".deleteDatabaseData()=> sqlString => '" + sqlString + "'");
+                }
+
+                try {
+                    dbStatement.executeQuery(sqlString);
+                }catch(SQLException e){
+                	e.printStackTrace();
+                    //ignore and jump to new table
+                    if (logger.isDebugEnabled()) {
+                        this.logger.log(Level.DEBUG, CLASS_NAME + ".deleteDatabaseData() - Error inserting table data : " + e.getMessage(), e);
+                    }
+                }            	            
+            }
+        } catch (SQLException e) {
+            // ignore and return false
+            if (logger.isDebugEnabled()) {
+                this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData() - Internal error : " +  e.getMessage(), e);
+            }
+        } finally {
+            try {
+                dbStatement.close();
+                dbConnection.close();
+            } catch (SQLException e1) {
+                // ignore and return false
+            }
+        }
+    }
+}
diff --git a/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBHelper.java b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBHelper.java
new file mode 100644
index 0000000000..028ec59d63
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBHelper.java
@@ -0,0 +1,200 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.das.rdb.dbconfig;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Iterator;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+public class DBHelper {
+    private static final String CLASS_NAME = "DBHelper";
+
+    private final Logger logger = Logger.getLogger(DBHelper.class);
+
+    private final DBConfig dbConfig;
+
+    /**
+     * Constructor
+     *
+     * @param DBConfig
+     */
+    protected DBHelper(DBConfig dbConfig) {
+        if (logger.isDebugEnabled()) {
+            this.logger.log(Level.DEBUG, CLASS_NAME + "()");
+        }
+        this.dbConfig = dbConfig;
+    }
+
+    /**
+     * Check if tables specified in Config exist
+     *
+     * @return true if all specified tables exist, false otherwise
+     */
+    protected boolean isDatabaseReady() {
+        boolean bResult = true;
+
+        if (logger.isDebugEnabled()) {
+            this.logger.log(Level.DEBUG, CLASS_NAME + "isDatabaseReady()");
+        }
+
+        Connection dbConnection = null;
+        DatabaseMetaData dbMetaData = null;
+        try {
+            dbConnection = DBConnectionHelper.createConnection(dbConfig.getConnectionInfo());
+            dbMetaData = dbConnection.getMetaData();
+
+            if (dbConfig.getTable() != null && dbConfig.getTable().size() > 0) {
+                Iterator tableIterator = dbConfig.getTable().iterator();
+                while (tableIterator.hasNext()) {
+                    Table table = (Table) tableIterator.next();
+
+                    if (!dbMetaData.getTables(null, null, table.getName(), null).next()) {
+                        bResult = false;
+                    }
+
+                }
+            }
+        } catch (SQLException e) {
+        	bResult = false;
+            if (logger.isDebugEnabled()) {
+                this.logger.log(Level.DEBUG, "Error retrieving database metadata", e);
+            }
+        } finally {
+            try {
+                if(dbConnection != null) dbConnection.close();
+            } catch (SQLException e) {
+                // ignore here
+            }
+        }
+
+        if (logger.isDebugEnabled()) {
+            this.logger.log(Level.DEBUG, CLASS_NAME + "isDatabaseReady() exit");
+        }
+
+        return bResult;
+    }
+
+    /**
+     * Create the database tables based on dbConfig definition
+     */
+    protected void initializeDatabase() {
+        if (logger.isDebugEnabled()) {
+            this.logger.log(Level.DEBUG, CLASS_NAME + "initializeDatabase()");
+        }
+
+        Connection dbConnection = null;
+        Statement dbStatement = null;
+        try {
+            dbConnection = DBConnectionHelper.createConnection(dbConfig.getConnectionInfo());
+            dbStatement = dbConnection.createStatement();
+
+            if (dbConfig.getTable() != null && dbConfig.getTable().size() > 0) {
+                Iterator tableIterator = dbConfig.getTable().iterator();
+                while (tableIterator.hasNext()) {
+                    Table table = (Table) tableIterator.next();
+
+                    if (table.getSQLCreate() != null && table.getSQLCreate().length() > 0) {
+                        if (logger.isDebugEnabled()) {
+                            this.logger.log(Level.DEBUG, "Creating table '" + table.getName() + "' => " + table.getSQLCreate());
+                        }
+
+                        dbStatement.execute(table.getSQLCreate());
+                    }
+                }
+            }
+        } catch (SQLException e) {
+            if (logger.isDebugEnabled()) {
+                this.logger.log(Level.DEBUG, "Error retrieving database metadata", e);
+            }
+        } finally {
+            try {
+                dbStatement.close();
+                dbConnection.close();
+            } catch (SQLException e) {
+                // ignore here
+            }
+        }
+
+        if (logger.isDebugEnabled()) {
+            this.logger.log(Level.DEBUG, CLASS_NAME + "initializeDatabase() exit");
+        }
+    }
+
+    /**
+     * Drop the database tables based on dbConfig definition
+     */
+    protected void dropDatabaseTables() {
+        if (logger.isDebugEnabled()) {
+            this.logger.log(Level.DEBUG, CLASS_NAME + "dropDatabaseTables()");
+        }
+
+        Connection dbConnection = null;
+        Statement dbStatement = null;
+        try {
+            dbConnection = DBConnectionHelper.createConnection(dbConfig.getConnectionInfo());
+            dbStatement = dbConnection.createStatement();
+
+            if (dbConnection != null && dbStatement != null && dbConfig.getTable() != null && dbConfig.getTable().size() > 0) {
+            	//reverse order to take care of dropping child tables before parent tables.
+            	for(int i=dbConfig.getTable().size()-1; i>-1; i--) {
+            		Table table = (Table) dbConfig.getTable().get(i);
+
+                    if (table.getSQLCreate() != null && table.getSQLCreate().length() > 0) {
+                        if (logger.isDebugEnabled()) {
+                            this.logger.log(Level.DEBUG, "Dropping table '" + table.getName() );
+                        }
+
+                        try {
+                            dbStatement.execute("DROP TABLE " + table.getName());
+                        } catch (SQLException e) {
+                        	//ignore
+                            if (logger.isDebugEnabled()) {
+                                this.logger.log(Level.DEBUG, "Error droping table '" + table.getName() + "'", e);
+                            }
+                        }
+                    }            		
+            	}
+            }
+        } catch (SQLException e) {
+            if (logger.isDebugEnabled()) {
+                this.logger.log(Level.DEBUG, "Error droping table", e);
+            }
+        } finally {
+            try {
+                if(dbStatement != null)
+                	dbStatement.close();
+
+                if(dbConnection != null)
+                	dbConnection.close();
+            } catch (SQLException e) {
+                // ignore here
+            }
+        }
+
+        if (logger.isDebugEnabled()) {
+            this.logger.log(Level.DEBUG, CLASS_NAME + "dropDatabaseTables() exit");
+        }
+    }
+}
diff --git a/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializer.java b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializer.java
new file mode 100644
index 0000000000..cc6a670dfd
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializer.java
@@ -0,0 +1,154 @@
+/*
+ * 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.    
+ */
+
+package org.apache.tuscany.das.rdb.dbconfig;
+
+import java.io.InputStream;
+import java.sql.Connection;
+
+/**
+ * This is the master class having public utility APIs exposed for DAS sample creater - for table and data maintainance.
+ * 
+ */
+public class DBInitializer {
+    private static final String DEFAULT_CANNED_DB_CONFIGURATION = "CannedSampleDBConfig.xml";
+
+    /**
+     * Database configuration model
+     */
+    protected DBConfig dbConfig;
+
+    /**
+     * Database connection
+     */
+    protected Connection connection;
+
+    /**
+     * To manage database connection
+     */
+    protected DBConnectionHelper dbConnectionHelper;
+
+    /**
+     * To manage database phisical structure
+     */
+    protected DBHelper dbHelper;
+
+    /**
+     * To manage database population
+     */
+    protected DBDataHelper dbDataHelper;
+
+    /**
+     * Create instance of DBInitHelper based on default canned database configuration
+     * 
+     * @param dbconfigFileLocation
+     * @throws Exception
+     */
+    public DBInitializer() {
+        InputStream dbConfigStream = this.getClass().getClassLoader().getResourceAsStream(DEFAULT_CANNED_DB_CONFIGURATION);
+        init(dbConfigStream);
+    }
+
+    /**
+     * Create instance of DBInitHelper based on Config file location
+     * 
+     * @param dbconfigFileLocation
+     * @throws Exception
+     */
+    public DBInitializer(String dbconfigFileLocation) throws Exception {
+        InputStream dbConfigStream = this.getClass().getClassLoader().getResourceAsStream(dbconfigFileLocation);
+        init(dbConfigStream);
+    }
+
+    /**
+     * Create instance of DBInitHelper based on Config stream
+     * 
+     * @param dbconfigStream
+     * @throws Exception
+     */
+    public DBInitializer(InputStream dbConfigStream) throws Exception {
+        init(dbConfigStream);
+    }
+
+    /**
+     * Initialize helper members based on Config
+     * 
+     * @param dbconfigStream
+     */
+    protected void init(InputStream dbconfigStream) {
+        dbConfig = DBConfigUtil.loadDBConfig(dbconfigStream);
+
+        dbConnectionHelper = new DBConnectionHelper();
+        dbHelper = new DBHelper(dbConfig);
+        dbDataHelper = new DBDataHelper(dbConfig);
+
+    }
+
+    /**
+     * Check if the Database and all tables have been created on the database
+     * 
+     * @return return true if tables exist, else return false.
+     */
+    public boolean isDatabaseReady() {
+        return dbHelper.isDatabaseReady();
+    }
+
+    /**
+     * 
+     * @return - return true if all tables have at least a row, false otherwise
+     */
+    public boolean isDatabasePopulated() {
+        return dbDataHelper.isDatabasePopulated();
+    }
+
+    /**
+     * Create tables and populate data.
+     * 
+     * @param clean - If true, tables will be force dropped and recreated, else it will skip table creation for pre-existing tables.
+     * @throws Exception
+     */
+    public void initializeDatabase(boolean clean) throws DatabaseInitializerException {
+        if (clean) {
+            dbHelper.dropDatabaseTables();
+        }
+        dbHelper.initializeDatabase();
+        dbDataHelper.initializeDatabaseData();
+    }
+
+    /**
+     * Populate database data
+     * 
+     * @param clean If true, table data will be droped before data is created
+     */
+    public void initializeDatabaseData(boolean clean) throws DatabaseInitializerException{
+        if (clean) {
+        	dbDataHelper.deleteDatabaseData();
+        }
+        dbDataHelper.initializeDatabaseData();
+    }
+
+    /**
+     * Refresh data in tables.
+     * 
+     * @throws Exception
+     */
+    public void refreshDatabaseData() throws DatabaseInitializerException {
+        initializeDatabase(true);
+    }
+}
diff --git a/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DataSourceInitializationException.java b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DataSourceInitializationException.java
new file mode 100644
index 0000000000..ef5bef7761
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DataSourceInitializationException.java
@@ -0,0 +1,40 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.dbconfig;
+
+/**
+ * 
+ * Class responsible to throw exception encountered when initializing DataSource.
+ *
+ */
+public class DataSourceInitializationException extends RuntimeException  {	
+	private static final long serialVersionUID = 302160989411041041L;
+	
+    public DataSourceInitializationException(String string) {
+        super(string);
+    }
+	
+	public DataSourceInitializationException(Throwable e){
+		super(e);
+	}
+    
+    public DataSourceInitializationException(String string, Throwable e) {
+        super(string, e);
+    }
+}
diff --git a/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DatabaseInitializerException.java b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DatabaseInitializerException.java
new file mode 100644
index 0000000000..8c4fd0d71b
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DatabaseInitializerException.java
@@ -0,0 +1,40 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.dbconfig;
+
+/**
+ * 
+ * Class responsible to throw exception encountered when initializing DataSource.
+ *
+ */
+public class DatabaseInitializerException extends RuntimeException  {	
+	private static final long serialVersionUID = 302160989411041041L;
+	
+    public DatabaseInitializerException(String string) {
+        super(string);
+    }
+	
+	public DatabaseInitializerException(Throwable e){
+		super(e);
+	}
+    
+    public DatabaseInitializerException(String string, Throwable e) {
+        super(string, e);
+    }
+}
diff --git a/das-java/trunk/samples/dbconfig/src/main/resources/CannedSampleDBConfig.xml b/das-java/trunk/samples/dbconfig/src/main/resources/CannedSampleDBConfig.xml
new file mode 100644
index 0000000000..2b7b1ba1fd
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/main/resources/CannedSampleDBConfig.xml
@@ -0,0 +1,47 @@
+<?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.
+ -->
+<DBConfig xmlns="http:///org.apache.tuscany.das.rdb/dbconfig.xsd">
+	<ConnectionInfo>
+		<ConnectionProperties 
+			driverClass="org.apache.derby.jdbc.EmbeddedDriver" 
+			databaseURL="jdbc:derby:c:/dastest; create = true" 
+			loginTimeout="600000"/>
+	</ConnectionInfo>
+	<Table name="COMPANY" SQLCreate="CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY , NAME VARCHAR(30))" >
+		<row>'ACME Publishing'</row>
+		<row>'Do-rite plumbing'</row>
+		<row>'MegaCorp'</row>
+	</Table>
+	<Table name="DEPARTMENT" SQLCreate="CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY, NAME VARCHAR(30),LOCATION VARCHAR(30), DEPNUMBER VARCHAR(10),COMPANYID INT)">
+		<row>'Advanced Technologies', 'NY', '123', 1</row>
+		<row>'Default Name', '', '', 51</row>
+		<row>'Default Name', '', '', 51</row>
+		<row>'Default Name', '', '', 51</row>
+		<row>'Default Name', '', '', 51</row>
+		<row>'Default Name', '', '', 51</row>
+		<row>'Default Name', '', '', 51</row>
+	</Table>
+	<Table name="EMPLOYEE" SQLCreate="CREATE TABLE EMPLOYEE (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY,NAME VARCHAR(30),SN VARCHAR(10), MANAGER SMALLINT, DEPARTMENTID INT)">
+		<row>'John Jones','E0001',0,12</row>
+		<row>'Mary Smith','E0002',1,null</row>
+		<row>'Jane Doe','E0003',0,12</row>
+		<row>'Al Smith','E0004',1,12</row>
+	</Table>
+</DBConfig>
diff --git a/das-java/trunk/samples/dbconfig/src/main/resources/DBConfig.xsd b/das-java/trunk/samples/dbconfig/src/main/resources/DBConfig.xsd
new file mode 100644
index 0000000000..798c88c75c
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/main/resources/DBConfig.xsd
@@ -0,0 +1,56 @@
+<?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:DBConfig="http:///org.apache.tuscany.das.rdb/dbconfig.xsd" 
+	        xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+	        elementFormDefault="qualified" 
+	        targetNamespace="http:///org.apache.tuscany.das.rdb/dbconfig.xsd">
+
+   <xsd:element name="DBConfig" type="DBConfig:DBConfig"/> 
+
+   <xsd:complexType name="DBConfig">
+      <xsd:sequence>
+        <xsd:element maxOccurs="1" minOccurs="1" name="ConnectionInfo" type="DBConfig:ConnectionInfo"/>
+        <xsd:element maxOccurs="unbounded" minOccurs="1" name="Table" type="DBConfig:Table"/>
+      </xsd:sequence>
+   </xsd:complexType>
+
+   <xsd:complexType name="ConnectionInfo">
+      <xsd:sequence>
+        <xsd:element maxOccurs="1" minOccurs="0" name="ConnectionProperties" type="DBConfig:ConnectionProperties"/>
+      </xsd:sequence>
+      <xsd:attribute name="dataSource" type="xsd:string"/>
+   </xsd:complexType>
+   
+   <xsd:complexType name="ConnectionProperties">
+      <xsd:attribute name="driverClass" type="xsd:string"/>
+      <xsd:attribute name="databaseURL" type="xsd:string"/>
+      <xsd:attribute default="" name="userName" type="xsd:string"/>
+      <xsd:attribute default="" name="password" type="xsd:string"/>
+      <xsd:attribute default="0" name="loginTimeout" type="xsd:int"/>      
+   </xsd:complexType>
+   
+   <xsd:complexType name="Table">
+      <xsd:sequence>
+        <xsd:element maxOccurs="unbounded" minOccurs="1" name="row" type="xsd:string"/>
+      </xsd:sequence>   
+   	  <xsd:attribute name="name" type="xsd:string"/>
+   	  <xsd:attribute name="SQLCreate" type="xsd:string"/>
+   </xsd:complexType>   
+</xsd:schema>
diff --git a/das-java/trunk/samples/dbconfig/src/main/resources/META-INF/LICENSE b/das-java/trunk/samples/dbconfig/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000000..fb4df3722c
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,353 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+===============================================================================================================
+
+Other components and dependencies under Apache Software License 2.0 : 
+
+   log4j-1.2.14.jar    - Apache Logging Services
+   derby 10.2.2.0.jar  - Apache Derby
+   stax-api-1.0.1.jar  - The Streaming API for XML (StAX)
+   wstx-asl-3.2.0.jar  - WoodStox StAX implementation
+   standard-1.1.1.jar  - The Apache Jackarta Taglibs
+   jstl-1.1.2.jar      - The Apache Jackarta Taglibs
+   *.tld               - The Apache Jackarta Taglibs
+
+===============================================================================================================
+
+
+Apache Tuscany SDO for Java Subcomponents
+=========================================: 
+
+The Tuscany SDO for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
+
+Permission to copy, make derivative works of, and distribute the Service Data Objects 
+JavaDoc and Interface Definition Files files in any medium without fee or royalty as part 
+of a compliant implementation of the Service Data Objects Specification is hereby granted.  
+The Service Data Objects Specification may be found at any of the following locations:
+
+http://dev2dev.bea.com/technologies/commonj/index.jsp
+http://www.ibm.com/developerworks/library/specification/ws-sdo/
+http://oracle.com/technology/webservices/sca
+https://www.sdn.sap.com/
+http://www.xcalia/xdn/specs/sdo
+
+THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES 
+ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS 
+SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES AND THE IMPLEMENTATION OF THEIR CONTENTS, 
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE 
+SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or 
+publicity pertaining to the Service Component Architecture Specification or its contents without specific, 
+written prior permission. Title to copyright in the Service Data Objects Specification and the 
+JavaDoc and Interface Definition Files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+=================================================================================================================
+
+For the Eclipse EMF components
+(codegen-2.2.3.jar
+codegen-ecore-2.2.3.jar
+common-2.2.3.jar
+ecore-2.2.3.jar
+ecore-change-2.2.3.jar
+ecore-xmi-2.2.3.jar
+xsd-2.2.3.jar)
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+===================================================================================================
diff --git a/das-java/trunk/samples/dbconfig/src/main/resources/META-INF/NOTICE b/das-java/trunk/samples/dbconfig/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000000..c2cf1f95b4
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,32 @@
+Apache Tuscany SDO for Java
+Copyright 2006, 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Apache Tuscany is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Web Services PMC. Incubation is required of all newly accepted
+projects until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with other successful
+ASF projects. While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be fully endorsed
+by the ASF.
+
+Unless otherwise indicated, all distribution made available by the Apache Software Foundation
+is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
+A copy of the AL is provided with this distribution as the LICENSE.txt file present in the
+root directory, and is also available at http://www.apache.org/licenses/.
+
+The terms and conditions governing the distribution may refer to the AL or other license
+agreements, notices or terms and conditions. Some of these other license agreements may
+include (but are not limited to):
+
+  . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
+
+It is your obligation to read and accept all such terms and conditions prior to use of the
+distribution. If term or condition is provided, please contact the Apache Software Foundation
+to determine what terms and conditions govern that particular distribution.
+
+This product also includes software developed by the Open Service Oriented Architecture organisation
+(http://osoa.org). The license for this software may be found in the LICENSE.txt file contained in this
+distribution.
diff --git a/das-java/trunk/samples/dbconfig/src/main/resources/META-INF/README b/das-java/trunk/samples/dbconfig/src/main/resources/META-INF/README
new file mode 100644
index 0000000000..723f3fd3ab
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/main/resources/META-INF/README
@@ -0,0 +1,35 @@
+Apache Tuscany M1 build (May, 2006)
+===================================
+
+http://incubator.apache.org/tuscany/
+
+Tuscany is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Web Services PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness or 
+stability of the code, it does indicate that the project has yet to be fully
+endorsed by the ASF.
+
+
+Support
+-------
+
+Any problem with this release can be reported to the Tuscany mailing list 
+or in the JIRA issue tracker.
+
+Mailing list subscription:
+    tuscany-dev-subscribe@ws.apache.org
+
+Jira:
+    http://issues.apache.org/jira/browse/Tuscany
+
+
+Thank you for using Tuscany!
+
+
+The Tuscany Team. 
+
diff --git a/das-java/trunk/samples/dbconfig/src/main/resources/log4j.properties b/das-java/trunk/samples/dbconfig/src/main/resources/log4j.properties
new file mode 100644
index 0000000000..3b0e5074da
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/main/resources/log4j.properties
@@ -0,0 +1,33 @@
+#  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.
+#  
+# Set root logger level to DEBUG and its only appender to A1.
+
+log4j.rootLogger=NONE, NULL
+
+# NULL Appender
+log4j.appender.NULL=org.apache.log4j.varia.NullAppender
+
+log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
+log4j.appender.NULL.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n
+
+# CONSOLE is set to be a ConsoleAppender.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+
+# Print only messages of level WARN or above in the package com.foo.
+log4j.logger.org.apache.tuscany=NONE
+\ No newline at end of file
diff --git a/das-java/trunk/samples/dbconfig/src/test/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializerTestCase.java b/das-java/trunk/samples/dbconfig/src/test/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializerTestCase.java
new file mode 100644
index 0000000000..3bd0bae407
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/test/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializerTestCase.java
@@ -0,0 +1,69 @@
+/*
+ * 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.    
+ */
+
+package org.apache.tuscany.das.rdb.dbconfig;
+
+import junit.framework.TestCase;
+
+
+
+/**
+ * Tests the Converter framwork
+ */
+public class DBInitializerTestCase extends TestCase {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+    
+    
+    public void testCreateDatabase() throws Exception {
+        DBInitializer dbInitializer = new DBInitializer("dbConfig.xml");
+        dbInitializer.initializeDatabase(true);
+    }
+    
+    public void something() throws Exception {
+//        try{            
+//            //DBInitHelper dbInit = new DBInitHelper("DBConfig.xml");
+//            DBInitializer dbInit = new DBInitializer(new FileInputStream("c:/DBConfig.xml"));
+//            dbInit.initializeDatabase(true);
+//            
+//            System.out.println("check schema created:"+dbInit.isDatabaseReady());
+//            System.out.println("check data created:"+dbInit.isDataCreated());
+//            
+//            dbInit.deleteData();
+//            System.out.println("check data created after deleteData:"+dbInit.isDataCreated());
+//            
+//            dbInit.deleteSchema();
+//            System.out.println("after deleteSchema check schema created:"+dbInit.isDatabaseReady());
+//            
+//            dbInit.createSchema(false);
+//            System.out.println("check schema created after createSchema:"+dbInit.isDatabaseReady());
+//            
+//            dbInit.refreshData(true);
+//            System.out.println("check data created after refreshData:"+dbInit.isDataCreated());
+//        }catch(Exception e){
+//            e.printStackTrace();
+//        }
+    }
+}
diff --git a/das-java/trunk/samples/dbconfig/src/test/resources/dbConfig.xml b/das-java/trunk/samples/dbconfig/src/test/resources/dbConfig.xml
new file mode 100644
index 0000000000..51cb1c11d7
--- /dev/null
+++ b/das-java/trunk/samples/dbconfig/src/test/resources/dbConfig.xml
@@ -0,0 +1,52 @@
+<?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.
+ -->
+<DBConfig xmlns="http:///org.apache.tuscany.das.rdb/dbconfig.xsd">
+	<ConnectionInfo>
+		<ConnectionProperties 
+			driverClass="org.apache.derby.jdbc.EmbeddedDriver" 
+			databaseURL="jdbc:derby:target/dastest; create = true" 
+			loginTimeout="600000"/>
+	</ConnectionInfo>
+	<Table name="COMPANY" SQLCreate="CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(30), EOTMID INTEGER)">
+		<row>51, 'ACME Publishing', 0</row>
+		<row>52, 'Do-rite plumbing', 0</row>
+		<row>53, 'MegaCorp', 0</row>
+	</Table>
+	<Table name="DEPARTMENT" SQLCreate="CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY, NAME VARCHAR(30),LOCATION VARCHAR(30), DEPNUMBER VARCHAR(10),COMPANYID INT)">	
+		<row>'Advanced Technologies', 'NY', '123', 1</row>
+		<row>'Default Name', '', '', 51</row>
+		<row>'Default Name', '', '', 51</row>
+		<row>'Default Name', '', '', 51</row>
+		<row>'Default Name', '', '', 51</row>
+		<row>'Default Name', '', '', 51</row>
+		<row>'Default Name', '', '', 51</row>
+	</Table>
+	<Table name="EMPLOYEE" SQLCreate="CREATE TABLE EMPLOYEE (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY,NAME VARCHAR(30),SN VARCHAR(10), MANAGER SMALLINT, DEPARTMENTID INT)">
+		<row>'John Jones','E0001',0,12</row>
+		<row>'Mary Smith','E0002',1,null</row>
+		<row>'Jane Doe','E0003',0,12</row>
+		<row>'Al Smith','E0004',1,12</row>
+	</Table>
+	<Table name="STATES" SQLCreate="CREATE TABLE STATES (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(2))">
+	</Table>
+	<Table name="CITIES" SQLCreate="CREATE TABLE CITIES (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(50), STATES_ID INTEGER,  
+	CONSTRAINT FK1 FOREIGN KEY (STATES_ID) REFERENCES  STATES (ID) ON DELETE NO ACTION ON UPDATE NO ACTION)"	>
+	</Table>	
+</DBConfig>
diff --git a/das-java/trunk/samples/pom.xml b/das-java/trunk/samples/pom.xml
new file mode 100644
index 0000000000..b95b8f9653
--- /dev/null
+++ b/das-java/trunk/samples/pom.xml
@@ -0,0 +1,40 @@
+<?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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.das</groupId>
+        <artifactId>tuscany-das</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.tuscany.das.samples</groupId>
+    <artifactId>tuscany-das-samples</artifactId>
+    <packaging>pom</packaging>
+    <name>Tuscany DAS Samples</name>
+
+    <modules>
+        <module>dbconfig</module>
+        <module>company-webapp</module>
+        <module>advanced-webapp</module>
+        <module>customer</module>
+        <module>transaction</module>
+    </modules>
+</project>
diff --git a/das-java/trunk/samples/testing/tomcat/advanced-webapp/pom.xml b/das-java/trunk/samples/testing/tomcat/advanced-webapp/pom.xml
new file mode 100644
index 0000000000..4f54e1d820
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/advanced-webapp/pom.xml
@@ -0,0 +1,80 @@
+<?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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.das.samples</groupId>
+        <artifactId>tuscany-das-samples-testing-tomcat</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>tuscany-das-samples-testing-tomcat-advanced-webapp</artifactId>
+    <packaging>jar</packaging>
+    <name>Tuscany Testing Ajax DAS Web Sample</name>
+    <description>Testing Tomcat Ajax DAS end user test</description>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>1.9</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta-regexp</groupId>
+                        <artifactId>jakarta-regexp</artifactId>
+                        <version>1.4</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-jakarta-regexp</artifactId>
+                        <version>1.6.1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-xslp</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/das-java/trunk/samples/testing/tomcat/advanced-webapp/src/main/resources/META-INF/LICENSE b/das-java/trunk/samples/testing/tomcat/advanced-webapp/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000000..fb4df3722c
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/advanced-webapp/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,353 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+===============================================================================================================
+
+Other components and dependencies under Apache Software License 2.0 : 
+
+   log4j-1.2.14.jar    - Apache Logging Services
+   derby 10.2.2.0.jar  - Apache Derby
+   stax-api-1.0.1.jar  - The Streaming API for XML (StAX)
+   wstx-asl-3.2.0.jar  - WoodStox StAX implementation
+   standard-1.1.1.jar  - The Apache Jackarta Taglibs
+   jstl-1.1.2.jar      - The Apache Jackarta Taglibs
+   *.tld               - The Apache Jackarta Taglibs
+
+===============================================================================================================
+
+
+Apache Tuscany SDO for Java Subcomponents
+=========================================: 
+
+The Tuscany SDO for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
+
+Permission to copy, make derivative works of, and distribute the Service Data Objects 
+JavaDoc and Interface Definition Files files in any medium without fee or royalty as part 
+of a compliant implementation of the Service Data Objects Specification is hereby granted.  
+The Service Data Objects Specification may be found at any of the following locations:
+
+http://dev2dev.bea.com/technologies/commonj/index.jsp
+http://www.ibm.com/developerworks/library/specification/ws-sdo/
+http://oracle.com/technology/webservices/sca
+https://www.sdn.sap.com/
+http://www.xcalia/xdn/specs/sdo
+
+THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES 
+ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS 
+SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES AND THE IMPLEMENTATION OF THEIR CONTENTS, 
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE 
+SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or 
+publicity pertaining to the Service Component Architecture Specification or its contents without specific, 
+written prior permission. Title to copyright in the Service Data Objects Specification and the 
+JavaDoc and Interface Definition Files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+=================================================================================================================
+
+For the Eclipse EMF components
+(codegen-2.2.3.jar
+codegen-ecore-2.2.3.jar
+common-2.2.3.jar
+ecore-2.2.3.jar
+ecore-change-2.2.3.jar
+ecore-xmi-2.2.3.jar
+xsd-2.2.3.jar)
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+===================================================================================================
diff --git a/das-java/trunk/samples/testing/tomcat/advanced-webapp/src/main/resources/META-INF/NOTICE b/das-java/trunk/samples/testing/tomcat/advanced-webapp/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000000..c2cf1f95b4
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/advanced-webapp/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,32 @@
+Apache Tuscany SDO for Java
+Copyright 2006, 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Apache Tuscany is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Web Services PMC. Incubation is required of all newly accepted
+projects until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with other successful
+ASF projects. While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be fully endorsed
+by the ASF.
+
+Unless otherwise indicated, all distribution made available by the Apache Software Foundation
+is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
+A copy of the AL is provided with this distribution as the LICENSE.txt file present in the
+root directory, and is also available at http://www.apache.org/licenses/.
+
+The terms and conditions governing the distribution may refer to the AL or other license
+agreements, notices or terms and conditions. Some of these other license agreements may
+include (but are not limited to):
+
+  . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
+
+It is your obligation to read and accept all such terms and conditions prior to use of the
+distribution. If term or condition is provided, please contact the Apache Software Foundation
+to determine what terms and conditions govern that particular distribution.
+
+This product also includes software developed by the Open Service Oriented Architecture organisation
+(http://osoa.org). The license for this software may be found in the LICENSE.txt file contained in this
+distribution.
diff --git a/das-java/trunk/samples/testing/tomcat/advanced-webapp/src/main/resources/META-INF/README b/das-java/trunk/samples/testing/tomcat/advanced-webapp/src/main/resources/META-INF/README
new file mode 100644
index 0000000000..723f3fd3ab
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/advanced-webapp/src/main/resources/META-INF/README
@@ -0,0 +1,35 @@
+Apache Tuscany M1 build (May, 2006)
+===================================
+
+http://incubator.apache.org/tuscany/
+
+Tuscany is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Web Services PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness or 
+stability of the code, it does indicate that the project has yet to be fully
+endorsed by the ASF.
+
+
+Support
+-------
+
+Any problem with this release can be reported to the Tuscany mailing list 
+or in the JIRA issue tracker.
+
+Mailing list subscription:
+    tuscany-dev-subscribe@ws.apache.org
+
+Jira:
+    http://issues.apache.org/jira/browse/Tuscany
+
+
+Thank you for using Tuscany!
+
+
+The Tuscany Team. 
+
diff --git a/das-java/trunk/samples/testing/tomcat/advanced-webapp/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java b/das-java/trunk/samples/testing/tomcat/advanced-webapp/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java
new file mode 100644
index 0000000000..1335b4c484
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/advanced-webapp/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java
@@ -0,0 +1,596 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.test.das;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+
+import junit.framework.TestCase;
+
+import com.gargoylesoftware.htmlunit.BrowserVersion;
+import com.gargoylesoftware.htmlunit.CollectingAlertHandler;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.FrameWindow;
+import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
+import com.gargoylesoftware.htmlunit.html.HtmlButtonInput;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlOption;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlRadioButtonInput;
+import com.gargoylesoftware.htmlunit.html.HtmlSelect;
+
+public class AjaxDasTestCase extends TestCase {
+    public static final String testUrl = "http://localhost:8080/sample-advanced-webapp";
+
+    protected WebClient _webClient;
+    protected URL _url;
+    final List collectedAlerts = new ArrayList();
+
+    protected void setUp() throws Exception {
+        //New HTMLunit web client
+        _webClient = new WebClient(BrowserVersion.MOZILLA_1_0);
+        //System.out.println("SETTING ALERT HANDLER");
+        _webClient.setAlertHandler( new CollectingAlertHandler(collectedAlerts) );
+        _webClient.setRedirectEnabled(true);
+        // Going to have the WebClient connect to this URL
+        _url = new URL(testUrl);
+    }
+
+    public void testHomepage() throws Exception {
+        final String TEST_CASE = "AjaxDASHomePage";
+        System.out.print("Running:" + TEST_CASE + "\t\t\t");
+        //System.out.println("js enabled?"+_webClient.isJavaScriptEnabled());
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+        //System.out.println("page title:"+page.getTitleText());
+        String responseText = page.asText();
+        //System.out.println("page html-->\n" + responseText);
+        //check page header
+        assertTrue(-1 != responseText.indexOf("Tuscany DAS Web Sample"));
+
+        FrameWindow menuFrame = page.getFrameByName("fixed");
+        HtmlPage menuPage = (HtmlPage)menuFrame.getEnclosedPage();
+        String menuResponseText = menuPage.asText();
+        //System.out.println("menu html-->\n" + menuResponseText);
+        //check main menu and sub menu
+        assertTrue(-1 != menuResponseText.indexOf("Advanced Features"));
+        assertTrue(-1 != menuResponseText.indexOf("OCC"));
+        assertTrue(-1 != menuResponseText.indexOf("Converter"));
+        assertTrue(-1 != menuResponseText.indexOf("Result Set Shape"));
+        assertTrue(-1 != menuResponseText.indexOf("Adhoc Query"));
+        assertTrue(-1 != menuResponseText.indexOf("Command"));
+
+        collectedAlerts.clear();
+        System.out.println("SUCCESS!!!");
+    }
+
+    public void testDBRefresh() throws Exception{
+        final String TEST_CASE = "DBRefresh";
+        System.out.print("Running:" + TEST_CASE + "\t\t");
+
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+        FrameWindow menuFrame = page.getFrameByName("fixed");
+        HtmlPage menuPage = (HtmlPage)menuFrame.getEnclosedPage();
+        HtmlButtonInput commandButton = (HtmlButtonInput)menuPage.getFormByName("MenuForm").getHtmlElementById("refreshButton");
+        HtmlPage commandResult = null;
+        if(commandButton != null){
+        	//System.out.println("command button text:"+commandButton.asText());
+        	commandButton.focus();
+        	//System.out.println("command button script:"+commandButton.getOnClickAttribute());
+        	commandResult = (HtmlPage)commandButton.click();
+        }
+
+        //System.out.println("alerts size:"+collectedAlerts.size());
+        //if(collectedAlerts.size() > 0){
+        	//for(int i=0; i<collectedAlerts.size(); i++){
+        		//System.out.println("alert msg:"+collectedAlerts.get(i));
+        	//}
+        //}
+
+        String commandResultText = commandResult.asText();
+        //System.out.println("initial commandResultText-->\n"+commandResultText);
+
+        while(commandResultText.indexOf("Refreshed database!") == -1){
+        	Thread.sleep(1000);
+        	commandResultText = commandResult.asText();
+        	//System.out.println("commandResultText-->\n" + commandResultText);
+        }
+        assertTrue(-1 != commandResultText.indexOf("Refreshed database!"));
+
+        collectedAlerts.clear();
+        System.out.println("SUCCESS!!!");
+    }
+
+    public void testAllCompanies_Adhoc() throws Exception{
+        final String TEST_CASE = "AllCompanies_Adhoc";
+        System.out.print("Running:" + TEST_CASE + "\t\t\t");
+
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+        FrameWindow menuFrame = page.getFrameByName("fixed");
+        HtmlPage menuPage = (HtmlPage)menuFrame.getEnclosedPage();
+
+        //basic content
+        HtmlAnchor adhocAnchor = menuPage.getAnchorByHref("./indexAdhoc.jsp");
+        HtmlPage adhocPage = (HtmlPage)adhocAnchor.click();
+        String adhocText = adhocPage.asText();
+        //System.out.println("adhoc html-->\n" + adhocText);
+        assertTrue(-1 != adhocText.indexOf("Adhoc SQL Query"));//heading
+        assertTrue(-1 != adhocText.indexOf("ExecuteQuery"));//button text
+
+        //list values
+        HtmlForm adhocForm = adhocPage.getFormByName("DasForm");
+        //adhocPage.getEnclosingWindow().getWebClient()
+        HtmlSelect adhocList = (HtmlSelect)adhocForm.getHtmlElementById("sqlQuery");
+        List adhocListOptions = adhocList.getOptions();//.asText();
+        //System.out.println(" adhocListOptionsText-->\n" + adhocListOptions.toString());
+        String allOptionsText = "";
+        for(int i=0; i<adhocListOptions.size(); i++){
+        	HtmlOption curOption = (HtmlOption)adhocListOptions.get(i);
+        	String curOptionText = curOption.getValueAttribute();
+        	allOptionsText = allOptionsText + curOptionText;
+        	if(curOptionText.equals("SELECT * FROM COMPANY")){
+        		adhocList.setSelectedAttribute(curOption, true);
+        		//System.out.println("select option..."+curOptionText);
+        	}
+        }
+        //System.out.println("allOptionsText:"+allOptionsText);
+
+        assertTrue(-1 != allOptionsText.indexOf("NullQuery"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("SELECT * FROM COMPANY"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("SELECT * FROM COMPANY LEFT OUTER JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("INSERT INTO DEPARTMENT (NAME, COMPANYID) VALUES ('MyDept',1)"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("DELETE FROM DEPARTMENT WHERE DEPARTMENT.COMPANYID=1 and DEPARTMENT.ID>1"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("UPDATE DEPARTMENT SET NAME='MyUpdDept' WHERE COMPANYID=1 AND ID=1"));//check each option
+
+        //check result
+        HtmlButtonInput adhocButton = (HtmlButtonInput)adhocForm.getHtmlElementById("queryButton");
+        adhocButton.focus();
+        HtmlPage adhocResult = (HtmlPage)adhocButton.click();
+        String adhocResultText = adhocResult.asText();
+        //System.out.println("initial result:"+adhocResultText);
+
+        //System.out.println("alerts size:"+collectedAlerts.size());
+        //if(collectedAlerts.size() > 0){
+        //	for(int i=0; i<collectedAlerts.size(); i++){
+        	//	System.out.println("alert msg:"+collectedAlerts.get(i));
+        	//}
+        //}
+
+        while(adhocResultText.indexOf("das:DataGraphRoot") == -1){
+        	//System.out.println("sleeping:"+adhocResultText);
+        	Thread.sleep(1000);
+        	adhocResultText = adhocResult.asText();
+        }
+
+        //System.out.println("new result:"+adhocResultText);
+
+        //better to check just data in xml
+        assertTrue(-1 != adhocResultText.indexOf("ACME Publishing"));
+        assertTrue(-1 != adhocResultText.indexOf("Do-rite plumbing"));
+        assertTrue(-1 != adhocResultText.indexOf("MegaCorp"));
+
+        collectedAlerts.clear();
+        System.out.println("SUCCESS!!!");
+    }
+
+    public void testAllCompaniesDepartments_Command() throws Exception{
+        final String TEST_CASE = "AllCompaniesDepartments_Command";
+        System.out.print("Running:" + TEST_CASE + "\t\t");
+
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+        FrameWindow menuFrame = page.getFrameByName("fixed");
+        HtmlPage menuPage = (HtmlPage)menuFrame.getEnclosedPage();
+
+        //basic content
+        HtmlAnchor commandAnchor = menuPage.getAnchorByHref("./indexCommand.jsp");
+        HtmlPage commandPage = (HtmlPage)commandAnchor.click();
+        String commandText = commandPage.asText();
+        //System.out.println("command html-->\n" + commandText);
+        assertTrue(-1 != commandText.indexOf("DAS Command:"));//heading
+        assertTrue(-1 != commandText.indexOf("ExecuteCommand"));//button text
+
+        //list values
+        HtmlForm commandForm = commandPage.getFormByName("DasForm");
+        HtmlSelect commandList = (HtmlSelect)commandForm.getHtmlElementById("DasCommand");
+        List commandListOptions = commandList.getOptions();
+        //System.out.println(" commandListOptionsText-->\n" + commandListOptions.toString());
+        String allOptionsText = "";
+        for(int i=0; i<commandListOptions.size(); i++){
+        	HtmlOption curOption = (HtmlOption)commandListOptions.get(i);
+        	String curOptionText = curOption.getValueAttribute();
+        	allOptionsText = allOptionsText + curOptionText;
+        	if(curOptionText.equals("AllCompaniesAndDepartments")){
+        		commandList.setSelectedAttribute(curOption, true);
+        		//System.out.println("select option..."+curOptionText);
+        	}
+        }
+        assertTrue(-1 != allOptionsText.indexOf("NullCommand"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("AllCompanies"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("AllCompaniesAndDepartments"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("AddDepartmentToFirstCompany"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("DeleteDepartmentFromFirstCompany"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("UpdateCompanyDepartmentNames"));//check each option
+
+        //check result
+        HtmlButtonInput commandButton = (HtmlButtonInput)commandForm.getHtmlElementById("commandButton");
+        HtmlPage commandResult = null;
+        if(commandButton != null){
+        	//System.out.println("command button text:"+commandButton.asText());
+        	commandButton.focus();
+        	//System.out.println("command button script:"+commandButton.getOnClickAttribute());
+        	commandResult = (HtmlPage)commandButton.click();
+        }
+
+
+        //System.out.println("alerts size:"+collectedAlerts.size());
+        //if(collectedAlerts.size() > 0){
+        	//for(int i=0; i<collectedAlerts.size(); i++){
+        		//System.out.println("alert msg:"+collectedAlerts.get(i));
+        	//}
+        //}
+
+        String commandResultText = commandResult.asText();
+        //System.out.println("initial commandResultText-->\n"+commandResultText);
+
+        while(commandResultText.indexOf("das:DataGraphRoot") == -1){
+        	Thread.sleep(1000);
+        	commandResultText = commandResult.asText();
+        }
+        //System.out.println("commandResultText-->\n" + commandResultText);
+
+        assertTrue(-1 != commandResultText.indexOf("ACME Publishing"));
+        assertTrue(-1 != commandResultText.indexOf("Do-rite plumbing"));
+        assertTrue(-1 != commandResultText.indexOf("MegaCorp"));
+        assertTrue(-1 != commandResultText.indexOf("Advanced Technologies"));
+        assertTrue(-1 != commandResultText.indexOf("COMPANYID"));
+        assertTrue(-1 != commandResultText.indexOf("1"));
+
+        collectedAlerts.clear();
+        System.out.println("SUCCESS!!!");
+    }
+
+    public void testInsertCompanies_Adhoc() throws Exception{
+        final String TEST_CASE = "InsertCompanies_Adhoc";
+        System.out.print("Running:" + TEST_CASE + "\t\t\t");
+
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+        FrameWindow menuFrame = page.getFrameByName("fixed");
+        HtmlPage menuPage = (HtmlPage)menuFrame.getEnclosedPage();
+
+        //basic content
+        HtmlAnchor adhocAnchor = menuPage.getAnchorByHref("./indexAdhoc.jsp");
+        HtmlPage adhocPage = (HtmlPage)adhocAnchor.click();
+        String adhocText = adhocPage.asText();
+        //System.out.println("adhoc html-->\n" + adhocText);
+        assertTrue(-1 != adhocText.indexOf("Adhoc SQL Query"));//heading
+        assertTrue(-1 != adhocText.indexOf("ExecuteQuery"));//button text
+
+        //list values
+        HtmlForm adhocForm = adhocPage.getFormByName("DasForm");
+        //adhocPage.getEnclosingWindow().getWebClient()
+        HtmlSelect adhocList = (HtmlSelect)adhocForm.getHtmlElementById("sqlQuery");
+        List adhocListOptions = adhocList.getOptions();//.asText();
+        //System.out.println(" adhocListOptionsText-->\n" + adhocListOptions.toString());
+        String allOptionsText = "";
+        for(int i=0; i<adhocListOptions.size(); i++){
+        	HtmlOption curOption = (HtmlOption)adhocListOptions.get(i);
+        	String curOptionText = curOption.getValueAttribute();
+        	allOptionsText = allOptionsText + curOptionText;
+        	if(curOptionText.startsWith("{INSERT INTO DEPARTMENT (NAME, COMPANYID) VALUES ('MyDept',1)}" )){
+        		adhocList.setSelectedAttribute(curOption, true);
+        		//System.out.println("insert option..."+curOptionText);
+        	}
+        }
+        //System.out.println("allOptionsText:"+allOptionsText);
+
+        assertTrue(-1 != allOptionsText.indexOf("NullQuery"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("SELECT * FROM COMPANY"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("SELECT * FROM COMPANY LEFT OUTER JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("INSERT INTO DEPARTMENT (NAME, COMPANYID) VALUES ('MyDept',1)"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("DELETE FROM DEPARTMENT WHERE DEPARTMENT.COMPANYID=1 and DEPARTMENT.ID>1"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("UPDATE DEPARTMENT SET NAME='MyUpdDept' WHERE COMPANYID=1 AND ID=1"));//check each option
+
+        //check result
+        HtmlButtonInput adhocButton = (HtmlButtonInput)adhocForm.getHtmlElementById("queryButton");
+        HtmlPage adhocResult = (HtmlPage)adhocButton.click();
+
+        //System.out.println("alerts size:"+collectedAlerts.size());
+        //if(collectedAlerts.size() > 0){
+        	//for(int i=0; i<collectedAlerts.size(); i++){
+        		//System.out.println("alert msg:"+collectedAlerts.get(i));
+        	//}
+        //}
+
+        String adhocResultText = adhocResult.asText();
+        while(adhocResultText.indexOf("das:DataGraphRoot") == -1){
+        	Thread.sleep(1000);
+        	adhocResultText = adhocResult.asText();
+        	//System.out.println("adhocResultText-->\n" + adhocResultText);
+        }
+
+        assertTrue(-1 != adhocResultText.indexOf("ACME Publishing"));
+        assertTrue(-1 != adhocResultText.indexOf("Do-rite plumbing"));
+        assertTrue(-1 != adhocResultText.indexOf("MegaCorp"));
+        assertTrue(-1 != adhocResultText.indexOf("Advanced Technologies"));
+        assertTrue(-1 != adhocResultText.indexOf("COMPANYID"));
+        assertTrue(-1 != adhocResultText.indexOf("1"));
+        assertTrue(-1 != adhocResultText.indexOf("MyDept"));
+        assertTrue(adhocResultText.indexOf("COMPANYID") != adhocResultText.lastIndexOf("COMPANYID"));
+
+        collectedAlerts.clear();
+        System.out.println("SUCCESS!!!");
+    }
+
+    public void testDeleteDepartment_Command() throws Exception{
+        final String TEST_CASE = "DeleteDepartment_Command";
+        System.out.print("Running:" + TEST_CASE + "\t\t");
+
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+        FrameWindow menuFrame = page.getFrameByName("fixed");
+        HtmlPage menuPage = (HtmlPage)menuFrame.getEnclosedPage();
+
+        //basic content
+        HtmlAnchor commandAnchor = menuPage.getAnchorByHref("./indexCommand.jsp");
+        HtmlPage commandPage = (HtmlPage)commandAnchor.click();
+        String commandText = commandPage.asText();
+        //System.out.println("command html-->\n" + commandText);
+        assertTrue(-1 != commandText.indexOf("DAS Command:"));//heading
+        assertTrue(-1 != commandText.indexOf("ExecuteCommand"));//button text
+
+        //list values
+        HtmlForm commandForm = commandPage.getFormByName("DasForm");
+        HtmlSelect commandList = (HtmlSelect)commandForm.getHtmlElementById("DasCommand");
+        List commandListOptions = commandList.getOptions();
+        //System.out.println(" commandListOptionsText-->\n" + commandListOptions.toString());
+        String allOptionsText = "";
+        for(int i=0; i<commandListOptions.size(); i++){
+        	HtmlOption curOption = (HtmlOption)commandListOptions.get(i);
+        	String curOptionText = curOption.getValueAttribute();
+        	allOptionsText = allOptionsText + curOptionText;
+        	if(curOptionText.equals("DeleteDepartmentFromFirstCompany")){
+        		commandList.setSelectedAttribute(curOption, true);
+        		//System.out.println("delete option..."+curOptionText);
+        	}
+        }
+        assertTrue(-1 != allOptionsText.indexOf("NullCommand"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("AllCompanies"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("AllCompaniesAndDepartments"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("AddDepartmentToFirstCompany"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("DeleteDepartmentFromFirstCompany"));//check each option
+        assertTrue(-1 != allOptionsText.indexOf("UpdateCompanyDepartmentNames"));//check each option
+
+        //check result
+        HtmlButtonInput commandButton = (HtmlButtonInput)commandForm.getHtmlElementById("commandButton");
+        HtmlPage commandResult = null;
+        if(commandButton != null){
+        	//System.out.println("command button text:"+commandButton.asText());
+        	commandButton.focus();
+        	//System.out.println("command button script:"+commandButton.getOnClickAttribute());
+        	commandResult = (HtmlPage)commandButton.click();
+        }
+
+
+        //System.out.println("alerts size:"+collectedAlerts.size());
+        //if(collectedAlerts.size() > 0){
+        	//for(int i=0; i<collectedAlerts.size(); i++){
+        		//System.out.println("alert msg:"+collectedAlerts.get(i));
+        	//}
+        //}
+
+        String commandResultText = commandResult.asText();
+        //System.out.println("initial commandResultText-->\n"+commandResultText);
+
+        while(commandResultText.indexOf("das:DataGraphRoot") == -1){
+        	Thread.sleep(1000);
+        	commandResultText = commandResult.asText();
+        	//System.out.println("commandResultText-->\n" + commandResultText);
+        }
+
+        assertTrue(-1 != commandResultText.indexOf("ACME Publishing"));
+        assertTrue(-1 != commandResultText.indexOf("Do-rite plumbing"));
+        assertTrue(-1 != commandResultText.indexOf("MegaCorp"));
+        assertTrue(-1 != commandResultText.indexOf("Advanced Technologies"));
+        assertTrue(-1 != commandResultText.indexOf("COMPANYID"));
+        assertTrue(-1 != commandResultText.indexOf("1"));
+
+        collectedAlerts.clear();
+        System.out.println("SUCCESS!!!");
+    }
+
+    public void testOCC() throws Exception{
+        final String TEST_CASE = "OCC";
+        System.out.print("Running:" + TEST_CASE + "\t\t");
+
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+        FrameWindow menuFrame = page.getFrameByName("fixed");
+        HtmlPage menuPage = (HtmlPage)menuFrame.getEnclosedPage();
+
+        //basic content
+        HtmlAnchor commandAnchor = menuPage.getAnchorByHref("./occ.jsp");
+        HtmlPage commandPage = (HtmlPage)commandAnchor.click();
+        String commandText = commandPage.asText();
+        //System.out.println("command html-->\n" + commandText);
+        assertTrue(-1 != commandText.indexOf("Automatic Optimistic Concurrency Control:"));//heading
+        assertTrue(-1 != commandText.indexOf("ExecuteTransaction"));//button text
+
+        //list values
+        HtmlForm commandForm = commandPage.getFormByName("DasForm");
+        //check result
+        HtmlButtonInput commandButton = (HtmlButtonInput)commandForm.getHtmlElementById("occButton");
+        HtmlPage commandResult = null;
+        if(commandButton != null){
+        	//System.out.println("command button text:"+commandButton.asText());
+        	commandButton.focus();
+        	//System.out.println("command button script:"+commandButton.getOnClickAttribute());
+        	commandResult = (HtmlPage)commandButton.click();
+        }
+
+        //System.out.println("alerts size:"+collectedAlerts.size());
+        //if(collectedAlerts.size() > 0){
+        	//for(int i=0; i<collectedAlerts.size(); i++){
+        		//System.out.println("alert msg:"+collectedAlerts.get(i));
+        	//}
+        //}
+
+        String commandResultText = commandResult.asText();
+        //System.out.println("initial commandResultText-->\n"+commandResultText);
+
+        while(commandResultText.indexOf("collision") == -1){
+        	Thread.sleep(1000);
+        	commandResultText = commandResult.asText();
+        	//System.out.println("commandResultText-->\n" + commandResultText);
+        }
+
+        assertTrue(-1 != commandResultText.indexOf("An update collision occurred"));
+
+        collectedAlerts.clear();
+        System.out.println("SUCCESS!!!");
+    }
+
+    public void testRSS() throws Exception{
+        final String TEST_CASE = "RSS";
+        System.out.print("Running:" + TEST_CASE + "\t\t");
+
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+        FrameWindow menuFrame = page.getFrameByName("fixed");
+        HtmlPage menuPage = (HtmlPage)menuFrame.getEnclosedPage();
+
+        //basic content
+        HtmlAnchor commandAnchor = menuPage.getAnchorByHref("./rss.jsp");
+        HtmlPage commandPage = (HtmlPage)commandAnchor.click();
+        String commandText = commandPage.asText();
+        //System.out.println("command html-->\n" + commandText);
+        assertTrue(-1 != commandText.indexOf("Result Set Shape:"));//heading
+        assertTrue(-1 != commandText.indexOf("ExecuteQuery"));//button text
+
+        //list values
+        HtmlForm commandForm = commandPage.getFormByName("DasForm");
+        //check result
+        HtmlButtonInput commandButton = (HtmlButtonInput)commandForm.getHtmlElementById("rssButton");
+        HtmlPage commandResult = null;
+        if(commandButton != null){
+        	//System.out.println("command button text:"+commandButton.asText());
+        	commandButton.focus();
+        	//System.out.println("command button script:"+commandButton.getOnClickAttribute());
+        	commandResult = (HtmlPage)commandButton.click();
+        }
+
+        //System.out.println("alerts size:"+collectedAlerts.size());
+        //if(collectedAlerts.size() > 0){
+        	//for(int i=0; i<collectedAlerts.size(); i++){
+        		//System.out.println("alert msg:"+collectedAlerts.get(i));
+        	//}
+        //}
+
+        String commandResultText = commandResult.asText();
+        //System.out.println("initial commandResultText-->\n"+commandResultText);
+
+        while(commandResultText.indexOf("das:DataGraphRoot") == -1){
+        	Thread.sleep(1000);
+        	commandResultText = commandResult.asText();
+        }
+
+        //System.out.println("commandResultText-->\n" + commandResultText);
+
+        assertTrue(-1 != commandResultText.indexOf("Roosevelt"));
+        assertTrue(-1 != commandResultText.indexOf("1600 Pennsylvania Avenue"));
+
+        collectedAlerts.clear();
+        System.out.println("SUCCESS!!!");
+    }
+
+    public void testConverter() throws Exception{
+        final String TEST_CASE = "Converter";
+        System.out.print("Running:" + TEST_CASE + "\t\t");
+
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+        FrameWindow menuFrame = page.getFrameByName("fixed");
+        HtmlPage menuPage = (HtmlPage)menuFrame.getEnclosedPage();
+
+        //basic content
+        HtmlAnchor commandAnchor = menuPage.getAnchorByHref("./converter.jsp");
+        HtmlPage commandPage = (HtmlPage)commandAnchor.click();
+        String commandText = commandPage.asText();
+        //System.out.println("command html-->\n" + commandText);
+        assertTrue(-1 != commandText.indexOf("Arbitrary Converter:"));//heading
+        assertTrue(-1 != commandText.indexOf("ExecuteTransaction"));//button text
+
+        //list values
+        HtmlForm commandForm = commandPage.getFormByName("DasForm");
+        //select first radio buttom
+        HtmlRadioButtonInput stmt0 = (HtmlRadioButtonInput)commandForm.getRadioButtonInput("stmt", "stmt0");
+        if(stmt0 != null){
+        	//System.out.println("got stmt0");
+        	stmt0.setChecked(true);
+        }
+
+        //check result
+        HtmlButtonInput commandButton = (HtmlButtonInput)commandForm.getHtmlElementById("converterButton");
+        HtmlPage commandResult = null;
+        if(commandButton != null){
+        	//System.out.println("command button text:"+commandButton.asText());
+        	commandButton.focus();
+        	//System.out.println("command button script:"+commandButton.getOnClickAttribute());
+        	commandResult = (HtmlPage)commandButton.click();
+        }
+
+        //System.out.println("alerts size:"+collectedAlerts.size());
+        //if(collectedAlerts.size() > 0){
+        	//for(int i=0; i<collectedAlerts.size(); i++){
+        		//System.out.println("alert msg:"+collectedAlerts.get(i));
+        	//}
+        //}
+
+        String commandResultText = commandResult.asText();
+        //System.out.println("initial commandResultText-->\n"+commandResultText);
+
+        while(commandResultText.indexOf("das:DataGraphRoot") == -1){
+        	Thread.sleep(1000);
+        	commandResultText = commandResult.asText();
+        	//System.out.println("commandResultText-->\n" + commandResultText);
+        }
+        assertTrue(-1 != commandResultText.indexOf("1957"));
+
+        collectedAlerts.clear();
+        System.out.println("SUCCESS!!!");
+    }
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) throws Exception{
+        AjaxDasTestCase t = new AjaxDasTestCase();
+        t.setUp();
+        try{
+            ////t.testHomepage();
+            //t.testAllCompanies_Adhoc();
+            //t.testAllCompaniesDepartments_Command();
+        	//t.testInsertCompanies_Adhoc();
+        	//t.testDeleteDepartment_Command();
+        	//t.testOCC();
+        	////t.testRSS();
+        	//t.testConverter();
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+
+    }
+
+}
diff --git a/das-java/trunk/samples/testing/tomcat/build.xml b/das-java/trunk/samples/testing/tomcat/build.xml
new file mode 100644
index 0000000000..3f38968476
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/build.xml
@@ -0,0 +1,309 @@
+<?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.
+ -->
+<project name="setup tomcat" default="prepareTomcat" basedir='.'>
+        <property environment="env" />
+        <property file="${user.home}/tuscany/build.properties" />
+        <property file="${user.home}/build.properties" />
+
+        <property name="tuscany.acceptance.tomcat.version" value='6.0.13' />
+        <condition property="tuscany.acceptance.tomcat.zipped" value='apache-tomcat-${tuscany.acceptance.tomcat.version}.zip'>
+            <os family="windows"/>
+        </condition>
+        <condition property="tuscany.acceptance.tomcat.zipped" value='apache-tomcat-${tuscany.acceptance.tomcat.version}.tar.gz'>
+            <or>
+                <os family="unix"/>
+                <os family="mac"/>
+            </or>
+        </condition>
+        <condition property="ant.home" value="${env.ANT_HOME}">
+            <os family="unix"/>
+        </condition>
+
+        <property name="tuscany.acceptance.target.dir" value='target' />
+        <property name="tuscany.acceptance.tc.dir" value='${tuscany.acceptance.target.dir}/apache-tomcat-${tuscany.acceptance.tomcat.version}' />
+        <condition property="tuscany.acceptance.tc.bin.dir" value="${tuscany.acceptance.tc.dir}/lib">
+            <contains string="${tuscany.acceptance.tomcat.version}" substring="6."/>
+        </condition>
+        <condition property="tuscany.acceptance.tc.bin.dir" value="${tuscany.acceptance.tc.dir}/common/lib">
+            <contains string="${tuscany.acceptance.tomcat.version}" substring="5."/>
+        </condition>
+
+
+<!-- KJW define property for the complete path of apache dir -->
+        <property name="fullpath.tuscany.acceptance.tc.dir" value= '${basedir}/${tuscany.acceptance.tc.dir}' />
+
+        <property name="tuscany.acceptance.groupId" value='org/apache/tuscany' />
+        <property name="tuscany.acceptance.version" value='incubating-M1' />
+
+        <property name="tuscany.commonj.acceptance.groupId" value='commonj' />
+        <property name="tuscany.commonj.acceptance.version" value='incubating-M1' />
+
+        <property name="tuscany.sdo.acceptance.groupId" value='org/apache/tuscany' />
+        <property name="tuscany.sdo.acceptance.version" value='incubating-M1' />
+
+<!--KJW  Define location of canned Derby database -->
+        <property name="tuscany.acceptance.das.samples.companyweb.dir" value='../../company-webapp' />
+        <property name="tuscany.acceptance.das.samples.advancedweb.dir" value='../../advanced-webapp' />
+
+        <property name="tuscany.maven.repos.dir" value='${user.home}\.m2\repository' />
+        <condition property="isWindows">
+            <os family="windows"/>
+        </condition>
+        <condition property="isUnix">
+            <os family="unix"/>
+        </condition>
+        <condition property="isMac">
+            <os family="mac"/>
+        </condition>
+
+        <patternset id="tuscany.acceptance.common.dependencies">
+	            <include name="**/stax/stax-api/1.0/stax-api-1.0.jar"/>
+                <include name="**/woodstox/wstx-asl/2.9.3/wstx-asl-2.9.3.jar" />
+        </patternset>
+
+        <patternset id="tuscany.acceptance.emf.dependencies">
+                <include name="**/org/eclipse/emf/common/2.2.3/common-2.2.3.jar" />
+                <include name="**/org/eclipse/emf/ecore/2.2.3/ecore-2.2.3.jar" />
+                <include name="**/org/eclipse/emf/ecore-change/2.2.3/ecore-change-2.2.3.jar" />
+                <include name="**/org/eclipse/emf/ecore-xmi/2.2.3/ecore-xmi-2.2.3.jar" />
+                <include name="**/org/eclipse/xsd/xsd/2.2.3/xsd-2.2.3.jar" />
+        </patternset>
+
+        <patternset id="tuscany.acceptance.tc.specsdoimpl">  <!--jars which need to go into tomcat common/lib  -->
+                <include name="**/${tuscany.sca.acceptance.groupId}/sca-api/${tuscany.sca.acceptance.version}/sca-api-${tuscany.sca.acceptance.version}.jar" />
+                <include name="**/${tuscany.commonj.acceptance.groupId}/sdo-api/${tuscany.commonj.acceptance.version}/sdo-api-${tuscany.commonj.acceptance.version}.jar" />
+                <include name="**/${tuscany.acceptance.groupId}/tuscany-sdo-impl/${tuscany.acceptance.version}/tuscany-sdo-impl-${tuscany.acceptance.version}.jar" />
+        </patternset>
+
+        <target name="init">
+                <available property='tomcat.is.available' file='${tuscany.acceptance.tc.dir}/server/lib/catalina.jar' type='file' />
+                <available property='tuscany.acceptance.tomcat.zipped.available' file='${tuscany.acceptance.tomcat.zipped}' type='file' />
+                <available property='tuscany.acceptance.tomcat.serverxmlorg.available' file='${tuscany.acceptance.tc.dir}/conf/server.xml.original' />
+                <available property='tuscany.acceptance.tomcat.contextxmlorg.available' file='${tuscany.acceptance.tc.dir}/conf/context.xml.original' />
+        </target>
+
+        <target name="check.for.zip" depends="init" unless='tuscany.acceptance.tomcat.zipped.available'>
+                <property name='tuscany.acceptance.tomcat.zipped.full' location="${tuscany.acceptance.tomcat.zipped}" />
+                <echo level="error" message="${tuscany.acceptance.tomcat.zipped} file not found here:'${tuscany.acceptance.tomcat.zipped.full}'" />
+                <echo level="error" message="Either place zip file there or change ${user.home}/build.properties in home dir to include 'tuscany.acceptance.tomcat.zipped' property to where zip is located. " />
+                <fail />
+        </target>
+
+
+        <target name="tuscany.tomcat.unzipWindows" if="isWindows" depends='init,check.for.zip' description='Just unzip tomcat' unless='tomcat.is.available'>
+                <unzip src="${tuscany.acceptance.tomcat.zipped}" dest="${tuscany.acceptance.target.dir}" />
+        </target>
+        <target name="tuscany.tomcat.unzipUnix" if="isUnix" depends='init,check.for.zip' description='Just unzip tomcat' unless='tomcat.is.available'>
+            <mkdir dir="${tuscany.acceptance.target.dir}" />
+            <gunzip src="${tuscany.acceptance.tomcat.zipped}" dest="${tuscany.acceptance.target.dir}/temp.tar"/>
+            <!-- Exec tar because ant builtin tar does not preserve execute permissions. -->
+            <exec executable="tar" dir="${tuscany.acceptance.target.dir}">
+                <arg value="xf"/>
+                <arg value="temp.tar"/>
+            </exec>
+			<delete file="${tuscany.acceptance.target.dir}/temp.tar"/>
+        </target>
+        <target name="tuscany.tomcat.unzipMac" if="isMac" depends='init,check.for.zip' description='Just unzip tomcat' unless='tomcat.is.available'>
+                <antcall target="tuscany.tomcat.unzipUnix" /> <!-- just use unix for now -->
+        </target>
+
+        <target name="prepareTomcat" depends='tuscany.tomcat.unzipWindows,tuscany.tomcat.unzipUnix,tuscany.tomcat.unzipMac,tuscany.tomcat.fixup,tuscany.deploy.das.standalone' description='Unzip tomcat, fix it up, and deploy samples'>
+                <dirname property='tuscany.acceptance.tc.dir.full' file="${tuscany.acceptance.tc.dir}/bin" />
+                <echo level="info" message="Tomcat fixed up here:  ${tuscany.acceptance.tc.dir.full}" />
+                
+        </target>
+        <target name="startTestServer" depends='prepareTomcat' description='start server prepared to run tests'>
+                <waitfor maxwait="1" maxwaitunit="second" checkevery="200" timeoutproperty="tuscany.tomcat.notstarted" >
+                        <http url="http://localhost:8080"/>
+                </waitfor>
+                <condition property="tuscany.tomcat.alreadystarted">
+                    <not>
+                     <istrue value="${tuscany.tomcat.notstarted}"/>
+                    </not>
+                </condition>
+                <antcall target="startTomcat" />
+        </target>
+
+        <target name="tuscany.tomcat.fixup" depends='tuscany.tomcat.fixserverconfig' description='Fix up tomcat for tuscany.'>
+                <mkdir dir="${tuscany.acceptance.target.dir}" />
+
+                <copy todir="${tuscany.acceptance.tc.bin.dir}" flatten='true'>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset refid="tuscany.acceptance.emf.dependencies" />
+                        </fileset>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset refid="tuscany.acceptance.tc.specsdoimpl" />
+                        </fileset>
+                        <fileset dir="${tuscany.acceptance.das.samples.advancedweb.dir}">
+                                <include name="**/*.war" />
+                        </fileset>                        
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset>  <!-- for Derby and DAS support -->
+                                  <include name="**/${tuscany.acceptance.groupId}/das/tuscany-das-rdb/${tuscany.acceptance.version}/tuscany-das-rdb-${tuscany.acceptance.version}.jar" />
+                                  <include name="**/org/apache/derby/derby/10.1.2.1/derby-10.1.2.1.jar" />
+                                </patternset>
+                        </fileset>
+	                    <fileset dir="${tuscany.maven.repos.dir}">
+        	                    <patternset refid="tuscany.acceptance.common.dependencies" />
+    	                </fileset>
+                </copy>
+        </target>
+
+        <!-- DAS standalone target -->
+        <target name="tuscany.deploy.das.standalone" description='Deploy DAS stand alone sample to tomcat.'>
+               <copy todir="${tuscany.acceptance.tc.dir}/webapps" flatten='true'>
+                        <fileset dir="${tuscany.acceptance.das.samples.companyweb.dir}">
+                                <include name="**/*.war" />
+                        </fileset>
+                        <fileset dir="${tuscany.acceptance.das.samples.advancedweb.dir}">
+                                <include name="**/*.war" />
+                        </fileset>                         
+                        <!-- lresende - using the right name on the build now, don't need to clean up -->
+                        <!-- chainedmapper>
+                                <flattenmapper/>
+                                <globmapper from="*-1.0-SNAPSHOT.war" to="*.war"/>
+                        </chainedmapper -->
+                </copy>
+
+                <!-- Create directory for the derby database -->
+                <property name="tuscany.acceptance.target.databases.dir" value='${tuscany.acceptance.tc.dir}/Databases' />
+                <mkdir dir="${tuscany.acceptance.target.databases.dir}" />
+
+                <!-- Copy over the Derby database -->
+                <!-- lresende - we now use the dbConfig, and don't need to copy canned database here -->
+                <!-- copy todir="${tuscany.acceptance.target.databases.dir}">
+                        <fileset dir="${tuscany.acceptance.das.samples.companyweb.dir}">
+                                <include name="**/dastest/**" />
+                        </fileset>
+                        <fileset dir="${tuscany.acceptance.das.samples.advancedweb.dir}">
+                                <include name="**/ajaxdastest/**" />
+                        </fileset>
+                </copy -->
+        </target>
+
+
+        <!-- provide a convenient -Djava.ext.dirs=  to run j2se samples -->
+        <target name="j2se" description='create a java extensions directory to run J2SE tuscany applications.'>
+                <property name="tuscany.acceptance.j2se.dir" value='${tuscany.acceptance.target.dir}/j2se' />
+                <mkdir dir="${tuscany.acceptance.j2se.dir}" />
+                <copy todir="${tuscany.acceptance.j2se.dir}" flatten='true'>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset refid="tuscany.acceptance.common.dependencies" />
+                        </fileset>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset refid="tuscany.acceptance.emf.dependencies" />
+                                <patternset refid="tuscany.acceptance.tc.specsdoimpl" />
+                        </fileset>
+                </copy>
+        </target>
+
+        <target name="backup.server.xml" depends="init" unless='tuscany.acceptance.tomcat.serverxmlorg.available'>
+                <copy file='${tuscany.acceptance.tc.dir}/conf/server.xml' tofile='${tuscany.acceptance.tc.dir}/conf/server.xml.original' />
+        </target>
+        <target name="backup.context.xml" depends="init" unless='tuscany.acceptance.tomcat.contextxmlorg.available'>
+                <copy file='${tuscany.acceptance.tc.dir}/conf/context.xml' tofile='${tuscany.acceptance.tc.dir}/conf/context.xml.original' />
+        </target>
+        <target name="tuscany.tomcat.fixserverconfig" depends='tuscany.tomcat.fixserverxml,tuscany.tomcat.fixcontextxml' description='Add listeners' />
+        <target name="tuscany.tomcat.fixserverxml" depends='init,backup.server.xml'  unless='tuscany.acceptance.tomcat.serverxmlorg.available'>
+                <property name="tuscany.acceptance.tomcat.serverxmlorg.available" value='true' />
+
+<!-- KJW save results to server_temp.xml -->
+                <!-- DO NOTHING AT THIS TIME                
+                <xslt processor="trax"
+                  in="${tuscany.acceptance.tc.dir}/conf/server.xml.original" 
+                  style="server.xsl" 
+                  out="${tuscany.acceptance.tc.dir}/conf/server_temp.xml">
+                </xslt>
+                -->
+
+                
+<!--KJW modify server.xml to include derby database resource -->
+               <echo level="info" message="Running datasource.xsl" />
+               <xslt processor="trax"
+                  in="${tuscany.acceptance.tc.dir}/conf/server.xml.original" style="datasource.xsl" 
+                  out="${tuscany.acceptance.tc.dir}/conf/server.xml">
+                  <param name="database_location" expression="jdbc:derby:../Databases/dastest"/>
+                  <param name="database_location_ajax" expression="jdbc:derby:../Databases/ajaxdastest"/>                  
+                </xslt>
+
+
+        </target>
+        <target name="tuscany.tomcat.fixcontextxml" depends='init,backup.context.xml'  unless='tuscany.acceptance.tomcat.contextxmlorg.available'>
+                <property name="tuscany.acceptance.tomcat.contextxmlorg.available" value='true' />
+                <!-- DO NOTHING AT THIS TIME                
+                <xslt
+                  in="${tuscany.acceptance.tc.dir}/conf/context.xml.original" style="context.xsl" 
+                  out="${tuscany.acceptance.tc.dir}/conf/context.xml">
+
+                 </xslt>
+                 -->
+        </target>
+        
+        <target name="startTomcatWindows" if="isWindows" unless='tuscany.tomcat.alreadystarted' >
+                <exec spawn='true' vmlauncher="false" failonerror='false' dir="${tuscany.acceptance.tc.dir}\bin" executable="cmd.exe" >
+                        <arg line="/C start &quot; Tomcat running ${tuscany.acceptance.tc.dir}&quot;  catalina run &amp;&amp;   exit" />
+                </exec>
+        </target>
+        <target name="startTomcatUnix" if="isUnix" unless='tuscany.tomcat.alreadystarted'>
+            <echo level="info" message="Starting Tomcat"/>
+            <exec spawn='true' vmlauncher="false" failonerror='false' dir="${tuscany.acceptance.tc.dir}/bin" executable="xterm" >
+                <arg line="-e ./catalina.sh run"/>
+            </exec>
+        </target>
+        <target name="startTomcatMac" if="isMac" unless='tuscany.tomcat.alreadystarted' >
+                <antcall target="startTomcatUnix" />
+        </target>
+
+        <target name="tuscany.tomcat.alreadystartedmsg" if="tuscany.tomcat.alreadystarted">
+             <echo level="info" message="Tomcat has been already started! ${tuscany.tomcat.alreadystarted}" />
+        </target>
+        <target name="startTomcat" description="Start up tomcat." depends="tuscany.tomcat.alreadystartedmsg,startTomcatWindows,startTomcatUnix,startTomcatMac" unless='tuscany.tomcat.alreadystarted'>
+                <sleep seconds="10"/> <!-- it's going to at least require this -->
+                <waitfor maxwait="15" maxwaitunit="second" checkevery="200">
+                        <http url="http://localhost:8080"/>
+                </waitfor>
+                
+        </target>
+
+        <target name="clean" description='Clean out all built artifacts'>
+                <delete dir="${tuscany.acceptance.target.dir}" />
+        </target>
+
+        <target name='setup.TC.antscripts' depends='tuscany.tomcat.unzipWindows,tuscany.tomcat.unzipUnix,tuscany.tomcat.unzipMac'>
+                <!-- Configure the custom Ant tasks for the Manager application -->
+                <taskdef resource="org/apache/catalina/ant/catalina.tasks">
+                        <classpath>
+                                <fileset dir="${tuscany.acceptance.tc.dir}/server/lib">
+                                        <include name="*.jar" />
+                                </fileset>
+                                <fileset dir="${tuscany.acceptance.tc.bin.dir}">
+                                        <include name="*.jar" />
+                                </fileset>
+                                <fileset dir="${tuscany.acceptance.tc.dir}/bin">
+                                        <include name="*.jar" />
+                                </fileset>
+                        </classpath>
+                </taskdef>
+
+        </target>
+
+</project>
+
+
diff --git a/das-java/trunk/samples/testing/tomcat/company-webapp/pom.xml b/das-java/trunk/samples/testing/tomcat/company-webapp/pom.xml
new file mode 100644
index 0000000000..cb4ad55a52
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/company-webapp/pom.xml
@@ -0,0 +1,80 @@
+<?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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.das.samples</groupId>
+        <artifactId>tuscany-das-samples-testing-tomcat</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>tuscany-das-samples-testing-tomcat-company-webapp</artifactId>
+    <packaging>jar</packaging>
+    <name>Tuscany Testing DAS Sample - Company-webapp</name>
+    <description>Testing Tomcat DAS end user test</description>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>1.9</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta-regexp</groupId>
+                        <artifactId>jakarta-regexp</artifactId>
+                        <version>1.4</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-jakarta-regexp</artifactId>
+                        <version>1.6.1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-xslp</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/das-java/trunk/samples/testing/tomcat/company-webapp/src/main/resources/META-INF/LICENSE b/das-java/trunk/samples/testing/tomcat/company-webapp/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000000..9597d92eb3
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/company-webapp/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,353 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+===============================================================================================================
+
+Other components and dependencies under Apache Software License 2.0 : 
+
+   log4j-1.2.14.jar    - Apache Logging Services
+   derby 10.2.2.0.jar  - Apache Derby
+   stax-api-1.0.1.jar  - The Streaming API for XML (StAX)
+   wstx-asl-3.2.0.jar  - WoodStox StAX implementation
+   standard-1.1.1.jar  - The Apache Jackarta Taglibs
+   jstl-1.1.2.jar      - The Apache Jackarta Taglibs
+   *.tld               - The Apache Jackarta Taglibs
+
+===============================================================================================================
+
+
+Apache Tuscany SDO for Java Subcomponents
+=========================================: 
+
+The Tuscany SDO for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
+
+Permission to copy, make derivative works of, and distribute the Service Data Objects 
+JavaDoc and Interface Definition Files files in any medium without fee or royalty as part 
+of a compliant implementation of the Service Data Objects Specification is hereby granted.  
+The Service Data Objects Specification may be found at any of the following locations:
+
+http://dev2dev.bea.com/technologies/commonj/index.jsp
+http://www.ibm.com/developerworks/library/specification/ws-sdo/
+http://oracle.com/technology/webservices/sca
+https://www.sdn.sap.com/
+http://www.xcalia/xdn/specs/sdo
+
+THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES 
+ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS 
+SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES AND THE IMPLEMENTATION OF THEIR CONTENTS, 
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE 
+SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or 
+publicity pertaining to the Service Component Architecture Specification or its contents without specific, 
+written prior permission. Title to copyright in the Service Data Objects Specification and the 
+JavaDoc and Interface Definition Files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+=================================================================================================================
+
+For the Eclipse EMF components
+(codegen-2.2.3.jar
+codegen-ecore-2.2.3.jar
+common-2.2.3.jar
+ecore-2.2.3.jar
+ecore-change-2.2.3.jar
+ecore-xmi-2.2.3.jar
+xsd-2.2.3.jar)
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+===================================================================================================
diff --git a/das-java/trunk/samples/testing/tomcat/company-webapp/src/main/resources/META-INF/NOTICE b/das-java/trunk/samples/testing/tomcat/company-webapp/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000000..e9d98fc7f5
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/company-webapp/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,32 @@
+Apache Tuscany SDO for Java
+Copyright 2006, 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Apache Tuscany is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Web Services PMC. Incubation is required of all newly accepted
+projects until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with other successful
+ASF projects. While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be fully endorsed
+by the ASF.
+
+Unless otherwise indicated, all distribution made available by the Apache Software Foundation
+is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
+A copy of the AL is provided with this distribution as the LICENSE.txt file present in the
+root directory, and is also available at http://www.apache.org/licenses/.
+
+The terms and conditions governing the distribution may refer to the AL or other license
+agreements, notices or terms and conditions. Some of these other license agreements may
+include (but are not limited to):
+
+  . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
+
+It is your obligation to read and accept all such terms and conditions prior to use of the
+distribution. If term or condition is provided, please contact the Apache Software Foundation
+to determine what terms and conditions govern that particular distribution.
+
+This product also includes software developed by the Open Service Oriented Architecture organisation
+(http://osoa.org). The license for this software may be found in the LICENSE.txt file contained in this
+distribution.
diff --git a/das-java/trunk/samples/testing/tomcat/company-webapp/src/main/resources/META-INF/README b/das-java/trunk/samples/testing/tomcat/company-webapp/src/main/resources/META-INF/README
new file mode 100644
index 0000000000..9b26d1690a
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/company-webapp/src/main/resources/META-INF/README
@@ -0,0 +1,35 @@
+Apache Tuscany M1 build (May, 2006)
+===================================
+
+http://incubator.apache.org/tuscany/
+
+Tuscany is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Web Services PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness or 
+stability of the code, it does indicate that the project has yet to be fully
+endorsed by the ASF.
+
+
+Support
+-------
+
+Any problem with this release can be reported to the Tuscany mailing list 
+or in the JIRA issue tracker.
+
+Mailing list subscription:
+    tuscany-dev-subscribe@ws.apache.org
+
+Jira:
+    http://issues.apache.org/jira/browse/Tuscany
+
+
+Thank you for using Tuscany!
+
+
+The Tuscany Team. 
+
diff --git a/das-java/trunk/samples/testing/tomcat/company-webapp/src/test/java/org/apache/tuscany/test/das/DasTestCase.java b/das-java/trunk/samples/testing/tomcat/company-webapp/src/test/java/org/apache/tuscany/test/das/DasTestCase.java
new file mode 100644
index 0000000000..faa92d6994
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/company-webapp/src/test/java/org/apache/tuscany/test/das/DasTestCase.java
@@ -0,0 +1,249 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.test.das;
+
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+
+public class DasTestCase extends TestCase {
+    public static final String testUrl = "http://localhost:8080/sample-company-webapp/";
+
+    protected WebClient _webClient;
+    protected URL _url;
+
+    protected void setUp() throws Exception {
+        //New HTMLunit web client
+        _webClient = new WebClient();
+        _webClient.setRedirectEnabled(true);
+
+        // Going to have the WebClient connect to this URL
+        _url = new URL(testUrl);
+
+    }
+
+    public void testHomepage() throws Exception {
+        final String TEST_CASE = "HomePage";
+        System.out.print("Running:" + TEST_CASE + "\t\t\t");
+
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+        //System.out.println(page.getTitleText());
+
+        String responseText = page.asText();
+        //System.out.println("html-->\n" + responseText);
+        //check page header
+        assertTrue(-1 != responseText.indexOf("Tuscany DAS Companies WEB Example"));
+        //check table headers
+        assertTrue(-1 != responseText.indexOf("ID"));
+        assertTrue(-1 != responseText.indexOf("Name"));
+        assertTrue(-1 != responseText.indexOf("Department_ID"));
+        assertTrue(-1 != responseText.indexOf("Department_Name"));
+        //check companies values
+        //assertTrue(-1 != responseText.indexOf("51"));
+        assertTrue(-1 != responseText.indexOf("ACME Publishing"));
+        //assertTrue(-1 != responseText.indexOf("53"));
+        assertTrue(-1 != responseText.indexOf("Do-rite plumbing"));
+        //assertTrue(-1 != responseText.indexOf("53"));
+        assertTrue(-1 != responseText.indexOf("MegaCorp"));
+        //check departments
+        assertTrue(-1 != responseText.indexOf("Default Name 2"));
+        assertTrue(-1 != responseText.indexOf("Default Name 3"));
+        assertTrue(-1 != responseText.indexOf("Default Name 4"));
+        assertTrue(-1 != responseText.indexOf("Default Name 5"));
+        assertTrue(-1 != responseText.indexOf("Default Name 6"));
+        assertTrue(-1 != responseText.indexOf("Default Name 7"));
+        assertTrue(-1 != responseText.indexOf("Default Name 8"));
+
+        System.out.println("SUCCESS!!!");
+    }
+
+
+    public void testAllCompanies() throws Exception{
+        final String TEST_CASE = "AllCompanies";
+        System.out.print("Running:" + TEST_CASE + "\t\t\t");
+
+        // Get the first page
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+
+        // Get the form that we are dealing with and within that form,
+        // find the submit button and the field that we want to change.
+        final HtmlForm form = (HtmlForm) page.getForms().get(0);
+        final HtmlSubmitInput allCompaniesButton = (HtmlSubmitInput)form.getHtmlElementById("doFill");
+        // Now submit the form by clicking the button
+        final HtmlPage resultPage = (HtmlPage)allCompaniesButton.click();
+
+        //verify the resultPage
+        String responseText = resultPage.asText();
+        //System.out.println("html-->\n" + responseText);
+        // check table headers
+        assertTrue(-1 != responseText.indexOf("ID"));
+        assertTrue(-1 != responseText.indexOf("Name"));
+        //check table values
+        //assertTrue(-1 != responseText.indexOf("51"));
+        assertTrue(-1 != responseText.indexOf("ACME Publishing"));
+        //assertTrue(-1 != responseText.indexOf("52"));
+        assertTrue(-1 != responseText.indexOf("Do-rite plumbing"));
+        //assertTrue(-1 != responseText.indexOf("53"));
+        assertTrue(-1 != responseText.indexOf("MegaCorp"));
+
+        System.out.println("SUCCESS!!!");
+    }
+
+    public void testAllCompaniesDepartments() throws Exception{
+        final String TEST_CASE = "AllCompaniesDepartments";
+        System.out.print("Running:" + TEST_CASE + "\t\t");
+
+        // Get the first page
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+
+        // Get the form that we are dealing with and within that form,
+        // find the submit button and the field that we want to change.
+        final HtmlForm form = (HtmlForm) page.getForms().get(0);
+        final HtmlSubmitInput allCompaniesButton = (HtmlSubmitInput)form.getHtmlElementById("doFillAll");
+        // Now submit the form by clicking the button
+        final HtmlPage resultPage = (HtmlPage)allCompaniesButton.click();
+
+        //verify the resultPage
+        String responseText = resultPage.asText();
+        //System.out.println("html-->\n" + responseText);
+        //check table headers
+        assertTrue(-1 != responseText.indexOf("ID"));
+        assertTrue(-1 != responseText.indexOf("Name"));
+        assertTrue(-1 != responseText.indexOf("Department_ID"));
+        assertTrue(-1 != responseText.indexOf("Department_Name"));
+        //check companies values
+        //assertTrue(-1 != responseText.indexOf("51"));
+        assertTrue(-1 != responseText.indexOf("ACME Publishing"));
+        //assertTrue(-1 != responseText.indexOf("53"));
+        assertTrue(-1 != responseText.indexOf("Do-rite plumbing"));
+        //assertTrue(-1 != responseText.indexOf("53"));
+        assertTrue(-1 != responseText.indexOf("MegaCorp"));
+        //check departments
+        assertTrue(-1 != responseText.indexOf("Default Name 2"));
+        assertTrue(-1 != responseText.indexOf("Default Name 3"));
+        assertTrue(-1 != responseText.indexOf("Default Name 4"));
+        assertTrue(-1 != responseText.indexOf("Default Name 5"));
+        assertTrue(-1 != responseText.indexOf("Default Name 6"));
+        assertTrue(-1 != responseText.indexOf("Default Name 7"));
+        assertTrue(-1 != responseText.indexOf("Default Name 8"));
+
+        System.out.println("SUCCESS!!!");
+    }
+
+    public void testAddDepartmentToFirstCompany() throws Exception{
+        final String TEST_CASE = "AddDepartmentToFirstCompany";
+        System.out.print("Running:" + TEST_CASE + "\t");
+
+        // Get the first page
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+
+        // Get the form that we are dealing with and within that form,
+        // find the submit button and the field that we want to change.
+        final HtmlForm form = (HtmlForm) page.getForms().get(0);
+        final HtmlSubmitInput allCompaniesButton = (HtmlSubmitInput)form.getHtmlElementById("doAddDepartment");
+        // Now submit the form by clicking the button
+        final HtmlPage resultPage = (HtmlPage)allCompaniesButton.click();
+
+        //verify the resultPage
+        String responseText = resultPage.asText();
+        //System.out.println("html-->\n" + responseText);
+        //check new department
+        assertTrue(-1 != responseText.indexOf("8"));
+
+        System.out.println("SUCCESS!!!");
+    }
+
+    public void testChangeCompanyDepartmentNames() throws Exception{
+        final String TEST_CASE = "ChangeCompanyDepartmentNames";
+        System.out.print("Running:" + TEST_CASE + "\t");
+
+        // Get the first page
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+
+        // Get the form that we are dealing with and within that form,
+        // find the submit button and the field that we want to change.
+        final HtmlForm form = (HtmlForm) page.getForms().get(0);
+        final HtmlSubmitInput allCompaniesButton = (HtmlSubmitInput)form.getHtmlElementById("doChangeDepartmentNames");
+        // Now submit the form by clicking the button
+        final HtmlPage resultPage = (HtmlPage)allCompaniesButton.click();
+
+        //verify the resultPage
+        String responseText = resultPage.asText();
+        //System.out.println("html-->\n" + responseText);
+        //check update departments
+        assertTrue(-1 != responseText.indexOf("Dept-"));
+        //also, check to not have old departments names (default name)
+        assertTrue(-1 == responseText.indexOf("Default Name"));
+
+        System.out.println("SUCCESS!!!");
+    }
+
+    public void testDeleteCompanyOneDepartments() throws Exception{
+        final String TEST_CASE = "DeleteCompanyOneDepartments";
+        System.out.print("Running:" + TEST_CASE + "\t");
+
+        // Get the first page
+        final HtmlPage page = (HtmlPage) _webClient.getPage(_url);
+
+        // Get the form that we are dealing with and within that form,
+        // find the submit button and the field that we want to change.
+        final HtmlForm form = (HtmlForm) page.getForms().get(0);
+        final HtmlSubmitInput allCompaniesButton = (HtmlSubmitInput)form.getHtmlElementById("doDeleteDepartments");
+        // Now submit the form by clicking the button
+        final HtmlPage resultPage = (HtmlPage)allCompaniesButton.click();
+
+        //verify the resultPage
+        String responseText = resultPage.asText();
+        //System.out.println("html-->\n" + responseText);
+        //check that al the company 1 departments are gone..
+        assertTrue(-1 == responseText.indexOf("Default Name 2"));
+        assertTrue(-1 == responseText.indexOf("Default Name 3"));
+        assertTrue(-1 == responseText.indexOf("Default Name 4"));
+        assertTrue(-1 == responseText.indexOf("Default Name 5"));
+        assertTrue(-1 == responseText.indexOf("Default Name 6"));
+        assertTrue(-1 == responseText.indexOf("Default Name 7"));
+        assertTrue(-1 == responseText.indexOf("Default Name 8"));
+
+        System.out.println("SUCCESS!!!");
+    }
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        DasTestCase t = new DasTestCase();
+        try{
+            t.testHomepage();
+            t.testAllCompanies();
+            t.testAllCompaniesDepartments();
+            t.testAddDepartmentToFirstCompany();
+            t.testChangeCompanyDepartmentNames();
+            t.testDeleteCompanyOneDepartments();
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+
+    }
+
+}
diff --git a/das-java/trunk/samples/testing/tomcat/context.xsl b/das-java/trunk/samples/testing/tomcat/context.xsl
new file mode 100644
index 0000000000..35a78a43a5
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/context.xsl
@@ -0,0 +1,51 @@
+<!--
+  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.
+ -->
+<xsl:stylesheet version="1.0" 
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output indent="yes" />
+ 
+  <xsl:param name="classname"/> 
+  <!-- xsl:template match="node() | @*">
+    <xsl:copy>
+      <xsl:apply-templates select="node() | @*"/>
+    </xsl:copy>
+  </xsl:template -->
+  <xsl:template
+  match="@* | * | comment() | processing-instruction() | text()">
+    <xsl:copy>
+      <xsl:apply-templates
+      select="@* | * | comment() | processing-instruction() | text()" />
+    </xsl:copy>
+  </xsl:template>
+  
+<!--
+  <xsl:template match="Context">
+    <Context>
+    <xsl:apply-templates select="@*" />
+    <Listener className="org.apache.tuscany.tomcat.lifecycle.listener.TomcatWebAppLifecycleListener" /> 
+   <xsl:apply-templates
+      select="@* | * | comment() | processing-instruction() | text()" />
+    </Context>
+  </xsl:template>
+-->
+  
+  <!-- xsl:template match="/">
+    <xsl:apply-templates select="node() | @*" />
+  </xsl:template -->
+</xsl:stylesheet>
diff --git a/das-java/trunk/samples/testing/tomcat/datasource.xsl b/das-java/trunk/samples/testing/tomcat/datasource.xsl
new file mode 100644
index 0000000000..ffd17f3271
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/datasource.xsl
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+
+<!--
+  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.
+ -->
+
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+
+<xsl:output method="xml" indent="yes"/>	
+
+   <xsl:param name="database_location"/>
+   <xsl:param name="database_location_ajax"/>
+	
+<!--Add derby database resource-->
+<xsl:template match="GlobalNamingResources">
+	
+  <xsl:copy>
+    <!--Copy existing-->
+    <xsl:apply-templates select="@* | node()" />
+	  
+    <xsl:comment> Global Datasource for Derby dastest database </xsl:comment>
+    <xsl:text>
+    </xsl:text>  
+	 <!--Append this-->
+         <Resource name="jdbc/dastest"
+              type="javax.sql.DataSource"  auth="Container"
+              description="Derby database for DAS Company sample"
+              maxActive="100" maxIdle="30" maxWait="10000"
+              username="" password="" 
+              driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+              url="{$database_location};create=true"/>
+         <Resource name="jdbc/ajaxdastest"
+              type="javax.sql.DataSource"  auth="Container"
+              description="Derby database for Ajax DAS Web sample"
+              maxActive="100" maxIdle="30" maxWait="10000"
+              username="" password="" 
+              driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+              url="{$database_location_ajax};create=true"/>
+   </xsl:copy>
+	
+</xsl:template>	
+
+<!--Copy everything!-->
+<xsl:template match="node() | @*">
+  <xsl:copy>
+    <xsl:apply-templates select="@* | node()" />
+  </xsl:copy>
+</xsl:template>
+
+</xsl:stylesheet>
+\ No newline at end of file
diff --git a/das-java/trunk/samples/testing/tomcat/pom.xml b/das-java/trunk/samples/testing/tomcat/pom.xml
new file mode 100644
index 0000000000..6ab37dccab
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/pom.xml
@@ -0,0 +1,112 @@
+<?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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.das.samples</groupId>
+        <artifactId>tuscany-das-samples</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>tuscany-das-samples-testing-tomcat</artifactId>
+    <packaging>pom</packaging>
+    <name>Tuscany Testing in Tomcat</name>
+
+    <modules>
+        <module>company-webapp</module>
+        <module>advanced-webapp</module>        
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+        
+        <testResources>
+            <testResource>
+                <directory>src/test/java</directory>
+                <includes>
+                    <include>**/*.componentType</include>
+                </includes>
+            </testResource>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </testResource>
+        </testResources>
+        
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.1</version>
+                    <executions>
+                        <execution>
+                            <id>prepareTomcat</id>
+                            <phase>process-test-resources</phase>
+                            <configuration>
+                                <tasks>
+                                    <ant inheritRefs='true' antfile="build.xml" dir="${basedir}/.." target="startTestServer">
+                                    	<property name="user.home" value="${user.home}" />
+                                    	<property name="target.dir" value="${basedir}/../target" />
+
+                                        <!-- property name="tuscany.maven.repos.dir" value="${maven.local.repo}"/ -->
+                                    </ant>
+                                </tasks>
+                            </configuration>
+                            <goals>
+                                <goal>run</goal>
+                            </goals>
+                        </execution>
+        
+        		<execution>
+                            <id>cleanupTomcat</id>
+                            <phase>clean</phase>
+                            <configuration>
+                                <tasks>
+                                    <ant inheritRefs='true' antfile="build.xml" dir="${basedir}/.." target="clean">
+                                    	<property name="target.dir" value="${basedir}/target" />
+						</ant>
+                                </tasks>
+                            </configuration>
+                            <goals>
+                                <goal>run</goal>
+                            </goals>
+                        </execution>
+
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <defaultGoal>test</defaultGoal>
+    </build>
+</project>
diff --git a/das-java/trunk/samples/testing/tomcat/readme.htm b/das-java/trunk/samples/testing/tomcat/readme.htm
new file mode 100644
index 0000000000..e7fd28a4ac
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/readme.htm
@@ -0,0 +1,86 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head>
+<!--
+  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.
+ -->
+<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type"> <meta content="text/css" http-equiv="Content-Style-Type"><title>Tuscany End User Sample Testing</title><!-- LINK rel="stylesheet" href="ait.css" type="text/css" -->
+<style type="text/css" media="all">
+@import url("../../../css/maven-base.css");
+@import url("../../../css/maven-theme.css");
+@import url("../../../css/site.css");
+</style><link rel="stylesheet" href="./css/print.css" type="text/css" media="print"></head>
+<body>
+<h2>Tuscany End User Sample Testing</h2>
+<h3>Initial Setup</h3>&nbsp;
+&nbsp; &nbsp;Most of the following only needs to be done once
+unless noted otherwise.<br>
+<ul>
+<li>Be sure JAVA_HOME variable is pointing to a Java JDK directory.</li>
+<li>Follow the steps to build Tuscany DAS Companyweb sample application from <a target="_blank" href="http://incubator.apache.org/tuscany/das-java-developer-guide.html">DAS Java Developer Guide</a>.</li>
+
+<li>Change directory
+to <span style="font-weight: bold;">java/das/samples/testing/tomcat</span>.</li>
+
+<li>Download
+Tomcat Core 6.0.<span style="font-style: italic;"><span style="color: rgb(255, 102, 102);">xx</span>&nbsp;</span>zip
+for Windows or &nbsp;tar.gz for Linux &nbsp;from <a href="http://tomcat.apache.org/download-60.cgi" target="_blank">Apache
+Tomcat</a>.</li>
+
+<li>You can place the tomcat distribution in your java/samples/das/testing/tomcat directory or, alternatively, you can create/edit {user home}/build.properties to
+change the property <b>tuscany.acceptance.tomcat.zipped</b> to tell the build
+environment where the tomcat distribution zip file is located. </li>
+<li>You may have to edit build.xml &nbsp;to change the property <span style="font-weight: bold;">tuscany.acceptance.tomcat.version</span>
+to match the&nbsp;<span style="font-style: italic;"><span style="color: rgb(255, 102, 102);">xx</span></span>
+to the specific version that you downloaded.</li>
+</ul>
+
+<h3>&nbsp;Running</h3>In
+the <span style="font-weight: bold;">java/das/samples/testing/tomcat </span>
+directory<b> </b>run maven:<br><code>mvn</code><br><h3>Explanation</h3>Maven&nbsp;does
+the following:<br><ul><li>Unpacks the
+Tomcat distribution into the target directory to ensure a pristine
+environment.</li><li>It adds the appropriate Tuscany and it
+dependencies jars into Tomcat <a href="../../companyweb/readme.htm#Tomcat_Setup" target="_blank"><small><span style="font-style: italic;">(for more&nbsp; details)</span></small></a></li><li>Does
+the necessary changes
+to Tomcat's configuration as required.&nbsp;<a href="../../companyweb/readme.htm#Tomcat_Setup" target="_blank"><small><span style="font-style: italic;">(for more&nbsp; details)</span></small></a></li><li>Deploys
+Tuscany's DAS sample war files into Tomcat.</li><li>Starts
+Tomcat (You should see another window running Tomcat)&nbsp;</li><li>Begins
+running HTML unit tests that should closely match running the samples
+as a user would.</li></ul>If all goes well at the end you
+should see:<br>
+<pre>[INFO] ----------------------------------------------------------------------------
+[INFO] Reactor Summary:
+[INFO] ----------------------------------------------------------------------------
+[INFO] Tuscany Testing in Tomcat .............................. SUCCESS [0.961s]
+[INFO] Tuscany Testing Tomcat DAS Sample - Companyweb ......... SUCCESS [1:09.771s]
+[INFO] Tuscany Testing Ajax DAS Web Sample .................... SUCCESS [47.458s]
+[INFO] ----------------------------------------------------------------------------
+[INFO] ----------------------------------------------------------------------------
+[INFO] BUILD SUCCESSFUL<br>
+[INFO] ----------------------------------------------------------------------------
+[INFO] Total time:  1 minute 59 seconds
+[INFO] Finished at: Sun Jun 10 01:23:19 VET 2007
+[INFO] Final Memory: 9M/17M
+[INFO] ----------------------------------------------------------------------------<br>
+</pre><h3>Cleanup</h3>Close
+the Tomcat window and issue <code>mvn clean</code>.<p><b><font size="4">Note</font></b></p>
+<p>Because the html unit tests execute multiple user actions that change the contents of the database tables, is recommended
+that you always run these tests in a clean environment (after a mvn clean),
+otherwise you may experience failure on some tests as the expected result data might have been affected by previous test runs.</p>
+
+</body></html>
+\ No newline at end of file
diff --git a/das-java/trunk/samples/testing/tomcat/server.xsl b/das-java/trunk/samples/testing/tomcat/server.xsl
new file mode 100644
index 0000000000..b53d1d50c7
--- /dev/null
+++ b/das-java/trunk/samples/testing/tomcat/server.xsl
@@ -0,0 +1,51 @@
+<!--
+  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.
+ -->
+<xsl:stylesheet version="1.0" 
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output indent="yes" />
+ 
+  <xsl:param name="classname"/> 
+  <!-- xsl:template match="node() | @*">
+    <xsl:copy>
+      <xsl:apply-templates select="node() | @*"/>
+    </xsl:copy>
+  </xsl:template -->
+  <xsl:template
+  match="@* | * | comment() | processing-instruction() | text()">
+    <xsl:copy>
+      <xsl:apply-templates
+      select="@* | * | comment() | processing-instruction() | text()" />
+    </xsl:copy>
+  </xsl:template>
+  
+  <xsl:template match="Host">
+    <Host>
+  <xsl:attribute name="className">
+    <xsl:text>org.apache.tuscany.tomcat.TuscanyHost</xsl:text>
+  </xsl:attribute> 
+    <xsl:apply-templates select="@*" />
+   <xsl:apply-templates
+      select="@* | * | comment() | processing-instruction() | text()" />
+    </Host>
+  </xsl:template>
+  
+  <!-- xsl:template match="/">
+    <xsl:apply-templates select="node() | @*" />
+  </xsl:template -->
+</xsl:stylesheet>
diff --git a/das-java/trunk/samples/transaction/build.xml b/das-java/trunk/samples/transaction/build.xml
new file mode 100644
index 0000000000..5289215be5
--- /dev/null
+++ b/das-java/trunk/samples/transaction/build.xml
@@ -0,0 +1,46 @@
+<!--
+ * 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.    
+-->
+<project name="transaction" default="run">
+    <property name="test.class" value="org.apache.tuscany.samples.das.tx.sample.MoneyTransfer" />
+	<property name="test.jar"   value="sample-transaction.jar" />
+	
+	
+    <target name="run">
+        <java classname="${test.class}"
+              fork="true">
+       	<arg value="commit"/>
+       	<arg value="1200"/>
+	    <classpath>
+	      <pathelement path="${classpath}"/>
+	      <fileset dir="../../lib">
+		<include name="**/*.jar"/>
+	      </fileset>
+		<pathelement location="mysql-connector-java-5.0.4.jar"/>
+		<pathelement location="commons-logging-1.0.4.jar"/>
+		<pathelement location="geronimo-jta_1.1_spec-1.1.jar"/>
+		<pathelement location="geronimo-transaction-2.0.1.jar"/>
+		<pathelement location="geronimo-j2ee-connector_1.5_spec-1.1.1.jar"/>
+		<pathelement location="tuscany-das-sample-dbconfig-1.0-SNAPSHOT.jar"/>
+		<pathelement path="${test.jar}"/>
+	    </classpath>        
+        </java>    	
+    </target>	
+	
+</project>
+
diff --git a/das-java/trunk/samples/transaction/pom.xml b/das-java/trunk/samples/transaction/pom.xml
new file mode 100644
index 0000000000..f6e50d779e
--- /dev/null
+++ b/das-java/trunk/samples/transaction/pom.xml
@@ -0,0 +1,148 @@
+<?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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.das.samples</groupId>
+        <artifactId>tuscany-das-samples</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>tuscany-das-sample-transaction</artifactId>
+    <packaging>jar</packaging>
+    <name>Tuscany DAS J2SE Transaction Sample Using Transaction Manager</name>
+    <description>Sample use of RDB DAS in a J2SE application with Transaction Manager</description>
+
+    <dependencies>
+       <dependency>
+           <groupId>org.apache.tuscany.das</groupId>
+           <artifactId>tuscany-das-rdb</artifactId>
+           <version>${das.version}</version>
+           <scope>compile</scope>
+       </dependency>
+
+       <dependency>
+           <groupId>org.apache.tuscany.sdo</groupId>
+           <artifactId>tuscany-sdo-impl</artifactId>
+           <version>${sdo.version}</version>
+           <scope>compile</scope>
+       </dependency>
+
+       <dependency>
+           <groupId>org.apache.tuscany.sdo</groupId>
+           <artifactId>tuscany-sdo-api-r2.1</artifactId>
+           <version>${sdo.version}</version>
+           <scope>compile</scope>
+       </dependency>
+
+      <dependency>
+        <groupId>org.apache.tuscany.das.samples</groupId>
+        <artifactId>tuscany-das-sample-dbconfig</artifactId>
+        <version>${das.version}</version>
+        <scope>compile</scope>
+        <exclusions>
+            <exclusion>
+                <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            </exclusion>
+        </exclusions>
+      </dependency>
+          
+	  <dependency>
+	     <groupId>mysql</groupId>
+	     <artifactId>mysql-connector-java</artifactId>
+	     <version>5.0.4</version>
+	     <scope>compile</scope>
+	  </dependency>
+	 
+      <dependency>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jta_1.1_spec</artifactId>
+          <version>1.1</version>
+      </dependency>
+      
+      <dependency>
+          <groupId>org.apache.geronimo.components</groupId>
+          <artifactId>geronimo-transaction</artifactId>
+          <version>2.0.1</version>
+			<exclusions>
+                <exclusion>
+                    <artifactId>mx4j</artifactId>
+                    <groupId>mx4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-jelly-tags-velocity</artifactId>
+                    <groupId>commons-jelly</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>velocity</artifactId>
+                    <groupId>velocity</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>geronimo-core</artifactId>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>geronimo-kernel</artifactId>
+                    <groupId>org.apache.geronimo.modules</groupId>                    
+                </exclusion>
+                <exclusion>
+                    <artifactId>geronimo-system</artifactId>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>geronimo-j2ee</artifactId>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                </exclusion>
+            </exclusions>          
+      </dependency>
+        
+    </dependencies>
+
+    <!-- this will place the java source files inside the jar -->
+    <build>
+        <finalName>sample-transaction</finalName>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+            </resource>
+            <resource>
+              <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+	   <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest> 
+                    <mainClass>org.apache.tuscany.samples.das.tx.sample.MoneyTransfer</mainClass> 
+                    <addClasspath>true</addClasspath> 
+                    <!-- classpathPrefix>../../lib/</classpathPrefix --> 
+                   </manifest> 
+
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/das-java/trunk/samples/transaction/readme.htm b/das-java/trunk/samples/transaction/readme.htm
new file mode 100644
index 0000000000..6cf450d41a
--- /dev/null
+++ b/das-java/trunk/samples/transaction/readme.htm
@@ -0,0 +1,449 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 10">
+<meta name=Originator content="Microsoft Word 10">
+<link rel=File-List href="readme_files/filelist.xml">
+<title>Tuscany RDB DAS Sample</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Author>IBM_User</o:Author>
+  <o:LastAuthor>IBM_User</o:LastAuthor>
+  <o:Revision>59</o:Revision>
+  <o:TotalTime>329</o:TotalTime>
+  <o:Created>2007-09-05T11:09:00Z</o:Created>
+  <o:LastSaved>2007-09-19T11:43:00Z</o:LastSaved>
+  <o:Pages>1</o:Pages>
+  <o:Words>593</o:Words>
+  <o:Characters>3384</o:Characters>
+  <o:Company>IBM</o:Company>
+  <o:Lines>28</o:Lines>
+  <o:Paragraphs>7</o:Paragraphs>
+  <o:CharactersWithSpaces>3970</o:CharactersWithSpaces>
+  <o:Version>10.3501</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:Compatibility>
+   <w:ApplyBreakingRules/>
+   <w:UseFELayout/>
+  </w:Compatibility>
+  <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ @font-face
+	{font-family:SimSun;
+	panose-1:2 1 6 0 3 1 1 1 1 1;
+	mso-font-alt:\5B8B\4F53;
+	mso-font-charset:134;
+	mso-generic-font-family:auto;
+	mso-font-pitch:variable;
+	mso-font-signature:3 135135232 16 0 262145 0;}
+@font-face
+	{font-family:"\@SimSun";
+	panose-1:2 1 6 0 3 1 1 1 1 1;
+	mso-font-charset:134;
+	mso-generic-font-family:auto;
+	mso-font-pitch:variable;
+	mso-font-signature:3 135135232 16 0 262145 0;}
+ /* Style Definitions */
+ p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:SimSun;}
+h1
+	{mso-margin-top-alt:auto;
+	margin-right:0in;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	mso-outline-level:1;
+	font-size:24.0pt;
+	font-family:"Times New Roman";
+	font-weight:bold;}
+h2
+	{mso-margin-top-alt:auto;
+	margin-right:0in;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	mso-outline-level:2;
+	font-size:18.0pt;
+	font-family:"Times New Roman";
+	font-weight:bold;}
+a:link, span.MsoHyperlink
+	{color:blue;
+	text-decoration:underline;
+	text-underline:single;}
+a:visited, span.MsoHyperlinkFollowed
+	{color:blue;
+	text-decoration:underline;
+	text-underline:single;}
+p
+	{mso-margin-top-alt:auto;
+	margin-right:0in;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:SimSun;}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+<!--[if gte mso 10]>
+<style>
+ /* Style Definitions */
+ table.MsoNormalTable
+	{mso-style-name:"Table Normal";
+	mso-tstyle-rowband-size:0;
+	mso-tstyle-colband-size:0;
+	mso-style-noshow:yes;
+	mso-style-parent:"";
+	mso-padding-alt:0in 5.4pt 0in 5.4pt;
+	mso-para-margin:0in;
+	mso-para-margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:10.0pt;
+	font-family:"Times New Roman";}
+</style>
+<![endif]-->
+<meta name=CREATED content="20070704;1002817">
+<meta name=CHANGEDBY content="a a">
+<meta name=CHANGED content="20070704;2123396">
+<!-- <pre><a name="header-text">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
+&quot;License&quot;); 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
+&quot;AS IS&quot; 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.   </a></pre>
+
+-->
+</head>
+
+<body lang=EN-US link=blue vlink=blue style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<h1 style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'>RDB DAS Transaction Sample<o:p></o:p></span></h1>
+
+<h2 style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'><o:p>&nbsp;</o:p></span></h2>
+
+<h2 style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'>Introduction<o:p></o:p></span></h2>
+
+<p style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'>This stand-alone sample demonstrates the RDB Data Access Service
+transaction management with external Transaction Manager. This example uses Geronimo
+<span style='mso-spacerun:yes'>�</span>as the transaction manager. <o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt'><b><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><o:p>&nbsp;</o:p></span></b></p>
+
+<p style='margin:0in;margin-bottom:.0001pt'><b><span lang=PT-BR
+style='font-size:18.0pt;mso-ansi-language:PT-BR'>Example</span></b><span
+lang=PT-BR style='font-size:18.0pt;mso-ansi-language:PT-BR'><o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'>In this MoneyTransfer example,user entered amount will be withdrawn from
+one of his bankaccount using one call to das.applyChanges(dataGraph1) and same
+amount will<span style='mso-spacerun:yes'>� </span>be deposited to his another
+account using another call to das.applyChanges(dataGraph2). Based on whether
+user selects commit/rollback, these 2 applyChanges() will behave identically.
+i.e. both will commit or both will rollback, but partial transaction will not
+happen. Example build.xml - sets for transfer of 1200 from Account1 to Account2
+[commit].<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt'><b><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><o:p>&nbsp;</o:p></span></b></p>
+
+<h2 style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'>Building and Running<o:p></o:p></span></h2>
+
+<p style='margin:0in;margin-bottom:.0001pt'><b><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>�</span></span></b><span
+lang=PT-BR style='mso-ansi-language:PT-BR'>From binary distribution, <b>base
+directory</b> is {DAS_ROOT}\ samples\transaction. Refer to below settings from
+this base directory.<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'>1]BankAccounts.xml available in sample-transaction.jar, is the DAS
+config file. Note that, as transaction is externally managed, this uses
+managedtx=false setting.<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'><o:p>&nbsp;</o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'>2]MySQL server should be running. The example uses MySQL DB (with innoDB
+ON to support transaction). Database <b>dastest, </b>table <b>bankaccount</b> and
+data will be created during sample run. For this preconfigured
+BankAccountDBConfig.xml available in sample-transaction.jar, will be used. User
+needs to set correct values for url, login etc. in this.<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'><o:p>&nbsp;</o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'>3] Apache Ant latest version should be installed.Download Apache Ant
+latest version on and extract into folder &lt;apache_ant_folder&gt;. You can
+find it here: <a href="http://ant.apache.org/bindownload.cgi">http://ant.apache.org/bindownload.cgi</a>.Add
+&lt;apache_ant_folder&gt;/bin directory to your OS path variable.<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'><o:p>&nbsp;</o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'>4] From <b>base directory </b>run-<span style='mso-spacerun:yes'>�
+</span>ant<o:p></o:p></span></p>
+
+<h2 style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'><o:p>&nbsp;</o:p></span></h2>
+
+<p style='margin:0in;margin-bottom:.0001pt'><span lang=PT-BR style='mso-ansi-language:
+PT-BR'>The sample will run and output the following: <o:p></o:p></span></p>
+
+<div style='border:solid windowtext 1.0pt;mso-border-alt:solid windowtext .5pt;
+padding:1.0pt 4.0pt 1.0pt 4.0pt'>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>Buildfile: build.xml<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><o:p>&nbsp;</o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>run:<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+INIT database<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+INIT transaction manager<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+Wed Sep 19 17:09:42 IST 2007 DEBUG: Executing XA statement: XA START<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>�</span>0x01000000000000004bceb90109b6b0f3000000000000000000000000000000000000000000000<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>000000000000000000000000000000000000000000000000000,0x00000000000000000000000000<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>00000000000000000000000000000000000000000000000000000000000000000000000000000000<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>0000000000000000000000,0x4765526f<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+Get a connection<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+Before transaction, table is:<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]<span
+style='mso-spacerun:yes'>���� </span>id<span style='mso-spacerun:yes'>�����
+</span>name<span style='mso-spacerun:yes'>��� </span>balance<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]<span
+style='mso-spacerun:yes'>���� </span>1<span style='mso-spacerun:yes'>������
+</span>John Feng<span style='mso-spacerun:yes'>������ </span>1200<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]<span
+style='mso-spacerun:yes'>���� </span>2<span style='mso-spacerun:yes'>������
+</span>John Feng<span style='mso-spacerun:yes'>������ </span>0<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+Begin a transaction<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+Update the table - 2 accounts<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+*commit* the transaction<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+Wed Sep 19 17:09:45 IST 2007 DEBUG: Executing XA statement: XA END 0<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>x01000000000000004bceb90109b6b0f300000000000000000000000000000000000000000000000<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>0000000000000000000000000000000000000000000000000,0x0000000000000000000000000000<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>00000000000000000000000000000000000000000000000000000000000000000000000000000000<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>00000000000000000000,0x4765526f<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+Wed Sep 19 17:09:45 IST 2007 DEBUG: Executing XA statement: XA PREPA<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>RE 0x01000000000000004bceb90109b6b0f30000000000000000000000000000000000000000000<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>00000000000000000000000000000000000000000000000000000,0x000000000000000000000000<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>00000000000000000000000000000000000000000000000000000000000000000000000000000000<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>000000000000000000000000,0x4765526f<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+Wed Sep 19 17:09:45 IST 2007 DEBUG: Executing XA statement: XA COMMI<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>T 0x01000000000000004bceb90109b6b0f300000000000000000000000000000000000000000000<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>0000000000000000000000000000000000000000000000000000,0x0000000000000000000000000<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>00000000000000000000000000000000000000000000000000000000000000000000000000000000<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>00000000000000000000000,0x4765526f<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+After transaction, table is:<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]<span
+style='mso-spacerun:yes'>���� </span>id<span style='mso-spacerun:yes'>�����
+</span>name<span style='mso-spacerun:yes'>��� </span>balance<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]<span
+style='mso-spacerun:yes'>���� </span>1<span style='mso-spacerun:yes'>������
+</span>John Feng<span style='mso-spacerun:yes'>������ </span>0<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]<span
+style='mso-spacerun:yes'>���� </span>2<span style='mso-spacerun:yes'>������
+</span>John Feng<span style='mso-spacerun:yes'>������ </span>1200<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+Cleanup<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]
+End MoneyTransfer<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><span style='mso-spacerun:yes'>���� </span>[java]<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'><o:p>&nbsp;</o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>BUILD SUCCESSFUL<o:p></o:p></span></p>
+
+<p style='margin:0in;margin-bottom:.0001pt;border:none;mso-border-alt:solid windowtext .5pt;
+padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>Total time: 8 seconds<o:p></o:p></span></p>
+
+</div>
+
+<p style='margin:0in;margin-bottom:.0001pt'><b><span lang=PT-BR
+style='mso-ansi-language:PT-BR'>Observation:</span></b><span lang=PT-BR
+style='mso-ansi-language:PT-BR'> The build.xml ant file only works on DAS Java binary
+distribution.<o:p></o:p></span></p>
+
+</div>
+
+</body>
+
+</html>
diff --git a/das-java/trunk/samples/transaction/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetupUtil.java b/das-java/trunk/samples/transaction/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetupUtil.java
new file mode 100644
index 0000000000..fbcbe1a5f7
--- /dev/null
+++ b/das-java/trunk/samples/transaction/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetupUtil.java
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.samples.das.databaseSetup;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+
+import org.apache.tuscany.das.rdb.dbconfig.DBConfig;
+import org.apache.tuscany.das.rdb.dbconfig.DBConfigUtil;
+import org.apache.tuscany.das.rdb.dbconfig.DBInitializer;
+import org.apache.tuscany.samples.das.tx.manager.GeronimoTransactionManagerUtil;
+
+/**
+ * Setup database, XA resources required by the sample
+ * 
+ *
+ */
+public class DatabaseSetupUtil {
+    private static DBConfig dbConfig = null;
+    /**
+     * Constructor for DatabaseSetupUtil.
+     */
+    public DatabaseSetupUtil(String dbConfigFile) throws Exception {
+    	//create database tables, data
+    	DBInitializer dbInitializer = new DBInitializer(dbConfigFile);
+    	dbInitializer.refreshDatabaseData();
+    	//read DAS Config
+    	dbConfig = DBConfigUtil.loadDBConfig(ClassLoader.getSystemResourceAsStream(dbConfigFile));
+    }
+    
+    public static DBConfig getDBConfig() {
+    	return DatabaseSetupUtil.dbConfig;
+    }
+    
+    public static void main(String[] args) throws Exception{
+    	//test program
+    	new DatabaseSetupUtil("BankAccountDBConfig.xml");
+    	GeronimoTransactionManagerUtil tmUtil = new GeronimoTransactionManagerUtil();
+    	tmUtil.initTransactionManager();
+    	tmUtil.startTransaction();
+    	Connection conn = tmUtil.getConnection();
+    	
+        ResultSet rs = conn.createStatement().executeQuery("select id, balance from bankaccount");
+        while(rs.next()){
+        	System.out.println("result row: "+rs.getInt(1)+","+rs.getString(2));
+        }
+        
+        tmUtil.commitTransaction();
+
+    }    
+}
diff --git a/das-java/trunk/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/manager/GeronimoTransactionManagerService.java b/das-java/trunk/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/manager/GeronimoTransactionManagerService.java
new file mode 100644
index 0000000000..ee106bec0c
--- /dev/null
+++ b/das-java/trunk/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/manager/GeronimoTransactionManagerService.java
@@ -0,0 +1,118 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.samples.das.tx.manager;
+
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.InvalidTransactionException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+
+import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
+
+/**
+ * A <code>TransactionManager</code> that delegates to a Geronimo JTA transaction manager. This class serves as a
+ * wrapper for initializing the Geronimo TM as a system service.
+ *
+ * @version $Rev$ $Date$
+ */
+public class GeronimoTransactionManagerService implements TransactionManager {
+    private TransactionManager transactionManager;
+    private int timeout = 250;
+
+    public GeronimoTransactionManagerService() {
+    }
+
+    /**
+     * Returns the transaction timeout in seconds
+     *
+     * @return the transaction timeout in seconds
+     */
+    public int getTimeout() {
+        return timeout;
+    }
+
+    /**
+     * Sets the transaction timeout in seconds
+     */
+    public void setTimeout(int timeout) {
+        this.timeout = timeout;
+    }
+
+    public void init() throws Exception {
+        XidFactoryImpl factory = new XidFactoryImpl();
+        transactionManager = new TransactionManagerImpl(timeout, factory, null);        
+    }
+
+    public void begin() throws NotSupportedException, SystemException {
+        transactionManager.begin();
+    }
+
+    public void commit() throws HeuristicMixedException,
+                                HeuristicRollbackException,
+                                IllegalStateException,
+                                RollbackException,
+                                SecurityException,
+                                SystemException {
+        transactionManager.commit();
+    }
+
+    public TransactionManager getTransactionManager() {
+        return transactionManager;
+    }
+
+    public int getStatus() throws SystemException {
+        return transactionManager.getStatus();
+    }
+
+    public Transaction getTransaction() throws SystemException {
+        return transactionManager.getTransaction();
+    }
+
+    public void resume(Transaction transaction)
+        throws IllegalStateException, InvalidTransactionException, SystemException {
+        transactionManager.resume(transaction);
+    }
+
+    public void rollback() throws IllegalStateException, SecurityException, SystemException {
+        transactionManager.rollback();
+    }
+
+    public void setRollbackOnly() throws IllegalStateException, SystemException {
+        transactionManager.setRollbackOnly();
+    }
+
+    public void setTransactionTimeout(int i) throws SystemException {
+        transactionManager.setTransactionTimeout(i);
+    }
+
+    public Transaction suspend() throws SystemException {
+        return transactionManager.suspend();
+    }
+
+    public void begin(long timeout) throws NotSupportedException, SystemException {
+        transactionManager.begin();
+        return;
+    }
+
+}
diff --git a/das-java/trunk/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/manager/GeronimoTransactionManagerUtil.java b/das-java/trunk/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/manager/GeronimoTransactionManagerUtil.java
new file mode 100644
index 0000000000..084e735117
--- /dev/null
+++ b/das-java/trunk/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/manager/GeronimoTransactionManagerUtil.java
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.samples.das.tx.manager;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import javax.sql.XAConnection;
+import javax.sql.XADataSource;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+
+import org.apache.geronimo.transaction.manager.XidFactory;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
+import org.apache.tuscany.das.rdb.dbconfig.DBConfig;
+import org.apache.tuscany.samples.das.databaseSetup.DatabaseSetupUtil;
+
+import com.mysql.jdbc.jdbc2.optional.MysqlXADataSource;
+
+public class GeronimoTransactionManagerUtil {
+	private GeronimoTransactionManagerService service;
+    private static XADataSource xads;
+    private static XAConnection xaconn = null;
+    private static XAResource xares = null;
+    private static XidFactory xidFact = null;
+    private static Xid xid = null;
+	
+    public void initTransactionManager() {
+        // Get a transction manager
+        try {
+        	xidFact = new XidFactoryImpl();
+        	// creates an instance of Geronimo TM Service        	
+        	service = new GeronimoTransactionManagerService();
+            service.init();
+            service.begin();
+            initDataSource();
+            initXAConnection();
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+	
+    private void initDataSource() {
+        //setup XADataSource
+    	xads = new MysqlXADataSource();       
+        try {
+        	DBConfig dbcfg = DatabaseSetupUtil.getDBConfig();
+        	((MysqlXADataSource) xads).setUser(dbcfg.getConnectionInfo().getConnectionProperties().getUserName());
+        	((MysqlXADataSource) xads).setPassword(dbcfg.getConnectionInfo().getConnectionProperties().getPassword());
+            ((MysqlXADataSource) xads).setUrl(dbcfg.getConnectionInfo().getConnectionProperties().getDatabaseURL());
+            ((MysqlXADataSource) xads).setURL(dbcfg.getConnectionInfo().getConnectionProperties().getDatabaseURL());
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private void initXAConnection() throws SQLException{
+    	DBConfig dbcfg = DatabaseSetupUtil.getDBConfig();
+    	xaconn = xads.getXAConnection(dbcfg.getConnectionInfo().getConnectionProperties().getUserName(), 
+    			dbcfg.getConnectionInfo().getConnectionProperties().getPassword());
+    }
+
+    public void startTransaction() throws Exception {
+    	try{
+            //create XAResource
+            xid= xidFact.createXid();
+            xares = xaconn.getXAResource();
+            xares.setTransactionTimeout(250); //something
+            xares.start(xid, XAResource.TMNOFLAGS);            
+            return;    		
+    	}catch(Exception e) {
+    		e.printStackTrace();
+    		throw e;
+    	}
+    }
+    
+    public void commitTransaction() throws Exception {
+    	xares.end(xid, XAResource.TMSUCCESS);
+    	xares.prepare(xid);
+    	xares.commit(xid, false); //onePhase=true/false
+    }
+    
+    public void rollbackTransaction() throws Exception {
+    	xares.end(xid, XAResource.TMFAIL);
+    	xares.prepare(xid);
+    	xares.rollback(xid);    	
+    }
+    
+    public Connection getConnection() throws SQLException {
+        return xaconn.getConnection();
+    }
+
+    /**
+     * cleanup
+     */
+    public void cleanup() throws Exception{
+    	xaconn.close();
+    	xid = null;
+    	xares = null;
+    	xaconn = null;
+    	xads = null;
+    	service.commit();
+    }
+}
diff --git a/das-java/trunk/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/sample/MoneyTransfer.java b/das-java/trunk/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/sample/MoneyTransfer.java
new file mode 100644
index 0000000000..650f60f089
--- /dev/null
+++ b/das-java/trunk/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/sample/MoneyTransfer.java
@@ -0,0 +1,193 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.samples.das.tx.sample;
+
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.samples.das.databaseSetup.DatabaseSetupUtil;
+import org.apache.tuscany.samples.das.tx.manager.GeronimoTransactionManagerUtil;
+
+import commonj.sdo.DataObject;
+
+/**
+ * Sample using Geronimo TM to execute multiple DAS applyChanges() under one transaction.
+ * 
+ */
+public class MoneyTransfer {
+
+    private static final String USAGE = "usage: java MoneyTransfer [commit|rollback] [transferAmount]";
+    private static final String SQL_REQUEST = "select id, name, balance from bankaccount";
+    private static Connection conn = null;
+	private static DAS das = null;
+
+    private static void printTable() {
+        try {
+            Statement stmt = conn.createStatement();
+            ResultSet rset = stmt.executeQuery(SQL_REQUEST);
+            int numcols = rset.getMetaData().getColumnCount();
+            for (int i = 1; i <= numcols; i++) {
+                System.out.print("\t" + rset.getMetaData().getColumnName(i));
+            }
+            System.out.println();
+            while (rset.next()) {
+                for (int i = 1; i <= numcols; i++) {
+                    System.out.print("\t" + rset.getString(i));
+                }
+                System.out.println("");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void main(String[] args) {
+    	GeronimoTransactionManagerUtil tmUtil = null;
+    	
+        if (args.length != 2 || (!args[0].equals("commit") && !args[0].equals("rollback"))) {
+            System.out.println(USAGE + "\n");
+            System.exit(1);
+        }
+
+        String completion = args[0];
+        float transferAmount = 0;
+        try {
+        	transferAmount = Float.parseFloat(args[1]);
+        } catch (NumberFormatException e) {
+            System.out.println(USAGE);
+            System.out.println("[transferAmount] has to be a float\n");
+            System.exit(1);
+        }
+
+        System.out.println("INIT database");        
+        try{
+        	new DatabaseSetupUtil("BankAccountDBConfig.xml");
+        }catch(Exception e){
+        	e.printStackTrace();
+        	System.exit(1);
+        }
+        
+        try {
+            System.out.println("INIT transaction manager");
+            tmUtil = new GeronimoTransactionManagerUtil();
+        	tmUtil.initTransactionManager();
+        	tmUtil.startTransaction();
+        } catch (Exception e) {
+            System.out.println("Exception of type :" + e.getClass().getName() + " has been thrown");
+            System.out.println("Exception message :" + e.getMessage());
+            e.printStackTrace();
+            System.exit(1);
+        }
+
+        try {
+            System.out.println("Get a connection");
+            conn = tmUtil.getConnection();
+            conn.setAutoCommit(false);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        System.out.println("Before transaction, table is:");
+        printTable();
+
+        try {
+            System.out.println("Begin a transaction");            
+            init(); //initialize DAS instance            
+            System.out.println("Update the table - 2 accounts");
+            withdrawFromBankAccount1(transferAmount);
+            depositToBankAccount2(transferAmount);
+            
+            if (completion.equals("commit")) {
+                System.out.println("*commit* the transaction");
+                tmUtil.commitTransaction();
+            } else {
+                System.out.println("*rollback* the transaction");
+                tmUtil.rollbackTransaction();
+            }
+        } catch (Exception e) {
+            System.out.println("Exception of type :" + e.getClass().getName() + " has been thrown");
+            System.out.println("Exception message :" + e.getMessage());
+            e.printStackTrace();
+            System.exit(1);
+        }
+
+        System.out.println("After transaction, table is:");
+        printTable();
+
+        System.out.println("Cleanup");
+        try {
+        	tmUtil.cleanup();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        System.out.println("End MoneyTransfer\n");
+        System.exit(0);
+    }
+
+    private static void init(){
+			try{
+				das = DAS.FACTORY.createDAS(getConfig("BankAccounts.xml"), conn);
+			}catch(Exception e){
+				e.printStackTrace();
+			}
+	}
+
+	/**
+	 * Withdraw asked amount from account1
+	 * @return
+	 */
+    public static final void withdrawFromBankAccount1(float transferAmount) {
+        Command read = das.getCommand("BankAccount1Data");
+        DataObject root = read.executeQuery();
+        DataObject account1 = (DataObject)root.getList("BANKACCOUNT").get(0);
+        float currentBalance = account1.getFloat("BALANCE");
+        float newBalance = currentBalance - transferAmount;
+        account1.setFloat("BALANCE", newBalance);
+        das.applyChanges(root);
+    }
+
+	/**
+	 * Deposit asked amount into account2
+	 * @return
+	 */
+    public static final void depositToBankAccount2(float transferAmount) {
+        Command read = das.getCommand("BankAccount2Data");
+        DataObject root = read.executeQuery();
+        DataObject account2 = (DataObject)root.getList("BANKACCOUNT").get(0);
+        float currentBalance = account2.getFloat("BALANCE");
+        float newBalance = currentBalance + transferAmount;
+        account2.setFloat("BALANCE", newBalance);
+        das.applyChanges(root);
+    }
+    
+	/**Utilities
+     *
+     * @param fileName
+     * @return
+     */
+    private static InputStream getConfig(String fileName) {
+    	MoneyTransfer jdbcExample = new MoneyTransfer(); 
+        return jdbcExample.getClass().getClassLoader().getResourceAsStream(fileName);
+    }
+}
diff --git a/das-java/trunk/samples/transaction/src/main/resources/BankAccountDBConfig.xml b/das-java/trunk/samples/transaction/src/main/resources/BankAccountDBConfig.xml
new file mode 100644
index 0000000000..1ade9f2341
--- /dev/null
+++ b/das-java/trunk/samples/transaction/src/main/resources/BankAccountDBConfig.xml
@@ -0,0 +1,34 @@
+<?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.
+ -->
+<DBConfig xmlns="http:///org.apache.tuscany.das.rdb/dbconfig.xsd">
+    <ConnectionInfo>
+		<ConnectionProperties 
+			driverClass="com.mysql.jdbc.Driver" 
+			databaseURL="jdbc:mysql://localhost/dastest?createDatabaseIfNotExist=true" 
+			userName="root"
+			password="mypwd"/>
+	</ConnectionInfo>
+					        
+	<Table name="BANKACCOUNT" SQLCreate="CREATE TABLE BANKACCOUNT (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(30), BALANCE float )type=InnoDB">
+		<row>1, 'John Feng', 1200</row>
+		<row>2, 'John Feng', 0</row>
+	</Table>
+	
+</DBConfig>
diff --git a/das-java/trunk/samples/transaction/src/main/resources/BankAccounts.xml b/das-java/trunk/samples/transaction/src/main/resources/BankAccounts.xml
new file mode 100644
index 0000000000..09c1a5bb04
--- /dev/null
+++ b/das-java/trunk/samples/transaction/src/main/resources/BankAccounts.xml
@@ -0,0 +1,30 @@
+<?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="BankAccount1Data" SQL="select ID, NAME, BALANCE from BANKACCOUNT where ID=1" kind="Select"/>
+    <Command name="BankAccount2Data" SQL="select ID, NAME, BALANCE from BANKACCOUNT where ID=2" kind="Select"/>
+    
+    <Table tableName="BANKACCOUNT">
+        <Column columnName="ID" primaryKey="true"/>
+    </Table>
+    	
+</Config>
diff --git a/das-java/trunk/tools/pom.xml b/das-java/trunk/tools/pom.xml
new file mode 100644
index 0000000000..384ed64c62
--- /dev/null
+++ b/das-java/trunk/tools/pom.xml
@@ -0,0 +1,147 @@
+<?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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.das</groupId>
+        <artifactId>tuscany-das</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>tuscany-das-tools</artifactId>
+    <name>Tuscany DAS Tools for Relational Databases</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.das</groupId>
+            <artifactId>tuscany-das-rdb</artifactId>
+            <version>${das.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    
+        <dependency>
+            <groupId>org.apache.tuscany.das.samples</groupId>
+            <artifactId>tuscany-das-sample-dbconfig</artifactId>
+            <version>${das.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.derby</groupId>
+	            <artifactId>derby</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-api-r2.1</artifactId>
+            <version>${sdo.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>${sdo.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-lib</artifactId>
+            <version>${sdo.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.2.2.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+	    <groupId>torque</groupId>
+	    <artifactId>torque-gen</artifactId>
+	    <version>3.3-RC2</version>
+	</dependency>
+    </dependencies>
+
+    <!-- this will place the java source files inside the jar -->
+    <build>
+        <finalName>tuscany-das-tools</finalName>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+            </resource>
+            <resource>
+              <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+	   <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest> 
+                           <addClasspath>true</addClasspath> 
+                           <!-- classpathPrefix>../../lib/</classpathPrefix --> 
+                        </manifest> 
+
+                    </archive>
+                </configuration>
+            </plugin>
+		    <plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-surefire-plugin</artifactId>
+			<configuration>
+			    <includes>
+				<include>**/*Tests.java</include>
+			    </includes>
+			</configuration>
+		    </plugin>            
+        </plugins>
+    </build>
+</project>
+
+
+
+
+
+
diff --git a/das-java/trunk/tools/readme.htm b/das-java/trunk/tools/readme.htm
new file mode 100644
index 0000000000..9465dc323e
--- /dev/null
+++ b/das-java/trunk/tools/readme.htm
@@ -0,0 +1,78 @@
+                                                               <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <!--
+    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.    
+  -->
+
+<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type">
+<meta content="text/css" http-equiv="Content-Style-Type"><title>Tuscany DAS Tools</title>
+
+<style type="text/css" media="all">
+@import url("../../css/maven-base.css");
+@import url("../../css/maven-theme.css");
+@import url("../../css/site.css");
+</style>
+<link rel="stylesheet" href="./css/print.css" type="text/css" media="print"></head>
+
+<body>
+<h2>Tuscany DAS Tools</h2>
+<h3>Building DAS Tools</h3>
+
+DBToXSDGenerator provides utility methods for use when DB Schema is available and SDO Model xsds are not. This <br>
+utility will help build SDO Model xsds based on DB Schema. These xsds can be supplied to Data Access Service <br>
+like (RDB-DAS) to have SDO <-> DB data exchange. <br>
+
+ <br>
+ <ul>
+  <li>getModelFileFromDB(String dbInfoFile) - connect to database and convert DB Schema to XSD Model XSDs </li>
+  <li>getModelFileFromSchemaFile(String schemaFileName, String SDOModelFileName) - no DB Connection needed, but need Apache Torque output of DB schema file </li>
+  <li>getSchemaFileFromDB(String dbInfoFile) - connect to database and use Apache Torque to get DB Schema xml file </li>
+  <li>getModelFileFromDB(ModelXSDGenOption mo) - connect to database and convert DB Schema to XSD Model XSDs </li>
+  <li>getModelFileFromSchemaFile(ModelXSDGenOption mo) - no DB Connection needed, but need Apache Torque output of DB schema file </li>
+  <li>ModelXSDGenOption holds - schemaFile, modelFile, driverClass, databaseURL, schemaName, userName, password</li>
+</ul>
+  
+To build the Tuscany DAS DBToXSDGenerator tool, perform the following steps <br>
+<ul>
+<li> Ensure that the environment variable JAVA_HOME is set to point to an installation of Java 1.4 JDK      </li>
+<li> --->To run as a maven plugin, run the command "mvn" </li>
+<li> --->To run as a standalone tool, call the above listed methods from DBToXSDGenerator </li>
+</ul>
+
+<b>Assumption</b> Database exists and contains required tables, constraints. Required Driver jar is in classpath<br>
+
+<ul  style="border-right-style: solid; border-left-style: solid; border-top-style: solid; border-bottom-style: solid">
+ <b>Example dbInfoFile</b><br>
+ &lt;Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"&gt; <br>
+<br>
+    &lt;!--Uncomment below for derby test--&gt;<br>
+	&lt;ConnectionInfo&gt;<br>
+		&nbsp;&nbsp;&lt;ConnectionProperties<br>
+			&nbsp;&nbsp;&nbsp;&nbsp;driverClass="org.apache.derby.jdbc.EmbeddedDriver"<br>
+			&nbsp;&nbsp;&nbsp;&nbsp;databaseURL="jdbc:derby:target/dastest"<br>
+			&nbsp;&nbsp;&nbsp;&nbsp;schemaName = "APP"<br>
+			&nbsp;&nbsp;&nbsp;&nbsp;loginTimeout="600000"/&gt;<br>
+	&lt;/ConnectionInfo&gt;<br><br>
+	&lt;OutFiles<br>
+		&nbsp;&nbsp;schemaFile="target/dbSchema.txt"<br>
+		&nbsp;&nbsp;modelFile="target/schemaModel.xsd"<br>
+	/&gt;<br>
+&lt;/Config&gt;
+</ul>
+</body></html>
diff --git a/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/Column.java b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/Column.java
new file mode 100644
index 0000000000..cbadde0717
--- /dev/null
+++ b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/Column.java
@@ -0,0 +1,57 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.util;
+
+public class Column {
+	private String name;
+	private String type;
+	private boolean isPK;
+	private boolean isRequired;
+	
+	protected String getName() {
+		return name;
+	}
+	protected void setName(String name) {
+		this.name = name;
+	}
+	protected String getType() {
+		return type;
+	}
+	protected void setType(String type) {
+		this.type = type;
+	}
+	protected boolean isPK() {
+		return isPK;
+	}
+	protected void setPK(boolean isPK) {
+		this.isPK = isPK;
+	}
+	protected boolean isRequired() {
+		return isRequired;
+	}
+	protected void setRequired(boolean isRequired) {
+		this.isRequired = isRequired;
+	}
+	
+	public String toString() {
+		StringBuffer dbSchemaStr = new StringBuffer();
+		dbSchemaStr.append("Name:"+this.getName()+", Type:"+this.getType()+", isPK:"+this.isPK()+", isRequired:"+this.isRequired()+"\n");
+		return dbSchemaStr.toString();
+	}	
+}
diff --git a/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBSchema.java b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBSchema.java
new file mode 100644
index 0000000000..4ae038b24d
--- /dev/null
+++ b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBSchema.java
@@ -0,0 +1,45 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DBSchema {
+	private List tables = new ArrayList();
+
+	protected List getTables() {
+		return tables;
+	}
+
+	protected void setTables(List tables) {
+		this.tables = tables;
+	}
+	
+	public String toString() {
+		StringBuffer dbSchemaStr = new StringBuffer();
+		dbSchemaStr.append("_____DB SChema_______\n");
+		for(int i=0; i<this.tables.size(); i++) {			
+			Table curTable = (Table)this.tables.get(i);
+			dbSchemaStr.append(curTable);
+		}
+		
+		return dbSchemaStr.toString();
+	}
+}
diff --git a/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToSchemaFile.java b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToSchemaFile.java
new file mode 100644
index 0000000000..1dfa7919fd
--- /dev/null
+++ b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToSchemaFile.java
@@ -0,0 +1,119 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.util;
+
+import java.io.File;
+import java.io.InputStreamReader;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.log4j.Logger;
+import org.apache.tools.ant.Project;
+import org.apache.torque.task.TorqueJDBCTransformTask;
+
+public class DBToSchemaFile {
+	private static final Logger logger = Logger.getLogger(DBToSchemaFile.class);
+	private static ModelXSDGenOption mo = null;//schemaFileName should not be null. id modelFileName null STDOUT
+	
+	protected static void schemaFileFromDB() throws Exception {
+		Project p = new Project();
+	    p.setBaseDir(new File("."));
+		TorqueJDBCTransformTask tsk = new TorqueJDBCTransformTask();
+		tsk.setProject(p);
+		tsk.setDbDriver(mo.getDriverClass());
+		tsk.setDbUrl(mo.getDatabaseURL());
+		tsk.setSameJavaName(true);
+		tsk.setDbSchema(mo.getSchemaName());
+		tsk.setTaskName("jdbc");
+		tsk.setDbUser(mo.getUserName());
+		tsk.setDbPassword(mo.getPassword());
+		if(!mo.getSchemaFile().trim().equals("")) {
+			File schemaFile = new File( mo.getSchemaFile());
+			schemaFile.createNewFile();
+		}
+		tsk.setOutputFile(mo.getSchemaFile());
+		tsk.execute();
+	}
+	
+	protected static void read(String dbInfoFileName) throws Exception {
+		XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
+		
+		XMLStreamReader reader = xmlFactory.createXMLStreamReader(new InputStreamReader(DBToXSDGenerator.getStream(dbInfoFileName)));
+		mo = new ModelXSDGenOption();
+        while (true) {
+            int event = reader.next();
+            if(javax.xml.stream.XMLStreamConstants.END_DOCUMENT == event) {
+            	break;
+            }
+            
+            switch (event) {            
+	            case javax.xml.stream.XMLStreamConstants.START_ELEMENT: {
+	               if (reader.getName().getLocalPart().equals("ConnectionProperties")) {
+	            	   mo.setDriverClass(reader.getAttributeValue(null, "driverClass"));
+	                   mo.setDatabaseURL(reader.getAttributeValue(null, "databaseURL"));
+	                   mo.setSchemaName(reader.getAttributeValue(null, "schemaName"));
+	                   mo.setUserName(reader.getAttributeValue(null, "userName"));
+	                	if(mo.getUserName() == null)
+	                		mo.setUserName("");
+	                	mo.setPassword(reader.getAttributeValue(null, "password"));
+	                	if(mo.getPassword() == null)
+	                		mo.setPassword("");
+	                } else if (reader.getName().getLocalPart().equals("ConnectionInfo")) {	                
+	                	//ignore
+	                } else if (reader.getName().getLocalPart().equals("Config")) {
+	                	//ignore
+	                } else if (reader.getName().getLocalPart().equals("OutFiles")) {	                
+	                	mo.setSchemaFile(reader.getAttributeValue(null, "schemaFile"));
+	                	mo.setModelFile(reader.getAttributeValue(null, "modelFile"));
+	                } else {
+	                	throw new RuntimeException("not got dbInfo  - tableNames List or connectionInfo:"+reader.getName()+":");
+	                }
+	                break;
+	            }
+            }            
+        }
+        
+        if (logger.isDebugEnabled()) {
+			logger.debug("driverClass:"+mo.getDriverClass());
+			logger.debug("url:"+mo.getDatabaseURL());
+			logger.debug("schemaName:"+mo.getSchemaName());
+			logger.debug("schemaFileName:"+mo.getSchemaFile());
+			logger.debug("modelFileName:"+mo.getModelFile());
+			logger.debug("userName:"+mo.getUserName());
+			logger.debug("password:"+mo.getPassword());
+		}            
+
+        if(mo.getDriverClass() == null || mo.getDatabaseURL() == null || mo.getSchemaName() == null || mo.getSchemaFile() == null 
+        		|| mo.getModelFile() == null) {
+     	   throw new RuntimeException("Required inputs missing - check driverClass, url, schemaName, schemaFile, modelFile!");
+        }
+
+        return;
+    }
+
+	public static ModelXSDGenOption getMo() {
+		return mo;
+	}
+
+	public static void setMo(ModelXSDGenOption mo) {
+		DBToSchemaFile.mo = mo;
+	}
+	
+}
diff --git a/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToXSDGenerator.java b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToXSDGenerator.java
new file mode 100644
index 0000000000..a5e510dedf
--- /dev/null
+++ b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToXSDGenerator.java
@@ -0,0 +1,88 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.util;
+
+import java.io.InputStream;
+
+public class DBToXSDGenerator {
+	/**
+	 * Output is dbSchemaFile as specified in dbInfoFileName.schemaFile
+	 * @param dbInfoFileName  name of file which contains db connection info and output files names for dbschema and model 
+	 * @throws Exception
+	 */	
+	public static void getSchemaFileFromDB(String dbInfoFileName) throws Exception {
+		DBToSchemaFile.read(dbInfoFileName);
+		DBToSchemaFile.schemaFileFromDB();
+	}
+	
+	/**
+	 * If user supplies schemaFileName and modelFileName will use it instead of the one from DBToSchemaFile.
+	 * schemaFile should exist. If modelFileName is null, will use STDOUT.
+	 * @param schemaFileName the result of Torque output
+	 * @throws Exception
+	 */
+	public static void getModelFileFromSchemaFile(String schemaFileName, String modelFileName) throws Exception {
+		if(schemaFileName == null || schemaFileName.trim().equals("")) {
+			throw new RuntimeException("Null or empty schemaFileName");
+		}
+		
+		SchemaFileToXSD.convert(schemaFileName, modelFileName);
+	}
+	
+	/**
+	 * If user supplies schemaFileName and modelFileName through ModelXSDGenOption, will use it instead of 
+	 * the one from DBToSchemaFile. schemaFile should exist. If modelFileName is null, will use STDOUT.
+	 * @param ModelXSDGenOption 
+	 * @throws Exception
+	 */
+	public static void getModelFileFromSchemaFile(ModelXSDGenOption mo) throws Exception {
+		getModelFileFromSchemaFile(mo.getSchemaFile(), mo.getModelFile());
+	}
+	
+	/**
+	 * All in one
+	 * @param dbInfoFileName e.g. DBConnectionConfig.xml
+	 * @throws Exception
+	 */
+	public static void getModelFileFromDB(String dbInfoFileName) throws Exception {
+		DBToSchemaFile.read(dbInfoFileName);
+		DBToSchemaFile.schemaFileFromDB();
+		getModelFileFromSchemaFile(DBToSchemaFile.getMo());
+	}
+	
+	/**
+	 * Useful for plugin
+	 */
+	public static void getModelFileFromDB(ModelXSDGenOption mo) throws Exception {
+		if(mo.getSchemaFile() == null || mo.getSchemaFile().trim().equals("") || 
+			mo.getDriverClass() == null || mo.getDriverClass().trim().equals("") || 
+			mo.getDatabaseURL() == null || mo.getDatabaseURL().trim().equals("") ||
+			mo.getSchemaName() == null || mo.getSchemaName().trim().equals("")) {
+			throw new RuntimeException("Required inputs missing - check driverClass, url, schemaName, schemaFile!");
+		}
+		
+		DBToSchemaFile.setMo(mo);	
+		DBToSchemaFile.schemaFileFromDB();
+		getModelFileFromSchemaFile(DBToSchemaFile.getMo().getSchemaFile(), DBToSchemaFile.getMo().getModelFile());
+	}
+	
+    protected static InputStream getStream(String fileName) {
+        return Thread.currentThread().getContextClassLoader().getResourceAsStream(fileName);
+    }    
+}
diff --git a/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/ForeignKey.java b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/ForeignKey.java
new file mode 100644
index 0000000000..d602a30194
--- /dev/null
+++ b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/ForeignKey.java
@@ -0,0 +1,51 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ForeignKey {
+	private String foreignTableName;
+	private List fkRefs = new ArrayList();
+	
+	protected String getForeignTableName() {
+		return foreignTableName;
+	}
+	protected void setForeignTableName(String foreignTableName) {
+		this.foreignTableName = foreignTableName;
+	}
+	protected List getFkRefs() {
+		return fkRefs;
+	}
+	protected void setFkRefs(List fkRefs) {
+		this.fkRefs = fkRefs;
+	}
+	
+	public String toString() {
+		StringBuffer dbSchemaStr = new StringBuffer();
+		dbSchemaStr.append("_____Foreign Key_______"+this.foreignTableName+"\n");
+		for(int i=0; i<fkRefs.size(); i++) {
+			ForeignKeyRef curFkRef = (ForeignKeyRef)fkRefs.get(i); 
+			dbSchemaStr.append(curFkRef);
+		}
+
+		return dbSchemaStr.toString();
+	}	
+}
diff --git a/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/ForeignKeyRef.java b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/ForeignKeyRef.java
new file mode 100644
index 0000000000..4be4f7435a
--- /dev/null
+++ b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/ForeignKeyRef.java
@@ -0,0 +1,44 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.util;
+
+public class ForeignKeyRef {
+	private String foreign;
+	private String local;
+	
+	protected String getForeign() {
+		return foreign;
+	}
+	protected void setForeign(String foreign) {
+		this.foreign = foreign;
+	}
+	protected String getLocal() {
+		return local;
+	}
+	protected void setLocal(String local) {
+		this.local = local;
+	}
+	
+	public String toString() {
+		StringBuffer dbSchemaStr = new StringBuffer();
+		dbSchemaStr.append("Foreign:"+this.foreign+", Local:"+this.local+"\n");
+
+		return dbSchemaStr.toString();
+	}	
+}
diff --git a/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/ModelXSDGenOption.java b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/ModelXSDGenOption.java
new file mode 100644
index 0000000000..e9ac04cb5e
--- /dev/null
+++ b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/ModelXSDGenOption.java
@@ -0,0 +1,133 @@
+/**
+ *
+ *  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.
+ */
+package org.apache.tuscany.das.rdb.util;
+
+
+public class ModelXSDGenOption {
+
+    /**
+     * Name of the schema file
+     *
+     * @parameter
+     */
+    private String schemaFile;
+
+    /**
+     * Name of the model file
+     *
+     * @parameter
+     */
+    private String modelFile;
+
+    /**
+     * Name of the DBDriver class Name
+     *
+     * @parameter
+     */
+    private String driverClass;
+
+    /**
+     * Name of the DB URL
+     *
+     * @parameter
+     */
+    private String databaseURL;
+    
+    /**
+     * Name of the DB Schema Name
+     *
+     * @parameter
+     */    
+    private String schemaName;
+
+    /**
+     * Optional user name.
+     *
+     * @parameter
+     */
+    private String userName;
+
+    /**
+     * Optional password.
+     *
+     * @parameter
+     */
+    private String password;
+
+    public ModelXSDGenOption() {
+    }
+
+	public String getSchemaFile() {
+		return schemaFile;
+	}
+
+	public void setSchemaFile(String schemaFile) {
+		this.schemaFile = schemaFile;
+	}
+
+	public String getModelFile() {
+		return modelFile;
+	}
+
+	public void setModelFile(String modelFile) {
+		this.modelFile = modelFile;
+	}
+
+	public String getDriverClass() {
+		return driverClass;
+	}
+
+	public void setDriverClass(String driverClass) {
+		this.driverClass = driverClass;
+	}
+
+	public String getDatabaseURL() {
+		return databaseURL;
+	}
+
+	public void setDatabaseURL(String databaseURL) {
+		this.databaseURL = databaseURL;
+	}
+
+	public String getSchemaName() {
+		return schemaName;
+	}
+
+	public void setSchemaName(String schemaName) {
+		this.schemaName = schemaName;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+	
+}
diff --git a/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/SQLTypeChecker.java b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/SQLTypeChecker.java
new file mode 100644
index 0000000000..73fe977719
--- /dev/null
+++ b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/SQLTypeChecker.java
@@ -0,0 +1,186 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.util;
+
+import java.sql.Types;
+
+public class SQLTypeChecker {
+	
+	public static int getSQLTypeFromString(String sqlTypeString) {
+		if(sqlTypeString.equals("CHAR")) return Types.CHAR;
+		if(sqlTypeString.equals("VARCHAR")) return Types.VARCHAR;
+		if(sqlTypeString.equals("LONGVARCHAR")) return Types.LONGVARCHAR;
+		if(sqlTypeString.equals("NUMERIC")) return Types.NUMERIC;
+		if(sqlTypeString.equals("DECIMAL")) return Types.DECIMAL;
+		if(sqlTypeString.equals("BIT")) return Types.BIT;
+		if(sqlTypeString.equals("BOOLEAN")) return Types.BOOLEAN;
+		if(sqlTypeString.equals("TINYINT")) return Types.TINYINT;
+		if(sqlTypeString.equals("SMALLINT")) return Types.SMALLINT;
+		if(sqlTypeString.equals("INTEGER")) return Types.INTEGER;
+		if(sqlTypeString.equals("BIGINT")) return Types.BIGINT;
+		if(sqlTypeString.equals("REAL")) return Types.REAL;
+		if(sqlTypeString.equals("FLOAT")) return Types.FLOAT;
+		if(sqlTypeString.equals("DOUBLE")) return Types.DOUBLE;
+		if(sqlTypeString.equals("BINARY")) return Types.BINARY;
+		if(sqlTypeString.equals("VARBINARY")) return Types.VARBINARY;
+		if(sqlTypeString.equals("LONGVARBINARY")) return Types.LONGVARBINARY;
+		if(sqlTypeString.equals("DATE")) return Types.DATE;
+		if(sqlTypeString.equals("TIME")) return Types.TIME;
+		if(sqlTypeString.equals("TIMESTAMP")) return Types.TIMESTAMP;
+		if(sqlTypeString.equals("CLOB")) return Types.CLOB;
+		if(sqlTypeString.equals("BLOB")) return Types.BLOB;
+		if(sqlTypeString.equals("ARRAY")) return Types.ARRAY;
+		if(sqlTypeString.equals("DISTINCT")) return Types.DISTINCT;
+		if(sqlTypeString.equals("STRUCT")) return Types.STRUCT;
+		if(sqlTypeString.equals("REF")) return Types.REF;
+		if(sqlTypeString.equals("DATALINK")) return Types.DATALINK;
+		if(sqlTypeString.equals("JAVA_OBJECT")) return Types.JAVA_OBJECT;
+		return Types.OTHER;
+	}
+
+	/*xsd : SDO 
+	anySimpleType Object
+	anyType DataObject
+	anyURI URI
+	base64Binary Bytes
+	boolean Boolean
+	byte Byte
+	date YearMonthDay
+	dateTime DateTime
+	decimal Decimal
+	double Double
+	duration Duration
+	ENTITIES Strings
+	ENTITY String
+	float Float
+	gDay Day
+	gMonth Month
+	gMonthDay MonthDay
+	gYear Year
+	gYearMonth YearMonth
+	hexBinary Bytes
+	ID String
+	IDREF String
+	IDREFS Strings
+	int Int
+	integer Integer
+	language String
+	long Long
+	Name String
+	NCName String
+	negativeInteger Integer
+	NMTOKEN String
+	NMTOKENS Strings
+	nonNegativeInteger Integer
+	nonPositiveInteger Integer
+	normalizedString String
+	NOTATION String
+	positiveInteger Integer
+	QName URI
+	short Short
+	string String
+	time Time
+	token String
+	unsignedByte Short
+	unsignedInt long
+	unsignedLong Integer
+	unsignedShort Int*/
+	static final String anySimpleTypeXSD = "anySimpleType";
+	static final String anyTypeXSD = "anyType";
+	static final String anyURIXSD = "anyURI";
+	static final String base64BinaryXSD = "base64Binary";
+	static final String booleanXSD = "boolean";
+	static final String byteXSD = "byte";
+	static final String dateXSD = "date";
+	static final String dateTimeXSD = "dateTime";
+	static final String decimalXSD = "decimal";
+	static final String doubleXSD = "double";
+	static final String durationXSD = "duration";
+	static final String ENTITIESXSD = "ENTITIES";
+	static final String ENTITYXSD = "ENTITY";
+	static final String floatXSD = "float"; 
+	static final String gDayXSD = "gDay"; 
+	static final String gMonthXSD = "gMonth"; 
+	static final String gMonthDayXSD = "gMonthDay"; 
+	static final String gYearXSD = "gYear"; 
+	static final String gYearMonthXSD = "gYearMonth"; 
+	static final String hexBinaryXSD = "hexBinary"; 
+	static final String IDXSD = "ID"; 
+	static final String IDREFXSD = "IDREF"; 
+	static final String IDREFSXSD = "IDREF"; 
+	static final String intXSD = "int"; 
+	static final String integerXSD = "integer"; 
+	static final String languageXSD = "language"; 
+	static final String longXSD = "long"; 
+	static final String NameXSD = "Name"; 
+	static final String NCNameXSD = "NCName"; 
+	static final String negativeIntegerXSD = "negativeInteger"; 
+	static final String NMTOKENXSD = "NMTOKEN"; 
+	static final String NMTOKENSXSD = "NMTOKENS";
+	static final String nonNegativeIntegerXSD = "nonNegativeInteger"; 
+	static final String nonPositiveIntegerXSD = "nonPositiveInteger"; 
+	static final String normalizedStringXSD = "normalizedString"; 
+	static final String NOTATIONXSD = "NOTATION"; 
+	static final String positiveIntegerXSD = "positiveInteger"; 
+	static final String QNameXSD = "QName"; 
+	static final String shortXSD = "short"; 
+	static final String stringXSD = "string"; 
+	static final String timeXSD = "time"; 
+	static final String tokenXSD = "token"; 
+	static final String unsignedByteXSD = "unsignedByte"; 
+	static final String unsignedIntXSD = "unsignedInt"; 
+	static final String unsignedLongXSD = "unsignedLong"; 
+	static final String unsignedShortXSD = "unsignedShort"; 
+	
+	public static String xsdTypeForSDOType(String sdoTypeName) {
+		if(sdoTypeName.equals("Object")) return anySimpleTypeXSD;
+		if(sdoTypeName.equals("DataObject")) return anyTypeXSD;
+		if(sdoTypeName.equals("URI")) return anyURIXSD;
+		if(sdoTypeName.equals("Bytes")) return base64BinaryXSD;
+		if(sdoTypeName.equals("Boolean")) return booleanXSD;
+		if(sdoTypeName.equals("boolean")) return booleanXSD;
+		if(sdoTypeName.equals("Byte")) return byteXSD;
+		if(sdoTypeName.equals("YearMonthDay")) return dateXSD;
+		if(sdoTypeName.equals("DateTime")) return dateTimeXSD;
+		if(sdoTypeName.equals("Date")) return dateTimeXSD;
+		if(sdoTypeName.equals("Decimal")) return decimalXSD;
+		if(sdoTypeName.equals("Double")) return doubleXSD;
+		if(sdoTypeName.equals("double")) return doubleXSD;
+		if(sdoTypeName.equals("Duration")) return durationXSD;
+		if(sdoTypeName.equals("Strings")) return ENTITIESXSD;
+		if(sdoTypeName.equals("String")) return stringXSD;
+		if(sdoTypeName.equals("Float")) return floatXSD;
+		if(sdoTypeName.equals("float")) return floatXSD;
+		if(sdoTypeName.equals("Day")) return gDayXSD;
+		if(sdoTypeName.equals("Month")) return gMonthXSD;
+		if(sdoTypeName.equals("MonthDay")) return gMonthDayXSD;
+		if(sdoTypeName.equals("Year")) return gYearXSD;
+		if(sdoTypeName.equals("YearMonth")) return gYearMonthXSD;
+		if(sdoTypeName.equals("Bytes")) return hexBinaryXSD;
+		if(sdoTypeName.equals("Int")) return intXSD;
+		if(sdoTypeName.equals("IntObject")) return intXSD;
+		if(sdoTypeName.equals("Integer")) return integerXSD;
+		if(sdoTypeName.equals("Long")) return longXSD;		
+		if(sdoTypeName.equals("long")) return longXSD;
+		if(sdoTypeName.equals("Short")) return shortXSD;
+		if(sdoTypeName.equals("Time")) return timeXSD;
+		if(sdoTypeName.equals("long")) return unsignedIntXSD;
+		return "";
+	}
+}
diff --git a/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/SchemaFileToXSD.java b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/SchemaFileToXSD.java
new file mode 100644
index 0000000000..54cd0aa02b
--- /dev/null
+++ b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/SchemaFileToXSD.java
@@ -0,0 +1,200 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Hashtable;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.log4j.Logger;
+import org.apache.tuscany.das.rdb.graphbuilder.schema.ResultSetTypeMap;
+
+import commonj.sdo.Type;
+
+public class SchemaFileToXSD {
+	private static final Logger logger = Logger.getLogger(SchemaFileToXSD.class);
+	private static XMLInputFactory xmlFactory;
+	
+	protected static DBSchema read(XMLStreamReader reader) throws Exception {
+		DBSchema dbSchema = new DBSchema();
+		Table table = null;
+		Column column = null;
+		ForeignKey fk = null;
+		ForeignKeyRef fkRef = null;
+		
+        while (true) {
+            int event = reader.next();
+            if(javax.xml.stream.XMLStreamConstants.END_DOCUMENT == event) {
+            	break;
+            }
+            
+            switch (event) {
+	            case javax.xml.stream.XMLStreamConstants.START_ELEMENT:
+	                if (reader.getName().getLocalPart().equals("table")) {
+	                	table = new Table();
+	                	table.setName(reader.getAttributeValue(null, "name"));
+	                } else if (reader.getName().getLocalPart().equals("column")) {
+	                	column = new Column();
+	                	column.setName(reader.getAttributeValue(null, "name"));
+	                	column.setPK(Boolean.getBoolean(reader.getAttributeValue(null, "primaryKey")));
+	                	column.setRequired(Boolean.getBoolean(reader.getAttributeValue(null, "required")));
+	                	column.setType(reader.getAttributeValue(null, "type"));
+	                } 
+	                else if (reader.getName().getLocalPart().equals("foreign-key")) {
+	                	fk = new ForeignKey();
+	                	fk.setForeignTableName(reader.getAttributeValue(null,"foreignTable"));
+	                }
+	                else if (reader.getName().getLocalPart().equals("reference")) {
+	                	fkRef = new ForeignKeyRef();
+	                	fkRef.setForeign(reader.getAttributeValue(null,"foreign"));
+	                	fkRef.setLocal(reader.getAttributeValue(null,"local"));
+	                }
+	                else if (reader.getName().getLocalPart().equals("database")) {
+	                	//ignore
+	                } else {
+	                	throw new RuntimeException("not valid element:"+reader.getName()+":");
+	                }
+	                break;
+	                
+	            case javax.xml.stream.XMLStreamConstants.END_ELEMENT:
+	            	if (reader.getName().getLocalPart().equals("table")) {
+	            		dbSchema.getTables().add(table);
+	            	}
+	            	
+	            	if (reader.getName().getLocalPart().equals("column")) {
+	            		if(table != null) {
+	            			table.getColumns().add(column);
+	            		}
+	            	}
+	            	
+	            	if (reader.getName().getLocalPart().equals("reference")) {
+	            		if(fk != null) {
+	            			fk.getFkRefs().add(fkRef);
+	            		}
+	            	}
+	            	
+	            	if (reader.getName().getLocalPart().equals("foreign-key")) {
+	            		if(table != null) {
+	            			table.getFks().add(fk);
+	            		}
+	            	}
+	            	
+	            	break;
+            }
+        }
+        
+        if (logger.isDebugEnabled()) {
+        	logger.debug(dbSchema);
+        }
+        
+        return dbSchema;
+    }
+
+	protected static void convert(String schemaFileName, String xsdModelFileName) throws Exception{
+		xmlFactory = XMLInputFactory.newInstance();
+		
+		File schemaFile = new File(schemaFileName);
+		FileInputStream flStrm = new FileInputStream(schemaFile);
+		
+		XMLStreamReader reader = xmlFactory.createXMLStreamReader(new InputStreamReader(flStrm));
+		
+		DBSchema dbSchema = read(reader);
+		flStrm.close();
+		generateXSD(dbSchema, xsdModelFileName);
+	}
+	
+	protected static void generateXSD(DBSchema dbSchema, String xsdModelFileName) throws Exception {
+		boolean writeFilesToDir = false;
+		String startLine = "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:this=\"http:///org.apache.tuscany.das.rdb.test/schemaModel.xsd\" targetNamespace=\"http:///org.apache.tuscany.das.rdb.test/schemaModel.xsd\">\n";
+		String endLine = "</xsd:schema>"; 
+			
+		if(xsdModelFileName != null && !xsdModelFileName.trim().equals("")) {
+			writeFilesToDir = true;
+		}
+		
+		//get all FKs to form a Map - PKtable -> FKTable , e.g. if CITIES has FK such that CITIES.STATE_ID is STATES.ID, then
+		//the map shall have STATES -> CITIES, TABLE2,...
+		Hashtable pkTofkTable = new Hashtable();
+		
+		for(int i=0; i<dbSchema.getTables().size(); i++) {
+			Table curTable = (Table)dbSchema.getTables().get(i);
+			for(int k=0; k<curTable.getFks().size(); k++) {
+				ForeignKey curFK = (ForeignKey)curTable.getFks().get(k);
+				String pkTableName = curFK.getForeignTableName();
+				
+				if(pkTofkTable.get(pkTableName) == null) {
+					pkTofkTable.put(pkTableName, new ArrayList());
+				}
+				((ArrayList)pkTofkTable.get(pkTableName)).add(curTable.getName());
+			}
+		}
+		
+		String srcCode = startLine;
+		
+		for(int i=0; i<dbSchema.getTables().size(); i++) {
+			Table curTable = (Table)dbSchema.getTables().get(i);
+			srcCode = srcCode + "<xsd:complexType name=\""+curTable.getName()+"\">\n";
+			srcCode = srcCode + "   <xsd:sequence>\n";
+			
+			for(int j=0; j<curTable.getColumns().size(); j++) {
+				Column curColumn = (Column)curTable.getColumns().get(j);
+				srcCode = srcCode + "      <xsd:element name=\""+	curColumn.getName();
+				
+				if(curColumn.isRequired()) {
+					srcCode = srcCode + " nillable=\"false\"";
+				}
+				
+				Type sdoType = ResultSetTypeMap.INSTANCE.getType(SQLTypeChecker.getSQLTypeFromString(curColumn.getType()), true);
+				
+				srcCode = srcCode + " type=\"xsd:"+SQLTypeChecker.xsdTypeForSDOType(sdoType.getName())+"\"/>\n";
+			}
+			
+			if(pkTofkTable.get(curTable.getName()) != null) {
+				ArrayList fkTables = (ArrayList)pkTofkTable.get(curTable.getName());
+				
+				for(int k=0; k<fkTables.size(); k++) {
+					srcCode = srcCode + "      <xsd:element maxOccurs=\"unbounded\" name=\""+ fkTables.get(k)+"\" type=\"this:"+fkTables.get(k)+"\"/>\n";
+				}
+			}
+			
+			srcCode = srcCode + "   </xsd:sequence>\n";
+			srcCode = srcCode + "</xsd:complexType>\n\n";
+		}
+		
+		srcCode = srcCode + endLine;
+
+		File javaFile = new File(xsdModelFileName);
+		javaFile.createNewFile();
+		PrintStream flStrm = new PrintStream(javaFile);
+		
+		if(writeFilesToDir) {
+			flStrm.print(srcCode);
+			flStrm.flush();
+			flStrm.close();
+		} else {
+			System.out.print(srcCode);
+		}
+	}	
+}
+\ No newline at end of file
diff --git a/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/Table.java b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/Table.java
new file mode 100644
index 0000000000..c41085cf2f
--- /dev/null
+++ b/das-java/trunk/tools/src/main/java/org/apache/tuscany/das/rdb/util/Table.java
@@ -0,0 +1,66 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Table {
+	private String name;
+	private List columns = new ArrayList();
+	private List fks = new ArrayList();
+	
+	protected String getName() {
+		return name;
+	}
+	protected void setName(String name) {
+		this.name = name;
+	}
+	protected List getColumns() {
+		return columns;
+	}
+	protected void setColumns(List columns) {
+		this.columns = columns;
+	}
+	protected List getFks() {
+		return fks;
+	}
+	protected void setFks(List fks) {
+		this.fks = fks;
+	}
+	
+	public String toString() {
+		StringBuffer dbSchemaStr = new StringBuffer();
+		dbSchemaStr.append("_____Table_______"+this.name+"\n");
+		dbSchemaStr.append("_____Columns_______\n");
+		for(int i=0; i<this.columns.size(); i++) {
+			Column curColumn = (Column)this.columns.get(i);
+			dbSchemaStr.append(curColumn);
+		}
+		
+		if(this.fks.size() > 0)
+			dbSchemaStr.append("_____FKs_______\n");
+		for(int i=0; i<this.fks.size(); i++) {
+			ForeignKey curFk = (ForeignKey)this.fks.get(i);
+			dbSchemaStr.append(curFk);
+		}
+		
+		return dbSchemaStr.toString();
+	}	
+}
diff --git a/das-java/trunk/tools/src/test/java/org/apache/tuscany/das/rdb/test/DBToXSDTests.java b/das-java/trunk/tools/src/test/java/org/apache/tuscany/das/rdb/test/DBToXSDTests.java
new file mode 100644
index 0000000000..aba4eba68f
--- /dev/null
+++ b/das-java/trunk/tools/src/test/java/org/apache/tuscany/das/rdb/test/DBToXSDTests.java
@@ -0,0 +1,142 @@
+/*
+ * 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.    
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.das.rdb.dbconfig.DBInitializer;
+import org.apache.tuscany.das.rdb.util.DBToXSDGenerator;
+/**
+ * Tests the DB Schema to Model XSD converter tool
+ */
+public class DBToXSDTests  extends TestCase {
+	protected void setUp() throws Exception {	    
+        super.setUp();
+        DBInitializer dbInitializer = new DBInitializer("dbConfig.xml");
+        dbInitializer.initializeDatabase(true);
+	}
+	
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+	
+	static public String getContents(File aFile) {
+	    //...checks on aFile are elided
+	    StringBuffer contents = new StringBuffer();
+
+	    //declared here only to make visible to finally clause
+	    BufferedReader input = null;
+	    try {
+	      //use buffering, reading one line at a time
+	      //FileReader always assumes default encoding is OK!
+	      input = new BufferedReader( new FileReader(aFile) );
+	      String line = null; //not declared within while loop
+	      /*
+	      * readLine is a bit quirky :
+	      * it returns the content of a line MINUS the newline.
+	      * it returns null only for the END of the stream.
+	      * it returns an empty String if two newlines appear in a row.
+	      */
+	      while (( line = input.readLine()) != null){
+	        contents.append(line);
+	        contents.append(System.getProperty("line.separator"));
+	      }
+	    }
+	    catch (FileNotFoundException ex) {
+	      ex.printStackTrace();
+	    }
+	    catch (IOException ex){
+	      ex.printStackTrace();
+	    }
+	    finally {
+	      try {
+	        if (input!= null) {
+	          //flush and close both "input" and its underlying FileReader
+	          input.close();
+	        }
+	      }
+	      catch (IOException ex) {
+	        ex.printStackTrace();
+	      }
+	    }
+	    return contents.toString();
+	  }
+	
+    String compare1 = "<table javaName=\"STATES\" name=\"STATES\">";
+    String compare2 = "<table javaName=\"CITIES\" name=\"CITIES\">";
+    String compare3 = "<xsd:complexType name=\"CITIES\">";
+    String compare4 = "<xsd:complexType name=\"STATES\">";
+
+	public void testDBToSchemaFile() throws Exception {
+		DBToXSDGenerator.getSchemaFileFromDB("DBConnectionConfig.xml");
+		File file = new File("target/dbSchema.txt");
+		if(file.isFile()) {
+			String schemaContent = getContents(file);
+			if(schemaContent.indexOf(compare1) != -1 && schemaContent.indexOf(compare2) != -1) {
+				assertTrue(true);
+			}
+		} else {
+			fail("SchemaFile does not exists or has improper contents!");
+		}
+	}
+	
+	public void testSchemaFileToXSD() throws Exception {
+		DBToXSDGenerator.getModelFileFromSchemaFile("target/dbSchema.txt", "target/schemaModel.xsd");
+		
+		File modelfile = new File("target/schemaModel.xsd");
+		if(modelfile.isFile()) {
+			String modelContent = getContents(modelfile);
+			if(modelContent.indexOf(compare3) != -1 && modelContent.indexOf(compare4) != -1) {
+				assertTrue(true);
+			}
+		} else {
+			fail("ModelFile does not exists or has improper contents!");
+		}		
+	}
+	
+	public void testDBToXSD() throws Exception {
+		DBToXSDGenerator.getModelFileFromDB("DBConnectionConfig.xml");
+		
+		File file = new File("target/dbSchema.txt");
+		if(file.isFile()) {
+			String schemaContent = getContents(file);
+			if(schemaContent.indexOf(compare1) != -1 && schemaContent.indexOf(compare2) != -1) {
+				assertTrue(true);
+			}
+		} else {
+			fail("SchemaFile does not exists or has improper contents!");
+		}
+		
+		File modelfile = new File("target/schemaModel.xsd");
+		if(modelfile.isFile()) {
+			String modelContent = getContents(modelfile);
+			if(modelContent.indexOf(compare3) != -1 && modelContent.indexOf(compare4) != -1) {
+				assertTrue(true);
+			}
+		} else {
+			fail("ModelFile does not exists or has improper contents!");
+		}
+	}
+}
diff --git a/das-java/trunk/tools/src/test/resources/DBConnectionConfig.xml b/das-java/trunk/tools/src/test/resources/DBConnectionConfig.xml
new file mode 100644
index 0000000000..c00bd462db
--- /dev/null
+++ b/das-java/trunk/tools/src/test/resources/DBConnectionConfig.xml
@@ -0,0 +1,31 @@
+<?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">
+
+	<!--Uncomment below for derby test-->
+	<ConnectionInfo>
+		<ConnectionProperties
+			driverClass="org.apache.derby.jdbc.EmbeddedDriver"
+			databaseURL="jdbc:derby:target/dastest;create=true" schemaName="APP"
+		/>
+	</ConnectionInfo>
+	<OutFiles schemaFile="target/dbSchema.txt"
+		modelFile="target/schemaModel.xsd" />
+</Config>
diff --git a/das-java/trunk/tools/src/test/resources/dbConfig.xml b/das-java/trunk/tools/src/test/resources/dbConfig.xml
new file mode 100644
index 0000000000..b990d5cd0f
--- /dev/null
+++ b/das-java/trunk/tools/src/test/resources/dbConfig.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+<DBConfig xmlns="http:///org.apache.tuscany.das.rdb/dbconfig.xsd">
+	<ConnectionInfo>
+		<ConnectionProperties
+			driverClass="org.apache.derby.jdbc.EmbeddedDriver"
+			databaseURL="jdbc:derby:target/dastest; create = true"
+			/>
+	</ConnectionInfo>
+	<Table name="STATES"
+		SQLCreate="CREATE TABLE STATES (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(2))">
+	</Table>
+	<Table name="CITIES"
+		SQLCreate="CREATE TABLE CITIES (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(50), STATES_ID INTEGER,  
+	CONSTRAINT FK1 FOREIGN KEY (STATES_ID) REFERENCES  STATES (ID) ON DELETE NO ACTION ON UPDATE NO ACTION)">
+	</Table>
+</DBConfig>