summaryrefslogtreecommitdiffstats
path: root/sandbox/lresende/backup
diff options
context:
space:
mode:
authordims <dims@13f79535-47bb-0310-9956-ffa450edef68>2008-06-17 00:23:01 +0000
committerdims <dims@13f79535-47bb-0310-9956-ffa450edef68>2008-06-17 00:23:01 +0000
commitbdd0a41aed7edf21ec2a65cfa17a86af2ef8c48a (patch)
tree38a92061c0793434c4be189f1d70c3458b6bc41d /sandbox/lresende/backup
Move Tuscany from Incubator to top level.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@668359 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sandbox/lresende/backup')
-rw-r--r--sandbox/lresende/backup/container.das.client/build.xml55
-rw-r--r--sandbox/lresende/backup/container.das.client/pom.xml113
-rw-r--r--sandbox/lresende/backup/container.das.client/readme.html199
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/java/org/apache/tuscany/samples/das/orders/CustomersOrdersService.java43
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/java/org/apache/tuscany/samples/das/orders/CustomersOrdersServiceImpl.java74
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/java/org/apache/tuscany/samples/das/orders/StoredProcs.java42
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/resources/CustomersOrders.componentType26
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/resources/CustomersOrders.xml82
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/resources/META-INF/LICENSE.txt202
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/resources/META-INF/NOTICE32
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/resources/META-INF/README.txt35
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/resources/log4j.properties29
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/webapp/Company.jsp70
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/webapp/Customer.jsp419
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/webapp/META-INF/context.xml25
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/webapp/WEB-INF/default.scdl30
-rw-r--r--sandbox/lresende/backup/container.das.client/src/main/webapp/WEB-INF/web.xml44
-rw-r--r--sandbox/lresende/backup/container.das/.ruleset190
-rw-r--r--sandbox/lresende/backup/container.das/LICENSE.txt202
-rw-r--r--sandbox/lresende/backup/container.das/NOTICE.txt14
-rw-r--r--sandbox/lresende/backup/container.das/README.txt35
-rw-r--r--sandbox/lresende/backup/container.das/pom.xml89
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java128
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentBuilder.java108
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentConfiguration.java137
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentType.java58
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentTypeLoader.java130
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessImplementation.java79
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessImplementationLoader.java92
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInstance.java30
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInstanceFactory.java92
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInvoker.java67
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/MissingSideFileException.java44
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/CommandMapper.java44
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessEngine.java65
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessInstanceImpl.java328
-rw-r--r--sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessUtils.java90
-rw-r--r--sandbox/lresende/backup/container.das/src/main/resources/META-INF/sca/das.system.scdl39
-rw-r--r--sandbox/lresende/backup/container.das/src/main/resources/META-INF/sca/default.scdl38
39 files changed, 3619 insertions, 0 deletions
diff --git a/sandbox/lresende/backup/container.das.client/build.xml b/sandbox/lresende/backup/container.das.client/build.xml
new file mode 100644
index 0000000000..feef76481b
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/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/sandbox/lresende/backup/container.das.client/pom.xml b/sandbox/lresende/backup/container.das.client/pom.xml
new file mode 100644
index 0000000000..1d1acf6df5
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/pom.xml
@@ -0,0 +1,113 @@
+<?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.samples</groupId>
+ <artifactId>tuscany-samples-das</artifactId>
+ <version>1.0-incubator-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>container-das-sample-client</artifactId>
+ <packaging>war</packaging>
+ <name>Tuscany DAS Container Client Application Sample</name>
+ <description>Sample web application using a DAS Container</description>
+
+ <dependencies>
+
+ <!-- runtime is need for webapp integration to include jar -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-api</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
+ <version>${pom.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>test</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.das</groupId>
+ <artifactId>tuscany-das-rdb</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ </dependencies>
+
+ <!-- this will place the java source files inside the war -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <artifactId>tuscany-war-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tuscany-war</id>
+ <goals>
+ <goal>tuscany-war</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <extensions>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.containers</groupId>
+ <artifactId>das</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </extensions>
+ </configuration>
+ </plugin>
+ </plugins>
+
+
+
+
+ <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/sandbox/lresende/backup/container.das.client/readme.html b/sandbox/lresende/backup/container.das.client/readme.html
new file mode 100644
index 0000000000..65a50de320
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/readme.html
@@ -0,0 +1,199 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT 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=windows-1252">
+<title>Tuscany RDB DAS Service client</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>Tuscany RDB DAS Service client</h1>
+
+
+<h3>Introduction</h3>
+
+<p>
+This stand-alone sample application demonstrate how to consume the DAS Service exposed trough an SCA service.<br>
+The application starts with a canned database of Companies and their related Departments.<br>
+Through the web page interface, a user can consume the DAS Service to display the list of available companies.<br>
+The sample runs on Tomcat 5.5 and employs a Derby database accessed via a DataSource.
+</p>
+
+
+
+
+
+<h3>Running the sample</h3>
+
+<p>There are two options for running this sample:</p>
+
+<ol>
+ <li>Run from Tomcat configured by the build</li>
+ <li>Deploying the DASService.client WAR into a Tomcat you configure yourself</li>
+</ol>
+
+
+<h3>Running from Tomcat configured by the build</h3>
+
+<p>
+This sample application is deployed (along with the canned test database) to an instance of Tomcat as part of our automated sample
+testing.This means you can run the java/samples/testing/tomcat build (see java/das/samples/testing/tomcat/readme.htm ) and then access
+the application by pointing your browser to http://localhost:8080/companyweb-service-client/
+</p>
+
+
+
+<h3>Deploying the DASService.client WAR into a Tomcat you configure 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 sample distribution or 2) Downloaded the Tuscany
+source and run our maven build, see the following link to more details steps on how to build DAS Sample applications <a
+href="http://incubator.apache.org/tuscany/java_das_overview.html">http://incubator.apache.org/tuscany/java_das_overview.html</a>.
+</p>
+
+<p><b><u>Set Up:</u></b></p>
+
+
+<ol>
+ <li>Download and install the most recent stable version of Tomcat 5.5. You can find it here: <a
+ href="http://tomcat.apache.org/download-55.cgi">http://tomcat.apache.org/download-55.cgi</a></li>
+ <li>Download the most recent official release of Derby from here: <a href="http://db.apache.org/derby/index.html">http://db.apache.org/derby/index.html</a>.
+ The only file you’ll need from this download is derby.jar</li>
+ <li>Stop Tomcat</li>
+ <li>Copy derby.jar (from the derby distribution) to {Tomcat_Home}/common/lib:</li>
+ <li>Add the sample war file to {Tomcat_Home}/webapps</li>
+ <ol start=1 type=a>
+ <li>sample-das-service-client-xxx.war (e.g.sample-das-service-client-1.0-incubator-SNAPSHOT.war)</li>
+ </ol>
+ <li>Install the canned Derby database to Tomcat: </li>
+ <ol start=1 type=a>
+ <li>First, create a new directory named “Databases” to hold the sample database. Create {Tomcat_Home}/Databases</li>
+ <li>Copy the <b>dastest</b> folder (and all its contents) from {build directory root OR
+ where samples where unzipped}/java/das/samples/DASService.client to {Tomcat_Home}/Databases.<br>
+ <br>
+ <b>NOTE</b>: If you are running this from a sample distribution, the canned database is available in the
+ distribution, inside the databases directory. </li>
+ </ol>
+ <li>Define a DataSource by adding a datasource definition to {Tomcat_Home}/conf/server.xml.</li>
+ <ol start=1 type=a>
+ <li>Find the end-of-section marker &lt;/GlobalNamingResources&gt; and add the following lines just above it:
+ <p>
+ <div class="codebox2">
+ <pre>
+ &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"/&gt;
+ </pre>
+ </div>
+ </p>
+ <p><b>Requirement</b>:You must include the absolute path to the “Databases” directory in the above url attribute. Fore example:</p>
+ <p><pre> url=&quot;jdbc:derby:c:\apache-tomcat-5.5.17\Databases/dastest&quot;</pre></p>
+ </li>
+ </ol>
+ <li><p>Start tomcat and point your browser to: <a href="http://localhost:8080/sample-das-service-client-%7bversion%20tag%7d/">http://localhost:8080/sample-das-service-client-{version
+ tag}/</a>. Example:</p>
+ <p><pre> http://localhost:8080/sample-das-service-client-1.0-incubator-SNAPSHOT/</pre></p>
+
+ </li>
+
+</ol>
+
+
+
+
+<h3>Sample Architecture</h3>
+
+<p>This is a simple, single-page, web application to consume DAS exposed as an SCA service.</p>
+<p>The main components of this application are:</p>
+
+<ul type=disc>
+ <li>The SCA DAS Service</li>
+ <li>SDO</li>
+ <li>Company.jsp</li>
+ <li>The canned Derby database</li>
+</ul>
+
+
+<p>The <b>Company.jsp</b> directly invoke the DAS Service to get a list of companies available and then iterate trough the SDO data graphs and manipulate SDO directly to display data</p>
+
+<p>The canned <b>Derby database</b> comes preloaded with Companies and related Departments. The Derby database instance is a simple file folder.</p>
+
+<p>The <b>SCA DAS Service</b> accepts directives (commands) and reads and writes to the derby database instance appropriately using DAS as the service implementation.</p>
+
+
+
+<h3>Consuming the DAS service</h3>
+
+<p>First, note that the application have dependencies on the DAS Service:</p>
+
+
+<p>
+<div class="codebox2">
+<pre>
+&lt;!-- DAS Service --&gt;
+&lt;dependency&gt;
+ &lt;groupId&gt;org.apache.tuscany.das.samples&lt;/groupId&gt;
+ &lt;artifactId&gt;sample-das-service&lt;/artifactId&gt;
+ &lt;version&gt;${pom.version}&lt;/version&gt;
+&lt;/dependency&gt;
+</pre>
+</div>
+</p>
+
+<br>
+<p>And the SCDL references the service:</p>
+
+<p>
+<div class="codebox2">
+<pre>
+&lt;composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="DASServiceComposite"&gt;
+ &lt;component name="DASServiceComponent"&gt;
+ &lt;implementation.composite name="DASServiceComposite" jarLocation="lib/sample-das-service-1.0-incubator-SNAPSHOT.jar"/&gt;
+ &lt;/component&gt;
+&lt;/composite&gt;
+</pre>
+</div>
+</p>
+
+
+
+
+</body>
+
+</html>
diff --git a/sandbox/lresende/backup/container.das.client/src/main/java/org/apache/tuscany/samples/das/orders/CustomersOrdersService.java b/sandbox/lresende/backup/container.das.client/src/main/java/org/apache/tuscany/samples/das/orders/CustomersOrdersService.java
new file mode 100644
index 0000000000..f301483be3
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/src/main/java/org/apache/tuscany/samples/das/orders/CustomersOrdersService.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.samples.das.orders;
+
+import java.util.ArrayList;
+import java.util.Vector;
+
+import commonj.sdo.DataObject;
+
+public interface CustomersOrdersService {
+
+ //dynamic way - demoed in J2SE client only
+ public void execute(Vector params);
+ public DataObject executeQuery(Vector params);
+ public void applyChanges(Vector params);
+ public DataObject executeAdhoc(Vector params);//adhoc query implementation - not done
+
+ //static way - demoed in JSP, J2SE clients
+ public DataObject getAllCustomers(Vector paramsList);
+ public DataObject getRangeCustomers(Vector paramsList);
+ public void getInsertCustomerExecute(Vector paramsList);
+ public void getInsertCustomerApplyChanges(Vector paramsList);
+ public void getDeleteCustomerExecute(Vector paramsList);
+ public void getDeleteCustomerApplyChanges(Vector paramsList);
+ public void getUpdateCustomer(Vector paramsList);
+ public DataObject getNamedCustomers(Vector paramsList);
+}
diff --git a/sandbox/lresende/backup/container.das.client/src/main/java/org/apache/tuscany/samples/das/orders/CustomersOrdersServiceImpl.java b/sandbox/lresende/backup/container.das.client/src/main/java/org/apache/tuscany/samples/das/orders/CustomersOrdersServiceImpl.java
new file mode 100644
index 0000000000..ffd02a8f85
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/src/main/java/org/apache/tuscany/samples/das/orders/CustomersOrdersServiceImpl.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.samples.das.orders;
+
+import java.util.Vector;
+import commonj.sdo.DataObject;
+
+public class CustomersOrdersServiceImpl implements CustomersOrdersService {
+
+ //dynamic way
+ public void execute(Vector params) {
+ }
+
+ public DataObject executeQuery(Vector params){
+ return null;
+ }
+
+ public void applyChanges(Vector params){
+
+ }
+
+ public DataObject executeAdhoc(Vector params){
+ return null;
+ }
+
+ // static way
+ public DataObject getAllCustomers(Vector paramsList){
+ return null;
+ }
+
+ public DataObject getRangeCustomers(Vector paramsList){
+ return null;
+ }
+
+ public void getInsertCustomerExecute(Vector paramsList){
+ return ;
+ }
+
+ public void getInsertCustomerApplyChanges(Vector paramsList){
+ return ;
+ }
+
+ public void getDeleteCustomerExecute(Vector paramsList){
+ return ;
+ }
+
+ public void getDeleteCustomerApplyChanges(Vector paramsList){
+ return ;
+ }
+
+ public void getUpdateCustomer(Vector paramsList){
+ return;
+ }
+
+ public DataObject getNamedCustomers(Vector paramsList){
+ return null;
+ }
+}
diff --git a/sandbox/lresende/backup/container.das.client/src/main/java/org/apache/tuscany/samples/das/orders/StoredProcs.java b/sandbox/lresende/backup/container.das.client/src/main/java/org/apache/tuscany/samples/das/orders/StoredProcs.java
new file mode 100644
index 0000000000..fd064f006e
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/src/main/java/org/apache/tuscany/samples/das/orders/StoredProcs.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.orders;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+//Example stored procedure in Derby
+public class StoredProcs {
+ 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/sandbox/lresende/backup/container.das.client/src/main/resources/CustomersOrders.componentType b/sandbox/lresende/backup/container.das.client/src/main/resources/CustomersOrders.componentType
new file mode 100644
index 0000000000..67307e7275
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/src/main/resources/CustomersOrders.componentType
@@ -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.
+-->
+
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+ <service name="CustomersOrdersService">
+ <interface.java interface="org.apache.tuscany.samples.das.orders.CustomersOrdersService"/>
+ </service>
+</componentType>
diff --git a/sandbox/lresende/backup/container.das.client/src/main/resources/CustomersOrders.xml b/sandbox/lresende/backup/container.das.client/src/main/resources/CustomersOrders.xml
new file mode 100644
index 0000000000..12f4bf8bac
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/src/main/resources/CustomersOrders.xml
@@ -0,0 +1,82 @@
+<?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 xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <ConnectionInfo dataSource="derby:dastest" managedtx="true"/>
+
+ <Command name="AllCustomers" SQL="select * from CUSTOMER" kind="Select"/>
+
+ <Command name="RangeCustomers" SQL="select * from CUSTOMER where ID >= ?" 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="InsertCustomerExecute"
+ SQL="insert into CUSTOMER (ID, LASTNAME, ADDRESS) values (?, ?, ?)"
+ kind="Insert">
+ </Command>
+
+ <Command name="delete customer"
+ SQL="delete from CUSTOMER where ID = ?"
+ kind="Delete">
+ </Command>
+
+ <Command name="DeleteCustomerExecute"
+ SQL="delete from CUSTOMER where ID = ?"
+ kind="Delete">
+ </Command>
+
+ <Command name="orderby id" SQL="select * from ANORDER where ANORDER.ID = ?"
+ kind="Select">
+ </Command>
+
+ <Command name="UpdateCustomer"
+ SQL="update CUSTOMER set LASTNAME = ? where ID = ?"
+ kind="update">
+ </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>
+
+ <Command name="getAllCompanies" SQL="{call GETALLCOMPANIES()}" kind="procedure">
+ </Command>
+
+ <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>
+
+ <Relationship name="orders" primaryKeyTable="CUSTOMER"
+ foreignKeyTable="ANORDER" many="true">
+ <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
+ </Relationship>
+
+</Config> \ No newline at end of file
diff --git a/sandbox/lresende/backup/container.das.client/src/main/resources/META-INF/LICENSE.txt b/sandbox/lresende/backup/container.das.client/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000000..75b52484ea
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ 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.
diff --git a/sandbox/lresende/backup/container.das.client/src/main/resources/META-INF/NOTICE b/sandbox/lresende/backup/container.das.client/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000000..59f0b4314f
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,32 @@
+Apache Tuscany DAS for Java
+Copyright 2006 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)
+ . Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+
+This product also includes software developed by:
+- the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
+
+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.
diff --git a/sandbox/lresende/backup/container.das.client/src/main/resources/META-INF/README.txt b/sandbox/lresende/backup/container.das.client/src/main/resources/META-INF/README.txt
new file mode 100644
index 0000000000..d1905ee3e8
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/src/main/resources/META-INF/README.txt
@@ -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/sandbox/lresende/backup/container.das.client/src/main/resources/log4j.properties b/sandbox/lresende/backup/container.das.client/src/main/resources/log4j.properties
new file mode 100644
index 0000000000..c5c2868aaa
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/src/main/resources/log4j.properties
@@ -0,0 +1,29 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT 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, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.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/sandbox/lresende/backup/container.das.client/src/main/webapp/Company.jsp b/sandbox/lresende/backup/container.das.client/src/main/webapp/Company.jsp
new file mode 100644
index 0000000000..9fadd79766
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/src/main/webapp/Company.jsp
@@ -0,0 +1,70 @@
+<!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.
+ -->
+
+<%@ page import="java.util.*" %>
+
+<%@ page import="org.osoa.sca.CompositeContext" %>
+<%@ page import="org.osoa.sca.CurrentCompositeContext" %>
+
+<%@ page import="commonj.sdo.*" %>
+
+<%@ page import="org.apache.tuscany.samples.das.orders.*" %>
+
+<html>
+<head>
+<%@ page language="java" contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
+<%
+//
+ CompositeContext context = CurrentCompositeContext.getContext();
+ CustomersOrdersService service = context.locateService(CustomersOrdersService.class, "CustomersOrdersComponent");
+ List customers = null;
+ try{
+ DataObject root = service.getAllCustomers(null);
+ customers = root.getList("CUSTOMERS");
+ }catch(Exception e){
+ //TODO: handle case where dasService can't be initiated properly
+ }
+%>
+
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>DASService Client Test</title>
+</head>
+<body>
+
+<H2>Tuscany DAS Service WEB Client Application Example</H2>
+
+<!-- Do Fill -->
+<table border>
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>Name</th>
+ </tr>
+ </thead>
+ <tbody>
+
+ </tbody>
+</table>
+
+
+
+</form>
+</body>
+</html>
diff --git a/sandbox/lresende/backup/container.das.client/src/main/webapp/Customer.jsp b/sandbox/lresende/backup/container.das.client/src/main/webapp/Customer.jsp
new file mode 100644
index 0000000000..b963d51263
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/src/main/webapp/Customer.jsp
@@ -0,0 +1,419 @@
+<!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.
+ -->
+
+<%@ page import="java.util.*" %>
+
+<%@ page import="org.osoa.sca.CompositeContext" %>
+<%@ page import="org.osoa.sca.CurrentCompositeContext" %>
+
+<%@ page import="commonj.sdo.*" %>
+
+<%@ page import="org.apache.tuscany.samples.das.orders.*" %>
+
+<html>
+<head>
+<%@ page language="java" contentType="text/html;charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>DAS - SCA Container Test</title>
+</head>
+<body>
+
+<H2>Tuscany DAS - SCA container Test </H2>
+<H3>(demo for static service API approach e.g. getAllCustomers())</H3>
+<form>
+<input type="submit" id="doSelectStatic" name="doSelectStatic" value="RangeCustomers (SELECT/WHERE as executeQuery())">
+<input type="submit" id="doInsertExecute" name="doInsertExecute" value="InsertCustomer (INSERT AS execute())">
+<input type="submit" id="doInsertApplyChanges" name="doInsertApplyChanges" value="InsertCustomer (INSERT AS applyChanges())">
+<input type="submit" id="doDeleteExecute" name="doDeleteExecute" value="DeleteCustomer (DELETE AS execute())">
+<input type="submit" id="doDeleteApplyChanges" name="doDeleteApplyChanges" value="DeleteCustomer (DELETE AS applyChanges())">
+<input type="submit" id="doUpdateApplyChanges" name="doUpdateApplyChanges" value="UpdateCustomer (UPDATE AS applyChanges())">
+<input type="submit" id="doSP" name="doSP" value="SPCustomer - get customer for name">
+
+<%
+CompositeContext context = CurrentCompositeContext.getContext();
+CustomersOrdersService service = context.locateService(CustomersOrdersService.class, "CustomersOrdersComponent");
+List customers = null;
+Map<Integer, Object> inParams = new Hashtable<Integer, Object>();
+Vector params = new Vector();
+%>
+
+<%! //common code to display latest results
+ public Iterator getResult(){
+ List custList = null;
+ java.util.Iterator i = null;
+ try{
+ Map<Integer, Object> inParams = new Hashtable<Integer, Object>();
+ Vector params = new Vector();
+ CompositeContext context = CurrentCompositeContext.getContext();
+ CustomersOrdersService service = context.locateService(CustomersOrdersService.class, "CustomersOrdersComponent");
+ params.clear();
+ params.add("");//of no use - as is derived using CommandMapper
+ params.add("select"); //is needed to understand whether execute/executeQuery/applyChanges
+ inParams.clear();
+ inParams.put(1, new Integer(1));
+ params.add(inParams);
+
+ DataObject root = service.getRangeCustomers(params);
+ custList = root.getList("CUSTOMER");
+ if(custList != null){
+ i = custList.iterator();
+ return i;
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ //TODO: handle case where dasService can't be initiated properly
+ }finally{
+ }
+
+ return i;
+ }
+%>
+<hr>
+
+<!--------------------------------------------------------------------------->
+<!--doSelectStatic -->
+<%if(request.getParameter("doSelectStatic") != null){%>
+
+<table border>
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>LastName</th>
+ </tr>
+ </thead>
+ <tbody>
+ <%
+ java.util.Iterator i = getResult();
+ while (i.hasNext()) {
+ DataObject customer = (DataObject)i.next();
+ %>
+ <tr>
+ <td><%=customer.getInt("ID")%></td>
+ <td><%=customer.getString("LASTNAME")%></td>
+ <tr>
+ <%
+ }//while
+ %>
+ </tbody>
+</table>
+
+<%}//doSelectStatic %>
+<!--------------------------------------------------------------------------->
+<!--doInsertExecute -->
+<%if(request.getParameter("doInsertExecute") != null){%>
+
+ <%try{
+ params.clear();
+ inParams.clear();
+
+ System.out.println("Calling InsertCustomerExecute");
+ params.clear();
+ inParams.clear();
+ params.add("");
+ params.add("insert");
+
+ inParams.put(1, new Integer(4));
+ inParams.put(2, new String("11"));
+ inParams.put(3, new String("111"));
+
+ params.add(inParams);
+
+ service.getInsertCustomerExecute(params);
+
+ }catch(Exception e){
+ e.printStackTrace();
+ }%>
+<table border>
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>LastName</th>
+ </tr>
+ </thead>
+ <tbody>
+ <%
+ java.util.Iterator i = getResult();
+ while (i.hasNext()) {
+ DataObject customer = (DataObject)i.next();
+ %>
+ <tr>
+ <td><%=customer.getInt("ID")%></td>
+ <td><%=customer.getString("LASTNAME")%></td>
+ <tr>
+ <%
+ }//while
+ %>
+ </tbody>
+</table>
+<%}//doInsertExecute %>
+<!--------------------------------------------------------------------------->
+<!--doInsertApplyChanges -->
+<%if(request.getParameter("doInsertApplyChanges") != null){%>
+
+ <%try{
+ Map<String, Object> insertParams = new Hashtable<String, Object>();
+ System.out.println("Calling InsertCustomerApplyChanges");
+ params.clear();
+ insertParams.clear();
+ params.add("");
+ params.add("insert:CUSTOMER");
+
+ insertParams.put("ID", new Integer("9"));
+ insertParams.put("LASTNAME", "222");
+ insertParams.put("ADDRESS", "2222");
+
+ params.add(insertParams);
+
+ service.getInsertCustomerApplyChanges(params);
+ }catch(Exception e){
+ e.printStackTrace();
+ }%>
+<table border>
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>LastName</th>
+ </tr>
+ </thead>
+ <tbody>
+ <%
+ java.util.Iterator i = getResult();
+ while (i.hasNext()) {
+ DataObject customer = (DataObject)i.next();
+ %>
+ <tr>
+ <td><%=customer.getInt("ID")%></td>
+ <td><%=customer.getString("LASTNAME")%></td>
+ <tr>
+ <%
+ }//while
+ %>
+ </tbody>
+</table>
+<%}//doInsertApplyChanges %>
+<!--------------------------------------------------------------------------->
+<!--doDeleteExecute -->
+<%if(request.getParameter("doDeleteExecute") != null){%>
+
+ <%
+ try{
+ System.out.println("Calling DeleteCustomerExecute");
+ params.clear();
+ inParams.clear();
+ params.add("");
+ params.add("delete");
+
+ inParams.put(1, new Integer(9));
+
+ params.add(inParams);
+
+ service.getDeleteCustomerExecute(params);
+
+ }catch(Exception e){
+ e.printStackTrace();
+ }%>
+
+<table border>
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>LastName</th>
+ </tr>
+ </thead>
+ <tbody>
+ <%
+ java.util.Iterator i = getResult();
+ while (i.hasNext()) {
+ DataObject customer = (DataObject)i.next();
+ %>
+ <tr>
+ <td><%=customer.getInt("ID")%></td>
+ <td><%=customer.getString("LASTNAME")%></td>
+ <tr>
+ <%
+ }//while
+ %>
+ </tbody>
+</table>
+<%}//doDeleteExecute %>
+<!--------------------------------------------------------------------------->
+<!--doDeleteApplyChanges -->
+<%if(request.getParameter("doDeleteApplyChanges") != null){%>
+ <%try{
+ Map<String, Object> whereParams = new Hashtable<String, Object>();
+ params.clear();
+
+ whereParams.clear();
+ whereParams.put("ID", new Integer(1));
+
+ params.add("");
+ params.add("delete:CUSTOMER");//command type:tableName
+ params.add(whereParams);
+ service.getDeleteCustomerApplyChanges(params);
+ }catch(Exception e){
+ e.printStackTrace();
+ }%>
+
+<table border>
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>LastName</th>
+ </tr>
+ </thead>
+ <tbody>
+ <%
+ java.util.Iterator i = getResult();
+ while (i.hasNext()) {
+ DataObject customer = (DataObject)i.next();
+ %>
+ <tr>
+ <td><%=customer.getInt("ID")%></td>
+ <td><%=customer.getString("LASTNAME")%></td>
+ <tr>
+ <%
+ }//while
+ %>
+ </tbody>
+</table>
+<%}//doDeleteApplyChanges %>
+<!--------------------------------------------------------------------------->
+<!--doUpdateApplyChanges -->
+<%if(request.getParameter("doUpdateApplyChanges") != null){%>
+<%try{
+ Map<String, Object> updParams = new Hashtable<String, Object>();//as its not position based but name based
+ Map<String, Object> whereParams = new Hashtable<String, Object>();
+
+ params.clear();
+
+ updParams.clear();
+ updParams.put("LASTNAME", "Berry");
+
+ whereParams.put("ID", new Integer(1));
+
+ params.add("");
+ params.add("update:CUSTOMER");//command type:tableName
+ params.add(updParams);
+ params.add(whereParams);
+ System.out.println("whereParams:"+whereParams.get("ID"));
+ service.getUpdateCustomer(params);
+
+ }catch(Exception e){
+ e.printStackTrace();
+ }%>
+
+<table border>
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>LastName</th>
+ </tr>
+ </thead>
+ <tbody>
+ <%
+ java.util.Iterator i = getResult();
+ while (i.hasNext()) {
+ DataObject customer = (DataObject)i.next();
+ %>
+ <tr>
+ <td><%=customer.getInt("ID")%></td>
+ <td><%=customer.getString("LASTNAME")%></td>
+ <tr>
+ <%
+ }//while
+ %>
+ </tbody>
+</table>
+<%}//doUpdateApplyChanges %>
+<!--------------------------------------------------------------------------->
+<!--doSP -->
+<%if(request.getParameter("doSP") != null){%>
+<%try{
+ Map<Integer, Object> outParams = new Hashtable<Integer, Object>();
+ System.out.println("Calling getNamedCustomers");
+
+ params.clear();
+ inParams.clear();
+ outParams.clear();
+
+ inParams.put(1, new String("Berry"));
+
+ outParams.put(2, new Object());
+
+ params.add("");
+ params.add("procedure");
+ params.add(inParams);
+ params.add(outParams);
+
+ Object returnObj = service.getNamedCustomers(params);
+
+ //check values in OUT params
+ Map<Integer, Object> resParams = (Map<Integer, Object> )params.get(3);
+ int cnt = 0;
+ if(resParams.size() != 0){
+ Set<Integer> resSet = (Set<Integer>)resParams.keySet();
+ Iterator res = resSet.iterator();
+ Object resObj = null;
+ while(res.hasNext()){
+ Integer rdx = (Integer)res.next();
+ resObj = (Object)resParams.get(rdx);
+ System.out.println("result :"+rdx +","+resObj);
+ cnt = ((Integer)resObj).intValue();
+ }
+ }
+
+ //check value in return result
+ if(cnt > 0){
+ if(returnObj instanceof DataObject){
+ DataObject doResult = (DataObject)returnObj;
+ customers = doResult.getList("CUSTOMER");
+ java.util.Iterator i = customers.iterator();
+ System.out.println("customers:"+customers.size());
+%>
+
+<table border>
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>LastName</th>
+ </tr>
+ </thead>
+ <tbody>
+
+<% while (i.hasNext()) {
+ DataObject customer = (DataObject)i.next();
+%>
+ <tr>
+ <td><%=customer.getInt("ID")%></td>
+ <td><%=customer.getString("LASTNAME")%></td>
+ <tr>
+ <%}//while
+ }//if DataObj
+ }//if cnt
+
+}catch(Exception e){
+ e.printStackTrace();
+}%>
+
+<%}//doSP %>
+<!--------------------------------------------------------------------------->
+</form>
+</body>
+</html>
diff --git a/sandbox/lresende/backup/container.das.client/src/main/webapp/META-INF/context.xml b/sandbox/lresende/backup/container.das.client/src/main/webapp/META-INF/context.xml
new file mode 100644
index 0000000000..0e90eb0a83
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/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/sandbox/lresende/backup/container.das.client/src/main/webapp/WEB-INF/default.scdl b/sandbox/lresende/backup/container.das.client/src/main/webapp/WEB-INF/default.scdl
new file mode 100644
index 0000000000..db438a88c0
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/src/main/webapp/WEB-INF/default.scdl
@@ -0,0 +1,30 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="CustomersOrdersComposite">
+
+ <component name="CustomersOrdersComponent">
+ <implementation.das config="CustomersOrders.xml" dataAccessType="rdb"/>
+ </component>
+
+ <component name="CustomersOrdersJavaReference">
+ <implementation.java class="org.apache.tuscany.samples.das.orders.CustomersOrdersServiceImpl"/>
+ </component>
+
+</composite>
diff --git a/sandbox/lresende/backup/container.das.client/src/main/webapp/WEB-INF/web.xml b/sandbox/lresende/backup/container.das.client/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..b464b082d7
--- /dev/null
+++ b/sandbox/lresende/backup/container.das.client/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,44 @@
+<?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 Container Sample Client Application</display-name>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>Customer.jsp</welcome-file>
+ </welcome-file-list>
+
+ <!-- SCA Related configuration -->
+ <filter>
+ <filter-name>TuscanyFilter</filter-name>
+ <filter-class>org.apache.tuscany.runtime.webapp.TuscanyFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>TuscanyFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <listener>
+ <listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
+ </listener>
+ <!-- END of SCA Related configuration -->
+</web-app>
diff --git a/sandbox/lresende/backup/container.das/.ruleset b/sandbox/lresende/backup/container.das/.ruleset
new file mode 100644
index 0000000000..ac8671859d
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/.ruleset
@@ -0,0 +1,190 @@
+<?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.
+-->
+<ruleset name="pmd-eclipse">
+ <description>PMD Plugin preferences rule set</description>
+
+
+ <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
+ <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
+ <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
+<!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->
+ <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
+<!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->
+ <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
+ <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
+<!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->
+ <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
+ <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
+<!--<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>-->
+
+<!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->
+
+<!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->
+<!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->
+<!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->
+
+<!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->
+<!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->
+
+<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
+<!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->
+<!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->
+<!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->
+<!--<rule ref="rulesets/controversial.xml/SingularField"/>-->
+<!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->
+<!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->
+<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
+<!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->
+
+<!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->
+<!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->
+<!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->
+
+<!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->
+<!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->
+<!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->
+<rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
+<!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->
+<!--<rule ref="rulesets/design.xml/BadComparison"/>-->
+<!--<rule ref="rulesets/design.xml/CloseConnection"/>-->
+<!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->
+<!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->
+<rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
+<!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->
+<!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->
+<rule ref="rulesets/design.xml/IdempotentOperations"/>
+<!--<rule ref="rulesets/design.xml/ImmutableField"/>-->
+<!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->
+<!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->
+<!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->
+<!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->
+<!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->
+<rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
+<rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
+<rule ref="rulesets/design.xml/SimplifyConditional"/>
+<!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->
+<!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->
+<rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
+<!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->
+<!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->
+<!--<rule ref="rulesets/design.xml/UseSingleton"/>-->
+
+<!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->
+<!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->
+
+<!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->
+<!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->
+<!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->
+<!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->
+
+<!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->
+<!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->
+
+<!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->
+<!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->
+<!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->
+
+ <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->
+ <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->
+ <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->
+
+ <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->
+ <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->
+ <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->
+ <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->
+ <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->
+ <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->
+ <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->
+
+ <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->
+
+ <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->
+
+ <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->
+ <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->
+ <!--<rule ref="rulesets/strings.xml/StringToString"/>-->
+ <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->
+ <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->
+
+ <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->
+ <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->
+
+ <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
+ <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->
+
+</ruleset>
diff --git a/sandbox/lresende/backup/container.das/LICENSE.txt b/sandbox/lresende/backup/container.das/LICENSE.txt
new file mode 100644
index 0000000000..5f6ab3e05c
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ 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, serviceDefinition 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.
diff --git a/sandbox/lresende/backup/container.das/NOTICE.txt b/sandbox/lresende/backup/container.das/NOTICE.txt
new file mode 100644
index 0000000000..ecc68a9614
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/NOTICE.txt
@@ -0,0 +1,14 @@
+${pom.name}
+Copyright (c) 2005 - 2006 The Apache Software Foundation
+
+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.
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/sandbox/lresende/backup/container.das/README.txt b/sandbox/lresende/backup/container.das/README.txt
new file mode 100644
index 0000000000..723f3fd3ab
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/README.txt
@@ -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/sandbox/lresende/backup/container.das/pom.xml b/sandbox/lresende/backup/container.das/pom.xml
new file mode 100644
index 0000000000..ff927a7bb6
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/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>
+
+ <parent>
+ <groupId>org.apache.tuscany.sca.services.containers</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>das</artifactId>
+ <name>Apache Tuscany DAS Container</name>
+ <description>Container for Data Access Services</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-spi</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>core</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>test</artifactId>
+ <version>${sca.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.das</groupId>
+ <artifactId>tuscany-das-rdb</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java
new file mode 100644
index 0000000000..abd1a587d0
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.container.dataaccess;
+
+import static org.apache.tuscany.spi.idl.java.JavaIDLUtils.findMethod;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.apache.tuscany.container.dataaccessscript.DataAccessInstanceImpl;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.TargetResolutionException;
+import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.extension.AtomicComponentExtension;
+import org.apache.tuscany.spi.model.Operation;
+import org.apache.tuscany.spi.services.work.WorkScheduler;
+import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.WireService;
+
+/**
+ * The DAS component implementation.
+ */
+public class DataAccessComponent extends AtomicComponentExtension {
+
+ private final List<Class<?>> services;
+ //private final Map<String, Object> properties;
+
+ private DataAccessInstanceFactory factory;
+
+
+ public DataAccessComponent(String name,
+ DataAccessInstanceFactory factory,
+ /*Map<String, Object> propValues,*/
+ List<Class<?>> services,
+ CompositeComponent parent,
+ ScopeContainer scopeContainer,
+ WireService wireService,
+ WorkScheduler workScheduler,
+ WorkContext workContext) {
+ super(name, parent, /*scopeContainer,*/ wireService, workContext, workScheduler, null, 0);
+ this.factory = factory;
+ this.services = services;
+ this.scope = scopeContainer.getScope();
+ //this.properties = propValues;
+ }
+
+ public DataAccessComponent(DataAccessComponentConfiguration config) {
+ super(config.getName(),
+ config.getParent(),
+ /*config.getScopeContainer(),*/
+ config.getWireService(),
+ config.getWorkContext(),
+ config.getWorkScheduler(),
+ config.getMonitor(),
+ config.getInitLevel());
+ this.factory = config.getFactory();
+ this.services = config.getServices();
+ this.scope = config.getScopeContainer().getScope();
+ //this.properties = config.getPropertyValues();
+ }
+
+
+
+ public Object createInstance() throws ObjectCreationException {
+// Map<String, Object> context = new HashMap<String, Object>(getProperties());
+// Object instance = dataAccessAdapter.createScriptInstance(context, dataAccessAdapter.getDataAccessType());
+//
+// return instance;
+
+ return factory.getInstance();
+ }
+
+
+ public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
+ //System.out.println("operation:"+operation.getName()+operation.getMetaData());
+ //return new DataAccessInvoker(operation.getName(), this, operation.getOutputType().getPhysical().getClass());
+
+ Method[] methods = operation.getServiceContract().getInterfaceClass().getMethods();
+ Method method = findMethod(operation, methods);
+ return new DataAccessInvoker(method.getName(), this, operation.getOutputType().getPhysical().getClass());
+ }
+ // TODO: move all the following up to AtomicComponentExtension?
+ public List<Class<?>> getServiceInterfaces() {
+ return services;
+ }
+
+// public Map<String, Object> getProperties() {
+// return properties;
+// }
+
+ public Object getServiceInstance() throws TargetResolutionException {
+ return getServiceInstance(null);
+ }
+
+ @SuppressWarnings("unchecked")
+ public Object getServiceInstance(String service) throws TargetResolutionException {
+ InboundWire wire = getInboundWire(service);
+ if (wire == null) {
+ throw new TargetResolutionException("Service '" + service + "'not found"); // TODO better error message
+ }
+ Class<?> clazz = wire.getServiceContract().getInterfaceClass();
+ return wireService.createProxy(clazz, wire);
+ }
+
+ public DataAccessInstanceImpl getTargetInstance() throws TargetResolutionException {
+ return (DataAccessInstanceImpl) scopeContainer.getInstance(this);
+ }
+
+}
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentBuilder.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentBuilder.java
new file mode 100644
index 0000000000..339ca2e233
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentBuilder.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.container.dataaccess;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.tuscany.spi.builder.BuilderConfigException;
+import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
+import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.PropertyValue;
+import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.model.ServiceDefinition;
+
+/**
+ * Extension point for creating {@link DataAccessComponent}s from an assembly configuration
+ */
+public class DataAccessComponentBuilder extends ComponentBuilderExtension<DataAccessImplementation> {
+
+ protected Class<DataAccessImplementation> getImplementationType() {
+ return DataAccessImplementation.class;
+ }
+
+ @SuppressWarnings("unchecked")
+ public Component build(CompositeComponent parent,
+ ComponentDefinition<DataAccessImplementation> componentDefinition,
+ DeploymentContext deploymentContext) throws BuilderConfigException {
+
+ String name = componentDefinition.getName();
+ DataAccessImplementation implementation = componentDefinition.getImplementation();
+ DataAccessComponentType componentType = implementation.getComponentType();
+
+ // get list of services provided by this component
+ Collection<ServiceDefinition> collection = componentType.getServices().values();
+ List<Class<?>> services = new ArrayList<Class<?>>(collection.size());
+ for (ServiceDefinition serviceDefinition : collection) {
+ services.add(serviceDefinition.getServiceContract().getInterfaceClass());
+ }
+
+
+ //TODO: have ComponentBuilderExtension pass ScopeContainer in on build method?
+ ScopeContainer scopeContainer;
+ Scope scope = componentType.getLifecycleScope();
+ if (Scope.COMPOSITE == scope) {
+ scopeContainer = deploymentContext.getCompositeScope();
+ } else {
+ scopeContainer = scopeRegistry.getScopeContainer(scope);
+ }
+
+
+ //removed per jim's comments
+ //Map<String, Object> propertyValues = new Hashtable<String, Object>();
+ //Collection<PropertyValue<?>> propValueSettings = componentDefinition.getPropertyValues().values();
+ //for (PropertyValue propertyValue : propValueSettings) {
+ // propertyValues.put(propertyValue.getName(), propertyValue.getValueFactory().getInstance());
+ //}
+
+ String dasConfig = implementation.getDasConfig();
+ InputStream dasConfigStream = implementation.getDasConfigStream();
+ String dataAccessType = implementation.getDataAccessType();
+ ClassLoader cl = implementation.getClassLoader();
+
+ DataAccessInstanceFactory instanceFactory = new DataAccessInstanceFactory(dasConfig, dasConfigStream, dataAccessType, cl);
+
+
+ //get the properties for the component
+ for (PropertyValue propertyValue : componentDefinition.getPropertyValues().values()) {
+ //TODO this is not safe for since multiple instances can share mutable properties
+ instanceFactory.addContextObjectFactory(propertyValue.getName(), propertyValue.getValueFactory ());
+ }
+
+
+
+ DataAccessComponentConfiguration config = new DataAccessComponentConfiguration();
+ config.setName(name);
+ config.setFactory(instanceFactory);
+ config.setServices(services);
+ config.setParent(parent);
+ config.setScopeContainer(scopeContainer);
+ config.setWireService(wireService);
+ config.setWorkContext(workContext);
+ config.setWorkScheduler(workScheduler);
+
+ return new DataAccessComponent(config);
+ }
+}
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentConfiguration.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentConfiguration.java
new file mode 100644
index 0000000000..01ef7391f7
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentConfiguration.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.container.dataaccess;
+
+import java.util.List;
+
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.extension.ExecutionMonitor;
+import org.apache.tuscany.spi.services.work.WorkScheduler;
+import org.apache.tuscany.spi.wire.WireService;
+
+/**
+ * Configuration holder for creating script components
+ *
+ * @version $Rev: 471211 $ $Date: 2006-11-04 07:06:05 -0800 (Sat, 04 Nov 2006) $
+ */
+public class DataAccessComponentConfiguration {
+
+ private String name;
+ private DataAccessInstanceFactory factory;
+ private List<Class<?>> services;
+ //private Map<String, Object> propertyValues;
+ private CompositeComponent parent;
+ private ScopeContainer scopeContainer;
+ private WireService wireService;
+ private WorkContext workContext;
+ private WorkScheduler workScheduler;
+ private ExecutionMonitor monitor;
+ private int initLevel;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public DataAccessInstanceFactory getFactory() {
+ return factory;
+ }
+
+ public void setFactory(DataAccessInstanceFactory factory) {
+ this.factory = factory;
+ }
+
+ public List<Class<?>> getServices() {
+ return services;
+ }
+
+ public void setServices(List<Class<?>> services) {
+ this.services = services;
+ }
+
+// public Map<String, Object> getPropertyValues() {
+// return propertyValues;
+// }
+//
+// public void setPropertyValues(Map<String, Object> propValues) {
+// this.propertyValues = propValues;
+// }
+
+ public CompositeComponent getParent() {
+ return parent;
+ }
+
+ public void setParent(CompositeComponent parent) {
+ this.parent = parent;
+ }
+
+ public ScopeContainer getScopeContainer() {
+ return scopeContainer;
+ }
+
+ public void setScopeContainer(ScopeContainer scopeContainer) {
+ this.scopeContainer = scopeContainer;
+ }
+
+ public WireService getWireService() {
+ return wireService;
+ }
+
+ public void setWireService(WireService wireService) {
+ this.wireService = wireService;
+ }
+
+ public WorkContext getWorkContext() {
+ return workContext;
+ }
+
+ public void setWorkContext(WorkContext workContext) {
+ this.workContext = workContext;
+ }
+
+ public WorkScheduler getWorkScheduler() {
+ return workScheduler;
+ }
+
+ public void setWorkScheduler(WorkScheduler workScheduler) {
+ this.workScheduler = workScheduler;
+ }
+
+ public ExecutionMonitor getMonitor() {
+ return monitor;
+ }
+
+ public void setMonitor(ExecutionMonitor monitor) {
+ this.monitor = monitor;
+ }
+
+ public int getInitLevel() {
+ return initLevel;
+ }
+
+ public void setInitLevel(int initLevel) {
+ this.initLevel = initLevel;
+ }
+
+}
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentType.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentType.java
new file mode 100644
index 0000000000..7b2573fb68
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentType.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.container.dataaccess;
+
+import org.apache.tuscany.spi.model.ComponentType;
+import org.apache.tuscany.spi.model.Property;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
+import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.model.ServiceDefinition;
+
+public class DataAccessComponentType extends ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> {
+
+ private Scope lifecycleScope = Scope.COMPOSITE;
+
+ public DataAccessComponentType() {
+ }
+
+ @SuppressWarnings("unchecked")
+ public DataAccessComponentType(ComponentType ct) {
+ if(ct != null){
+ setInitLevel(ct.getInitLevel());
+ for (Object property : ct.getProperties().values()) {
+ add((Property) property);
+ }
+ for (Object reference : ct.getReferences().values()) {
+ add((ReferenceDefinition) reference);
+ }
+ for (Object service : ct.getServices().values()) {
+ add((ServiceDefinition) service);
+ }
+ }
+ }
+
+ public Scope getLifecycleScope() {
+ return lifecycleScope;
+ }
+
+ public void setLifecycleScope(Scope lifecycleScope) {
+ this.lifecycleScope = lifecycleScope;
+ }
+
+}
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentTypeLoader.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentTypeLoader.java
new file mode 100644
index 0000000000..f8521eb901
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentTypeLoader.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.container.dataaccess;
+
+import java.net.URL;
+
+import org.apache.tuscany.spi.annotation.Autowire;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
+import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
+import org.apache.tuscany.spi.loader.LoaderException;
+import org.apache.tuscany.spi.model.ComponentType;
+
+/**
+ * @version $Rev: 442514 $ $Date: 2006-09-12 13:44:43 +0530 (Tue, 12 Sep 2006) $
+ */
+public class DataAccessComponentTypeLoader extends ComponentTypeLoaderExtension<DataAccessImplementation> {
+
+ //private JavaInterfaceProcessorRegistry processorRegistry;
+
+ public DataAccessComponentTypeLoader(@Autowire JavaInterfaceProcessorRegistry processorRegistry) {
+ //this.processorRegistry = processorRegistry;
+ }
+
+ @Override
+ protected Class<DataAccessImplementation> getImplementationClass() {
+ return DataAccessImplementation.class;
+ }
+/*
+// protected String getResourceName(DataAccessImplementation implementation) {
+// return implementation.getDataAccessAdapter().getScriptName();
+// }
+
+ // TODO: must be possible to move all the following up in to ComponentTypeLoaderExtension
+
+ public void load(CompositeComponent parent,
+ DataAccessImplementation implementation,
+ DeploymentContext deploymentContext) throws LoaderException {
+
+
+ DataAccessComponentType componentType;
+ componentType = loadFromSidefile(null, deploymentContext);
+
+ implementation.setComponentType(componentType);
+ }
+
+ protected DataAccessComponentType loadFromSidefile(URL url, DeploymentContext deploymentContext) throws LoaderException {
+ ComponentType ct = loaderRegistry.load(null, null,
+ url,
+ ComponentType.class,
+ deploymentContext);
+ DataAccessComponentType dasCt = new DataAccessComponentType(ct);
+ return dasCt;
+ }
+
+// private String getSideFileName(DataAccessImplementation implementation) {
+// String baseName = getResourceName(implementation);
+// int lastDot = baseName.lastIndexOf('.');
+// if (lastDot != -1) {
+// baseName = baseName.substring(0,lastDot);
+// }
+// return baseName + ".componentType";
+// }
+*/
+
+ protected String getResourceName(DataAccessImplementation implementation) {
+ //System.out.println("config file name:"+implementation.getDasConfig());
+ return implementation.getDasConfig();
+ }
+
+ // TODO: must be possible to move all the following up in to ComponentTypeLoaderExtension
+
+ public void load(CompositeComponent parent,
+ DataAccessImplementation implementation,
+ DeploymentContext deploymentContext) throws LoaderException {
+
+ String sideFile = getSideFileName(implementation);
+ URL resource = implementation.getClassLoader().getResource(sideFile);
+ DataAccessComponentType componentType;
+
+ if (resource == null) {
+ throw new MissingSideFileException("Component type side file not found : '" + sideFile + "'");
+ // TODO: or else implement introspection
+ } else {
+ componentType = loadFromSidefile(resource, deploymentContext);
+ }
+
+ implementation.setComponentType(componentType);
+ }
+
+ protected DataAccessComponentType loadFromSidefile(URL url, DeploymentContext deploymentContext) throws LoaderException {
+ //Amita
+ DataAccessComponentType compType = new DataAccessComponentType();
+ ComponentType ct = loaderRegistry.load(null,
+ compType,
+ url,
+ ComponentType.class,
+ deploymentContext);
+ return new DataAccessComponentType(ct);
+ }
+
+ private String getSideFileName(DataAccessImplementation implementation) {
+ String baseName = getResourceName(implementation);
+ int lastDot = baseName.lastIndexOf('.');
+ if (lastDot != -1) {
+ baseName = baseName.substring(0,
+ lastDot);
+ }
+ return baseName + ".componentType";
+ }
+
+
+}
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessImplementation.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessImplementation.java
new file mode 100644
index 0000000000..6ed98b88be
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessImplementation.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.container.dataaccess;
+
+import java.io.InputStream;
+
+import org.apache.tuscany.spi.model.AtomicImplementation;
+
+/**
+ * Model object for a DataAccess implementation.
+ */
+public class DataAccessImplementation extends AtomicImplementation<DataAccessComponentType> {
+ private String dasConfig;
+ private InputStream dasConfigStream;
+ private String dataAccessType;
+ private ClassLoader classLoader;
+
+ /**
+ * @return the dasConfig
+ */
+ public String getDasConfig() {
+ return dasConfig;
+ }
+ /**
+ * @param dasConfig the dasConfig to set
+ */
+ public void setDasConfig(String dasConfig) {
+ this.dasConfig = dasConfig;
+ }
+
+ /**
+ * @return the dasConfigStream
+ */
+ public InputStream getDasConfigStream() {
+ return dasConfigStream;
+ }
+ /**
+ * @param dasConfigStream the dasConfigStream to set
+ */
+ public void setDasConfigStream(InputStream dasConfigStream) {
+ this.dasConfigStream = dasConfigStream;
+ }
+ /**
+ * @return the dataAccessType
+ */
+ public String getDataAccessType() {
+ return dataAccessType;
+ }
+ /**
+ * @param dataAccessType the dataAccessType to set
+ */
+ public void setDataAccessType(String dataAccessType) {
+ this.dataAccessType = dataAccessType;
+ }
+
+ public ClassLoader getClassLoader() {
+ return classLoader;
+ }
+
+ public void setClassLoader(ClassLoader classLoader) {
+ this.classLoader = classLoader;
+ }
+} \ No newline at end of file
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessImplementationLoader.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessImplementationLoader.java
new file mode 100644
index 0000000000..01fb6ba89e
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessImplementationLoader.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.container.dataaccess;
+
+import java.io.InputStream;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.spi.annotation.Autowire;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.LoaderExtension;
+import org.apache.tuscany.spi.loader.LoaderException;
+import org.apache.tuscany.spi.loader.LoaderRegistry;
+import org.apache.tuscany.spi.loader.LoaderUtil;
+import org.apache.tuscany.spi.loader.MissingResourceException;
+import org.apache.tuscany.spi.model.ModelObject;
+import org.osoa.sca.annotations.Constructor;
+
+/**
+ * Loader for handling JavaScript <da:implementation.da> elements.
+ *
+ * Example would be as below
+ * <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:das="http://tuscany.apache.org/xmlns/das/1.0" name="CustomersOrdersComposite">
+ * <component name="CustomersOrdersComponent">
+ * <das:implementation.das config="customersOrders/CustomersOrders.xml" dataAccessType="rdb"/>
+ * </component>
+ * </composite>
+ */
+public class DataAccessImplementationLoader extends LoaderExtension<DataAccessImplementation> {
+ private static String XML_DATAACCESS_NAMESPACE = "http://tuscany.apache.org/xmlns/das/1.0";
+ private static final QName IMPLEMENTATION_DATAACCESS = new QName(XML_DATAACCESS_NAMESPACE, "implementation.das");
+
+ @Constructor({"registry"})
+ public DataAccessImplementationLoader(@Autowire LoaderRegistry registry) {
+ super(registry);
+ }
+
+ public QName getXMLType() {
+ return IMPLEMENTATION_DATAACCESS;
+ }
+
+ public DataAccessImplementation load(CompositeComponent parent,
+ ModelObject mo,
+ XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+
+ String dasConfig = reader.getAttributeValue(null, "config");
+ String dataAccessType = reader.getAttributeValue(null, "dataAccessType");
+
+ if ( dasConfig == null ) {
+ throw new MissingResourceException("No config provided supplied");
+ }
+
+ ClassLoader cl = deploymentContext.getClassLoader();
+ InputStream dasConfigStream = loadConfig(cl, dasConfig);
+
+ LoaderUtil.skipToEndElement(reader);
+
+ DataAccessImplementation implementation = new DataAccessImplementation();
+ implementation.setDasConfig(dasConfig);
+ implementation.setDasConfigStream(dasConfigStream);
+ implementation.setDataAccessType(dataAccessType);
+ implementation.setClassLoader(cl);
+
+ registry.loadComponentType(parent, implementation, deploymentContext);
+ return implementation;
+ }
+
+ protected InputStream loadConfig(ClassLoader classLoader, String configResource) throws LoaderException {
+ return classLoader.getResourceAsStream(configResource);
+
+ }
+}
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInstance.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInstance.java
new file mode 100644
index 0000000000..6ea3bd6613
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInstance.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.container.dataaccess;
+
+
+/**
+ * An invokable instance of a script
+ *
+ * Basically just a wrapper around a BSF engine with an optional script class object.
+ */
+public interface DataAccessInstance {
+
+ public Object invokeFunction(String functionName, Object[] args, Class returnType);
+}
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInstanceFactory.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInstanceFactory.java
new file mode 100644
index 0000000000..96b1deab00
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInstanceFactory.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.container.dataaccess;
+
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuscany.container.dataaccessscript.DataAccessEngine;
+import org.apache.tuscany.container.dataaccessscript.DataAccessInstanceImpl;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+
+/**
+ * A data access script
+ */
+public class DataAccessInstanceFactory implements ObjectFactory<DataAccessInstance> {
+ protected String dasConfig;
+ protected InputStream dasConfigStream;
+ protected String dataAccessType;
+ protected ClassLoader classLoader;
+ protected Map<String, ObjectFactory> contextObjects;
+
+ private DataAccessEngine dataAccessEngine = new DataAccessEngine();
+
+ /**
+ * Create a new DataAccess object.
+ *
+ * @param dasConfig
+ * the name of the Data Access configuration file to be used
+ * @param dataAccessType
+ * what type of data access mechanism is being used (e.g rdb)
+ */
+ public DataAccessInstanceFactory(String dasConfiguration, InputStream dasConfigStream, String dataAccessType, ClassLoader classLoader) {
+ this.dasConfig = dasConfiguration;
+ this.dasConfigStream = dasConfigStream;
+ this.dataAccessType = dataAccessType;
+ this.classLoader = classLoader;
+ }
+
+ /**
+ * Create a new invokeable instance of the script <p/> objects to add to scope of the script instance
+ *
+ * @return a DataAccessInstance
+ */
+ public DataAccessInstance getInstance() throws ObjectCreationException {
+ if (dataAccessType == null) {
+ return null;
+ } else {
+ //the commented one gives STREAM CLOSED exception from xerces - in JUnit???
+ DAS das = dataAccessEngine.getDAS(dataAccessType, dasConfig);// factory, currently only for rdb
+ //DAS das = dataAccessEngine.getDAS(dataAccessType, dasConfigStream);// factory, currently only for rdb
+
+ return new DataAccessInstanceImpl(das, this.dataAccessType);
+ }
+ }
+
+ protected Map<String, Class> getResponseClasses(List<Class> services) {
+ Map<String, Class> responseClasses = new HashMap<String, Class>();
+ if (services != null) {
+ for (Class s : services) {
+ for (Method m : s.getMethods()) {
+ responseClasses.put(m.getName(), m.getReturnType());
+ }
+ }
+ }
+ return responseClasses;
+ }
+
+ public void addContextObjectFactory(String name, ObjectFactory<?> factory) {
+ contextObjects.put(name, factory);
+ }
+}
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInvoker.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInvoker.java
new file mode 100644
index 0000000000..f9d7aaf225
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInvoker.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.container.dataaccess;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.apache.tuscany.container.dataaccessscript.DataAccessInstanceImpl;
+import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.extension.TargetInvokerExtension;
+
+/**
+ * Dispatches to a DataAccessScript implementation instance
+ *
+ * @version $$Rev: 441072 $$ $$Date: 2006-09-07 18:03:39 +0530 (Thu, 07 Sep 2006) $$
+ */
+public class DataAccessInvoker extends TargetInvokerExtension {
+
+ private DataAccessComponent component;
+ private String functionName;
+ private Class returnType;
+
+
+ public DataAccessInvoker(String functionName, DataAccessComponent component, Class returnType) {
+ super(null,null,null);
+ this.functionName = functionName;
+ this.component = component;
+ this.returnType = returnType;
+ }
+
+
+ public Object invokeTarget(final Object payload, final short sequence) throws InvocationTargetException {
+ DataAccessInstanceImpl target;
+
+ //get the component
+ try{
+ target = (DataAccessInstanceImpl) component.getTargetInstance();
+ }catch(TargetException e){
+ throw new InvocationTargetException(e);
+ }
+
+ //invoke it
+ try {
+ return target.invokeFunction(functionName,
+ (Object[]) payload,
+ returnType);
+ } catch (Exception e) {
+ throw new InvocationTargetException(e);
+ }
+ }
+
+}
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/MissingSideFileException.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/MissingSideFileException.java
new file mode 100644
index 0000000000..f19cb91406
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccess/MissingSideFileException.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.container.dataaccess;
+
+import org.apache.tuscany.spi.loader.LoaderException;
+
+/**
+ * @version $Rev: 471211 $ $Date: 2006-11-04 07:06:05 -0800 (Sat, 04 Nov 2006) $
+ */
+public class MissingSideFileException extends LoaderException {
+
+ private static final long serialVersionUID = -2616590185174691724L;
+
+ public MissingSideFileException() {
+ }
+
+ public MissingSideFileException(String message) {
+ super(message);
+ }
+
+ public MissingSideFileException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public MissingSideFileException(Throwable cause) {
+ super(cause);
+ }
+}
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/CommandMapper.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/CommandMapper.java
new file mode 100644
index 0000000000..9e8565b507
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/CommandMapper.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.container.dataaccessscript;
+
+/**
+ * This class maps service APIs with the DAS config commands
+ * the logic can be more of some code generation tool type
+ * At present a simple mapping is introduced
+ */
+public class CommandMapper {
+
+ public static String getCommandName(String serviceAPIName) throws Exception{
+ int idx = serviceAPIName.indexOf("get");
+ if(idx != -1){
+ return serviceAPIName.substring(idx+3);
+ }
+ else{
+ //TODO better way to handle
+ throw new Exception("invalid service API name");
+ }
+ }
+
+ public static String getServiceAPIName(String commandName){
+ //TODO to be implemented
+ return null;
+ }
+}
+
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessEngine.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessEngine.java
new file mode 100644
index 0000000000..1302315eeb
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessEngine.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.container.dataaccessscript;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import org.apache.tuscany.das.rdb.DAS;
+
+public class DataAccessEngine {
+ public final static String SEPARATOR = ":";
+ //For RDB
+ public final static String RDB = "rdb";
+ public final static String SELECT = "select";
+ public final static String DELETE = "delete";
+ public final static String UPDATE = "update";
+ public final static String INSERT = "insert";
+ public final static String PROCEDURE = "procedure";
+
+ //For XQUERY
+ public final static String XQUERY = "xquery";
+ //...
+ //TODO...this is the place to accomodate different data access mechanisms
+
+ public final static String DERBY = "derby";
+ public final static String MySQL = "mysql";
+ //...
+ //TODO ...this is the place to accomodate different databases
+
+ public DAS getDAS(String dataAccessType, String dasConfig){
+ if(dataAccessType.equals(RDB)){
+ return DAS.FACTORY.createDAS(new ByteArrayInputStream(dasConfig.getBytes()));//i18n? //do you need cl information here
+ }
+ else{
+ //TODO ..for different mechs - need to implement
+ return null;
+ }
+ }
+
+ public DAS getDAS(String dataAccessType, InputStream dasConfigStream){
+ if(dataAccessType.equals(RDB)){
+ return DAS.FACTORY.createDAS(dasConfigStream);//i18n?
+ }
+ else{
+ //TODO ..for different mechs - need to implement
+ return null;
+ }
+ }
+}
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessInstanceImpl.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessInstanceImpl.java
new file mode 100644
index 0000000000..22300b4e56
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessInstanceImpl.java
@@ -0,0 +1,328 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.container.dataaccessscript;
+
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Vector;
+
+import org.apache.tuscany.container.dataaccess.DataAccessInstance;
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+
+import commonj.sdo.DataObject;
+/**
+ * An invokeable instance of a DataAccess config script.
+ */
+public class DataAccessInstanceImpl implements DataAccessInstance {
+
+ private DAS dasInstance;
+ private String dataAccessType;
+ private String tableName = null;
+ private String genericSelectForRoot = "select * from "+ tableName;
+
+ public DataAccessInstanceImpl(DAS das, String dataAccessType){
+ this.dasInstance = das;
+ this.dataAccessType = dataAccessType;
+ }
+
+ public Object invokeFunction(String functionName, Object[] args, Class returnType) {
+ Command cmd = null;
+ //System.out.println("functionName:"+functionName);
+
+ Vector paramsList = null;
+ if(args != null){
+ try{
+ paramsList = (Vector)args[0];
+ }catch(ClassCastException e){
+ //TODO
+ e.printStackTrace();
+ }
+ }
+
+ //if any of the 3 below - its dynamic way , else , its static way
+ if(! "execute".equals(functionName) &&
+ ! "executeQuery".equals(functionName) &&
+ ! "applyChanges".equals(functionName)){
+ //try for static way
+ try{
+ String commandName = CommandMapper.getCommandName(functionName);
+ //System.out.println("commandName:"+commandName);
+ if(paramsList != null && paramsList.size()>1 &&
+ paramsList.get(1).toString().indexOf(DataAccessEngine.SEPARATOR) == -1){
+ cmd = dasInstance.getCommand(commandName);//got in static way
+ }
+ }catch(Exception e){
+ //TODO
+ e.printStackTrace();//if command not found in config or other exception
+ }
+ }
+ else{//dynamic way
+ //upto below statement is generic DAS..but select,etc..are particular
+ //to RDBDAS
+ //TODO if no matching command is found
+ if(!((String)paramsList.get(0)).equals("")){
+ cmd = dasInstance.getCommand((String)paramsList.get(0));//got in dynamic way
+ }else{
+ //this can be insert or delete as applyChanges-dynamic way
+ }
+ }
+
+ //TODO handle better
+ //this is not error case - as can be case for dynamic/static approach with applyChanges(), where command is
+ //obtained for generic select at later point. So, don't throw exception
+ /*if(cmd == null){
+ Exception e = new Exception("No command could be found!");
+ e.printStackTrace();
+ }*/
+
+ //Particular to RDBDAS
+ if(this.dataAccessType.equals(DataAccessEngine.RDB)){
+ DataObject dataObj = null;
+ dataObj = invokeRDBDASFunction(cmd, paramsList);
+ return dataObj;
+ }
+
+ //TODO ...implement for other than RDB
+ return null;
+ }
+
+ private DataObject invokeRDBDASSelect(Command cmd, Vector paramsList){
+ DataObject dObject = null;
+
+ if(paramsList != null && paramsList.size()>=3){
+ Map<Integer, Object> inParams = new Hashtable<Integer, Object>();
+ inParams = (Map<Integer, Object>)paramsList.get(2);
+ DataAccessUtils.fromJavaToRDBDASPositionBased(inParams, cmd);
+ }
+ dObject = cmd.executeQuery();
+ if(dObject == null){
+ System.out.println("null result returned in select");
+ }
+ //dasInstance.releaseResources();
+ return dObject;
+ }
+
+ private void invokeRDBDASDeleteExecute(Command cmd, Vector paramsList){
+ if(paramsList != null && paramsList.size()>=3){
+ Map<Integer, Object> inParams = new Hashtable<Integer, Object>();
+ inParams = (Map<Integer, Object>)paramsList.get(2);
+ DataAccessUtils.fromJavaToRDBDASPositionBased(inParams, cmd);
+ }
+ cmd.execute();
+ //dasInstance.releaseResources();
+ }
+
+ private void invokeRDBDASDeleteApplyChanges(Command cmd, Vector paramsList){
+ if(paramsList != null && paramsList.size()>=3){
+ String paramsTableName = paramsList.get(1).toString();
+ int idx = paramsTableName.indexOf(DataAccessEngine.SEPARATOR);
+ tableName = paramsTableName.substring(idx+1);
+ genericSelectForRoot = "select * from "+ tableName;
+ //System.out.println("genericSelectForRoot:"+genericSelectForRoot);
+ cmd = dasInstance.createCommand(genericSelectForRoot);
+
+ //set WHERE params
+ if(paramsList.get(2) instanceof Map){
+ Map<String, Object> whereParams = (Map<String, Object>)paramsList.get(2);
+
+ String whereStr = null;
+ //TODO needs better way
+ if(whereParams != null && whereParams.size()> 0){
+ for (Iterator i = whereParams.keySet().iterator(); i.hasNext();) {
+ String idxDel = (String)i.next();
+
+ Object val = whereParams.get(idxDel);
+ whereStr = tableName+"["+val+"]";
+ //System.out.println("whereStr:"+whereStr);
+ }
+ DataObject root = cmd.executeQuery();
+ DataObject dObj = root.getDataObject(whereStr);
+ dObj.delete();
+ dasInstance.applyChanges(root);
+ }
+ }
+ }
+
+ //dasInstance.releaseResources();
+ }
+
+ private void invokeRDBDASInsertExecute(Command cmd, Vector paramsList){
+ if(paramsList != null && paramsList.size()>=3){
+ Map<Integer, Object> inParams = new Hashtable<Integer, Object>();
+ inParams = (Map<Integer, Object>)paramsList.get(2);
+ DataAccessUtils.fromJavaToRDBDASPositionBased(inParams, cmd);
+ }
+ //System.out.println("before execute insert");
+
+ cmd.execute();
+ //dasInstance.releaseResources();
+ }
+
+ private void invokeRDBDASInsertApplyChanges(Command cmd, Vector paramsList){
+ if(paramsList != null && paramsList.size()>=3){
+ String paramsTableName = paramsList.get(1).toString();
+ int idx = paramsTableName.indexOf(DataAccessEngine.SEPARATOR);
+ tableName = paramsTableName.substring(idx+1);
+ genericSelectForRoot = "select * from "+ tableName;
+ //System.out.println("genericSelectForRoot:"+genericSelectForRoot);
+ cmd = dasInstance.createCommand(genericSelectForRoot);
+
+ //set INSERT params
+ if(paramsList.get(2) instanceof Map){
+ Map<String, Object> insertParams = (Map<String, Object>)paramsList.get(2);
+ DataObject root = cmd.executeQuery();
+ DataObject insertObj = root.createDataObject(tableName);
+
+ if(insertParams != null && insertParams.size()> 0){
+ for (Iterator i = insertParams.keySet().iterator(); i.hasNext();) {
+ String idxIns = (String)i.next();
+
+ Object val = insertParams.get(idxIns);
+ //System.out.println(idxIns+","+val+val.getClass().getName());
+ insertObj.set(idxIns, val);
+ }
+
+ }
+
+ dasInstance.applyChanges(root);
+ }
+ }
+ //dasInstance.releaseResources();
+ }
+
+ private void invokeRDBDASUpdate(Command cmd, Vector paramsList){
+ if(paramsList != null && paramsList.size()>=4){
+ String paramsTableName = paramsList.get(1).toString();
+ int idx = paramsTableName.indexOf(DataAccessEngine.SEPARATOR);
+ tableName = paramsTableName.substring(idx+1);
+ genericSelectForRoot = "select * from "+ tableName;
+ //System.out.println("genericSelectForRoot:"+genericSelectForRoot);
+ cmd = dasInstance.createCommand(genericSelectForRoot);
+
+ //set UPD and WHERE params
+ if(paramsList.get(2) instanceof Map){
+ Map<String, Object> updParams = (Map<String, Object>)paramsList.get(2);
+
+ if(paramsList.get(3) instanceof Map){
+ Map<String, Object> whereParams = (Map<String, Object>)paramsList.get(3);
+ DataObject root = DataAccessUtils.fromJavaToRDBDASNameBased(updParams, whereParams, cmd, tableName);
+ dasInstance.applyChanges(root);
+ }
+ }
+ }
+ //dasInstance.releaseResources();
+ }
+
+ private DataObject invokeRDBDASProcedure(Command cmd, Vector paramsList){
+ DataObject dataObj = null;
+ if(paramsList != null && paramsList.size()>=3){
+ //set IN params
+ if(paramsList.get(2) instanceof Map){
+ Map<Integer, Object> inParams = (Map<Integer, Object>)paramsList.get(2);
+ DataAccessUtils.fromJavaToRDBDASPositionBased(inParams, cmd);
+ }
+
+ dataObj = cmd.executeQuery();
+
+ if(paramsList.size()>=4 && paramsList.get(3) instanceof Map){
+ try{
+ Map<Integer, Object> outParams = (Map<Integer, Object>)paramsList.get(3);
+ DataAccessUtils.fromRDBDASToJavaPositionBased(outParams, cmd);
+ paramsList.add(3, outParams);
+ }catch(Exception e){
+ //TODO what if map is not of proper type
+ e.printStackTrace();
+ }
+ }
+
+ //System.out.println("executed SP..");
+ }
+ //dasInstance.releaseResources();
+ return dataObj; // NOPMD
+ }
+
+ //this method detects further what exact DAS function needs to be called e.g. applyChanges(), ...
+ private DataObject invokeRDBDASFunction(Command cmd, Vector paramsList){
+ String commandKind = null;
+ commandKind = (String)paramsList.get(1);//e.g. select, update, - sim. to one in DAS config for current command
+
+
+
+ //System.out.println("commandKind:"+commandKind);
+ //static or dynamic both - executeQuery()
+ if(commandKind.equals(DataAccessEngine.SELECT)){
+ DataObject dataObj = invokeRDBDASSelect(cmd, paramsList);
+ return dataObj; //NOPMD
+ }
+
+ //Delete can happen through execute() or applyChanges()
+ if(commandKind.startsWith(DataAccessEngine.DELETE)){
+ if(paramsList.get(0).toString().equals("")){
+ if(commandKind.indexOf(DataAccessEngine.SEPARATOR) != -1){//this will be applyChanges()-static/dynamic delete:tableName - cmd has no meaning here
+ invokeRDBDASDeleteApplyChanges(cmd, paramsList);
+ }else{//this will be execute() - static
+ invokeRDBDASDeleteExecute(cmd, paramsList);
+ return null;
+ }
+ }else{//this will be execute() - dynamic
+ invokeRDBDASDeleteExecute(cmd, paramsList);
+ return null;
+ }
+
+ return null;
+ }
+
+ //Insert can happen through execute() or applyChanges()
+ if(commandKind.startsWith(DataAccessEngine.INSERT)){
+ if(paramsList.get(0).toString().equals("")){
+ if(commandKind.indexOf(DataAccessEngine.SEPARATOR) != -1){//this will be applyChanges()-static/dynamic
+ invokeRDBDASInsertApplyChanges(cmd, paramsList);
+ }
+ else{//this will be execute() - static
+ //System.out.println("calling insert execute");
+ invokeRDBDASInsertExecute(cmd, paramsList);
+ return null;
+ }
+ }
+ else{//this will be execute() - dynamic
+ //System.out.println("calling insert execute");
+ invokeRDBDASInsertExecute(cmd, paramsList);
+ return null;
+ }
+
+ return null;
+ }
+
+ if(commandKind.startsWith(DataAccessEngine.UPDATE)){//update:tableName
+ invokeRDBDASUpdate(cmd, paramsList); //cmd has no meaning here
+ return null;
+ }
+
+ if(commandKind.equals(DataAccessEngine.PROCEDURE)){//executeQuery()
+ DataObject dataObj = invokeRDBDASProcedure(cmd, paramsList);
+ return dataObj;
+ }
+
+
+ return null;
+ }
+}
+
diff --git a/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessUtils.java b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessUtils.java
new file mode 100644
index 0000000000..8d28a753f1
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/java/org/apache/tuscany/container/dataaccessscript/DataAccessUtils.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.container.dataaccessscript;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.tuscany.das.rdb.Command;
+
+import commonj.sdo.DataObject;
+
+public class DataAccessUtils {
+ //in SP - when returning result - OUT params are populated here
+ public static void fromRDBDASToJavaPositionBased(Map outParams, Command cmd){
+ if(outParams != null && outParams.size()> 0){
+ for (Iterator i = outParams.keySet().iterator(); i.hasNext();) {
+ Integer odx = (Integer)i.next();
+
+ //result can be of any Object type
+ Object outRes = null;
+ outRes = cmd.getParameter(odx);
+
+ outParams.put(odx, outRes);
+ }
+ }
+
+ }
+
+ //in SP when calling executeQuery on SP, IN params are populated here
+ public static void fromJavaToRDBDASPositionBased(Map inParams, Command cmd){
+ if(inParams != null && inParams.size()> 0){
+ for (Iterator i = inParams.keySet().iterator(); i.hasNext();) {
+ Integer idx = (Integer)i.next();
+
+ Object val = inParams.get(idx);
+ cmd.setParameter(idx, val);
+ }
+ }
+ }
+
+ //Used in UPDATE
+ public static DataObject fromJavaToRDBDASNameBased(Map updParams, Map whereParams, Command cmd, String tableName){
+ //currently where clause is only for PKs - by convention
+ String whereStr = null;
+ //TODO needs better way
+ if(whereParams != null && whereParams.size()> 0){
+ for (Iterator i = whereParams.keySet().iterator(); i.hasNext();) {
+ String idx = (String)i.next();
+
+ Object val = whereParams.get(idx);
+ whereStr = tableName+"["+val+"]";
+ //System.out.println("whereStr:"+whereStr);
+ }
+ DataObject root = cmd.executeQuery();
+ DataObject dObj = root.getDataObject(whereStr);
+
+ if(updParams != null && updParams.size()> 0){
+ for (Iterator i = updParams.keySet().iterator(); i.hasNext();) {
+ String idx = (String)i.next();
+
+ Object val = updParams.get(idx);
+ dObj.set(idx, val);
+ }
+
+ return root;
+ }
+ }
+
+ return null;
+ }
+
+ //TODO ..similarly there will be fromJavaToXQueryDAS()..and revese etc.
+}
+
diff --git a/sandbox/lresende/backup/container.das/src/main/resources/META-INF/sca/das.system.scdl b/sandbox/lresende/backup/container.das/src/main/resources/META-INF/sca/das.system.scdl
new file mode 100644
index 0000000000..1af249a1cd
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/resources/META-INF/sca/das.system.scdl
@@ -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.
+-->
+<!--
+ JavaScript configuration for the launcher environment.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+ name="org.apache.tuscany.launcher.DasImplementation">
+
+ <component name="das.implementationLoader">
+ <system:implementation.system class="org.apache.tuscany.container.dataaccess.DataAccessImplementationLoader"/>
+ </component>
+
+ <component name="das.componentTypeLoader">
+ <system:implementation.system class="org.apache.tuscany.container.dataaccess.DataAccessComponentTypeLoader"/>
+ </component>
+
+ <component name="das.componentBuilder">
+ <system:implementation.system class="org.apache.tuscany.container.dataaccess.DataAccessComponentBuilder"/>
+ </component>
+
+</composite>
diff --git a/sandbox/lresende/backup/container.das/src/main/resources/META-INF/sca/default.scdl b/sandbox/lresende/backup/container.das/src/main/resources/META-INF/sca/default.scdl
new file mode 100644
index 0000000000..a1b145a1ef
--- /dev/null
+++ b/sandbox/lresende/backup/container.das/src/main/resources/META-INF/sca/default.scdl
@@ -0,0 +1,38 @@
+<?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.
+-->
+<!--
+ DataAccess configuration for the launcher environment.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+ name="org.apache.tuscany.launcher.DataAccessImplementation">
+
+ <component name="das.implementationLoader">
+ <system:implementation.system class="org.apache.tuscany.container.dataaccess.DataAccessImplementationLoader"/>
+ </component>
+
+ <component name="das.componentTypeLoader">
+ <system:implementation.system class="org.apache.tuscany.container.dataaccess.DataAccessComponentTypeLoader"/>
+ </component>
+
+ <component name="das.componentBuilder">
+ <system:implementation.system class="org.apache.tuscany.container.dataaccess.DataAccessComponentBuilder"/>
+ </component>
+</composite> \ No newline at end of file