summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.0.1/samples/company-das
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.0.1/samples/company-das')
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/pom.xml99
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/readme.html110
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/main/java/das/DASService.java61
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/main/java/das/DASServiceException.java37
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/main/java/das/DASServiceImpl.java146
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/main/resources/dasservice.composite34
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/java/das/DASServiceTestCase.java53
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/CompanyConfig.xml52
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/db.lckbin38 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/log/log.ctrlbin48 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/log/log1.datbin1048576 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/log/logmirror.ctrlbin48 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c10.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c101.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c111.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c121.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c130.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c141.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c150.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c161.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c171.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c180.datbin24576 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c191.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1a1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1b1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1c0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1d1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1e0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1f1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c20.datbin24576 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c200.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c211.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c221.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c230.datbin86016 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c241.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c251.datbin12288 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c260.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c271.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c281.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c290.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2a1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2b1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2c1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2d0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2e1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2f0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c300.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c31.datbin16384 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c311.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c320.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c331.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c340.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c351.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c360.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c371.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c380.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c391.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3a0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3b1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3c0.datbin24576 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3d1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3e0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3f1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c400.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c41.datbin16384 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c411.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c420.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c431.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c440.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c451.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c460.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c471.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c481.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c490.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c4a1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c51.datbin16384 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c60.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c71.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c81.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c90.datbin20480 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/ca1.datbin24576 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cb1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cc0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cd1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/ce1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cf0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/service.properties39
87 files changed, 0 insertions, 631 deletions
diff --git a/branches/sca-java-1.0.1/samples/company-das/pom.xml b/branches/sca-java-1.0.1/samples/company-das/pom.xml
deleted file mode 100644
index 68721e7189..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/pom.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>sample-company-das</artifactId>
- <name>Apache Tuscany SCA Company Data Access Service Sample</name>
- <packaging>jar</packaging>
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.das</groupId>
- <artifactId>tuscany-das-rdb</artifactId>
- <version>1.0-incubating-beta2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.2.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>das.DASServiceClient</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/branches/sca-java-1.0.1/samples/company-das/readme.html b/branches/sca-java-1.0.1/samples/company-das/readme.html
deleted file mode 100644
index ec6b492b72..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/readme.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Tuscany RDB DAS exposed as an SCA service</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 exposed as an SCA service</h1>
-
-
-<h3>Introduction</h3>
-
-<p>This is a sample SCA service that exposes DAS functionality.</p>
-<p>This service would allow you to utilize DAS in a language neutral fashion, consuming existent or adHoc commands.</p>
-
-
-<h3>Consuming the DAS service</h3>
-
-
-<p>You should add the dependency on your client project pom file</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>In order to consume the service, you would have to create a SCDL that references it, see sample below:</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>
-
-
-<h3>Sample Architecture</h3>
-
-<p>This service utilizes the following Interface as its definition:</p>
-
-
-<p>
-<div class="codebox2">
-<pre>
-
-public interface DASService {
-
- public void configureService(InputStream configStream) throws DASServiceException;
-
- public DataObject executeCommand(String commandName, Vector commandArguments) throws DASServiceException;
-
- public DataObject execute(String adHocQuery, Vector commandArguments) throws DASServiceException;
-
- public void applyChanges(DataObject graphRoot) throws DASServiceException;
-
-}
-</pre>
-</div>
-</p>
-
-</body>
-
-</html>
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/main/java/das/DASService.java b/branches/sca-java-1.0.1/samples/company-das/src/main/java/das/DASService.java
deleted file mode 100644
index 0387341b87..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/main/java/das/DASService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package das;
-
-import java.io.InputStream;
-import java.util.Vector;
-
-import commonj.sdo.DataObject;
-
-public interface DASService {
-
- /**
- * Set DAS configuration file to be used
- * @param configStream
- * @throws DASServiceException
- */
- public void configureService(InputStream configStream) throws DASServiceException;
-
- /**
- * Execute an existing command. The commands are defined in the DAS Configuration file being used by the service
- * @param commandName Command name as it appears on the DAS Configuration file
- * @param commandArguments Vector with arguments to be used by the command
- * @throws DASServiceException
- * @return
- */
- public DataObject executeCommand(String commandName, Vector commandArguments) throws DASServiceException;
-
- /**
- * Execute a new command, this can be any arbitrary valid query based on the backend implementation (e.g. SQL Query for DAS RDB)
- * @param adHocQuery A new command to be executed (e.g SQL Query)
- * @param commandArguments Vector with arguments to be used by the command
- * @throws DASServiceException
- * @return
- */
- public DataObject execute(String adHocQuery, Vector commandArguments) throws DASServiceException;
-
- /**
- * Apply all changes on the graph back to the persistent repository.
- * This would save the changes on the SDO ChangeSummary back to the database
- * Note: Your SDO ojects should have been created with ChangeSummary support
- * @param graphRoot SDO Object with changes to be commited to persistent repository
- * @throws DASServiceException
- */
- public void applyChanges(DataObject graphRoot) throws DASServiceException;
-}
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/main/java/das/DASServiceException.java b/branches/sca-java-1.0.1/samples/company-das/src/main/java/das/DASServiceException.java
deleted file mode 100644
index e62201a4de..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/main/java/das/DASServiceException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package das;
-
-public class DASServiceException extends Exception {
-
- private static final long serialVersionUID = -7514653215235902874L;
-
- public DASServiceException() {
- super();
- }
-
- public DASServiceException(String msg) {
- super(msg);
- }
-
- public DASServiceException(String msg, Throwable ex) {
- super(msg, ex);
- }
-
-}
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/main/java/das/DASServiceImpl.java b/branches/sca-java-1.0.1/samples/company-das/src/main/java/das/DASServiceImpl.java
deleted file mode 100644
index 70d9e379ef..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/main/java/das/DASServiceImpl.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package das;
-
-import java.io.InputStream;
-import java.util.Vector;
-
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.DAS;
-import org.osoa.sca.annotations.Scope;
-
-import commonj.sdo.DataObject;
-
-@Scope("COMPOSITE")
-public class DASServiceImpl implements DASService {
-
- protected DAS das = null;
-
-
- /**
- * Initialize DAS
- * @return
- * @throws DASServiceException
- */
- private void initDAS(InputStream config) throws DASServiceException {
- if(config == null){
- throw new DASServiceException("Missing configuration information");
- }
-
- if(this.das != null){
- this.das.releaseResources();
- this.das = null;
- }
-
- this.das = DAS.FACTORY.createDAS(config);
- }
-
- /**
- * Get a DAS instance based on the configuration
- * @return
- * @throws DASServiceException
- */
- private DAS getDAS() throws DASServiceException {
- if(this.das == null){
- throw new DASServiceException("DAS not initialized. Please provide DAS configuration torugh das.SetConfig");
- }
-
- return this.das;
- }
-
- /**
- * Set DAS configuration file to be used
- * @param configStream
- * @throws DASServiceException
- */
- public void configureService(InputStream configStream) throws DASServiceException{
- this.initDAS(configStream);
- }
-
-
-
- /**
- * Execute an existing command. The commands are defined in the DAS Configuration file being used by the service
- * @param commandName Command name as it appears on the DAS Configuration file
- * @param commandArguments Vector with arguments to be used by the command
- * @throws DASServiceException
- * @return
- */
- public DataObject executeCommand(String commandName, Vector commandArguments) throws DASServiceException{
- Command command = this.getDAS().getCommand(commandName);
-
- if(command == null){
- throw new DASServiceException("Invalid command: " + commandName);
- }
-
- //check if arguments was passed
- if(commandArguments != null && commandArguments.size() > 0){
- //we need to set the arguments
- int pos=0;
- for(Object argument : commandArguments){
- pos++;
- command.setParameter(pos, argument);
- }
- }
-
- DataObject root = command.executeQuery();
-
- return root;
- }
-
- /**
- * Execute a new command, this can be any arbitrary valid query based on the backend implementation (e.g. SQL Query for DAS RDB)
- * @param newCommand A new command to be executed (e.g SQL Query)
- * @param commandArguments Vector with arguments to be used by the command
- * @throws DASServiceException
- * @return
- */
- public DataObject execute(String adHocQuery, Vector commandArguments) throws DASServiceException {
- Command command = this.getDAS().createCommand(adHocQuery);
-
- if(command == null){
- throw new DASServiceException("Invalid command: " + adHocQuery);
- }
-
- //check if arguments was passed
- if(commandArguments != null && commandArguments.size() > 0){
- //we need to set the arguments
- int pos=0;
- for(Object argument : commandArguments){
- pos++;
- command.setParameter(pos, argument);
- }
- }
- DataObject root = command.executeQuery();
-
- return root;
- }
-
- /**
- * Apply all changes on the graph back to the persistent repository.
- * This would save the changes on the SDO ChangeSummary back to the database
- * Note: Your SDO ojects should have been created with ChangeSummary support
- * @throws DASServiceException
- * @param graphRoot SDO Object with changes to be commited to persistent repository
- */
- public void applyChanges(DataObject graphRoot) throws DASServiceException{
- // TODO Auto-generated method stub
-
- }
-}
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/main/resources/dasservice.composite b/branches/sca-java-1.0.1/samples/company-das/src/main/resources/dasservice.composite
deleted file mode 100644
index 42ac52a756..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/main/resources/dasservice.composite
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://das-service"
- xmlns:das-service="http://das-service"
- name="DASService">
-
- <service name="DASService" promote="DASServiceComponent">
- <interface.java interface="das.DASService"/>
- <reference>DASServiceComponent</reference>
- </service>
-
- <component name="DASServiceComponent">
- <implementation.java class="das.DASServiceImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/java/das/DASServiceTestCase.java b/branches/sca-java-1.0.1/samples/company-das/src/test/java/das/DASServiceTestCase.java
deleted file mode 100644
index 38acde3eb0..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/java/das/DASServiceTestCase.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package das;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import commonj.sdo.DataObject;
-
-public class DASServiceTestCase extends TestCase {
-
- SCADomain scaDomain;
- private DASService dasService;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("dasservice.composite");
- dasService = scaDomain.getService(DASService.class, "DASServiceComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void testDAS() throws Exception{
- dasService.configureService(getClass().getResourceAsStream("/CompanyConfig.xml"));
- DataObject root = dasService.executeCommand("all companies", null);
- List companyList = root.getList("COMPANY");
-
- assertNotNull(companyList);
- assertEquals(3,companyList.size());
- }
-}
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/CompanyConfig.xml b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/CompanyConfig.xml
deleted file mode 100644
index 912e81e9f6..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/CompanyConfig.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd">
-
- <ConnectionInfo>
- <ConnectionProperties
- driverClass="org.apache.derby.jdbc.EmbeddedDriver"
- databaseURL="jdbc:derby:target/test-classes/dastest;create=true"
- loginTimeout="600000"/>
- </ConnectionInfo>
-
-
- <Command name="all companies" SQL="select * from COMPANY" kind="Select"/>
-
- <Command name="all companies and departments" SQL="select * from COMPANY left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID" kind="Select"/>
-
- <Command name="all departments for company" SQL="select * from COMPANY inner join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID = ?" kind="Select"/>
-
- <Command name="company by id with departments" SQL="select * from COMPANY left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID = ?" kind="Select"/>
-
-
- <Table tableName="COMPANY">
- <Column columnName="ID" primaryKey="true" generated="true"/>
- </Table>
-
- <Table tableName="DEPARTMENT">
- <Column columnName="ID" primaryKey="true" generated="true"/>
- </Table>
-
- <Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT" many="true">
- <KeyPair primaryKeyColumn="ID" foreignKeyColumn="COMPANYID"/>
- </Relationship>
-
-
-</Config>
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/db.lck b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/db.lck
deleted file mode 100644
index 9f6b4b3d4b..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/db.lck
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/log/log.ctrl b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/log/log.ctrl
deleted file mode 100644
index edbd775299..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/log/log.ctrl
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/log/log1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/log/log1.dat
deleted file mode 100644
index 7e85ac8e8f..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/log/log1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl
deleted file mode 100644
index edbd775299..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c10.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c10.dat
deleted file mode 100644
index 5d8ecaa10f..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c10.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c101.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c101.dat
deleted file mode 100644
index 0f79fa7574..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c101.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c111.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c111.dat
deleted file mode 100644
index 39d49e3d19..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c111.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c121.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c121.dat
deleted file mode 100644
index 2a4311779b..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c121.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c130.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c130.dat
deleted file mode 100644
index 64e3c18d62..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c130.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c141.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c141.dat
deleted file mode 100644
index 0632d04164..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c141.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c150.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c150.dat
deleted file mode 100644
index d7541026f6..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c150.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c161.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c161.dat
deleted file mode 100644
index 6673bf1873..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c161.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c171.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c171.dat
deleted file mode 100644
index c2a753cc5d..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c171.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c180.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c180.dat
deleted file mode 100644
index cb9391aed1..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c180.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c191.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c191.dat
deleted file mode 100644
index d3cf1d6364..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c191.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat
deleted file mode 100644
index a7a2d536e9..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat
deleted file mode 100644
index 19097e69e7..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat
deleted file mode 100644
index 359525a31a..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat
deleted file mode 100644
index 9f257df932..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat
deleted file mode 100644
index e43e52fb7f..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat
deleted file mode 100644
index 7e6ee3b1e0..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c20.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c20.dat
deleted file mode 100644
index 1be6390f06..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c20.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c200.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c200.dat
deleted file mode 100644
index b15d56855c..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c200.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c211.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c211.dat
deleted file mode 100644
index 84b0022312..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c211.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c221.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c221.dat
deleted file mode 100644
index 63106a9523..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c221.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c230.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c230.dat
deleted file mode 100644
index 9975f27c1f..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c230.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c241.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c241.dat
deleted file mode 100644
index 835c645a16..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c241.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c251.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c251.dat
deleted file mode 100644
index d3d6adf4fb..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c251.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c260.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c260.dat
deleted file mode 100644
index 8d7333df7d..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c260.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c271.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c271.dat
deleted file mode 100644
index af722f7d73..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c271.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c281.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c281.dat
deleted file mode 100644
index 3972983c2e..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c281.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c290.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c290.dat
deleted file mode 100644
index 31577b8124..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c290.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat
deleted file mode 100644
index 0f700d13a7..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat
deleted file mode 100644
index 1d6382fb3d..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat
deleted file mode 100644
index 3bc60d886b..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat
deleted file mode 100644
index c542d3c91c..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat
deleted file mode 100644
index 16abd20b5f..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat
deleted file mode 100644
index eb26be5932..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c300.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c300.dat
deleted file mode 100644
index 1214f1df4b..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c300.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c31.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c31.dat
deleted file mode 100644
index 18c16f1123..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c31.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c311.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c311.dat
deleted file mode 100644
index 926cbf25b5..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c311.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c320.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c320.dat
deleted file mode 100644
index 07e7bc023c..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c320.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c331.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c331.dat
deleted file mode 100644
index fd827f9dc2..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c331.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c340.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c340.dat
deleted file mode 100644
index ca70319886..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c340.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c351.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c351.dat
deleted file mode 100644
index 8fbe2a527c..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c351.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c360.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c360.dat
deleted file mode 100644
index dcf9c746e1..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c360.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c371.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c371.dat
deleted file mode 100644
index 6f21a840ea..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c371.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c380.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c380.dat
deleted file mode 100644
index b512e8065f..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c380.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c391.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c391.dat
deleted file mode 100644
index 27006e95a1..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c391.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat
deleted file mode 100644
index 565dca97ac..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat
deleted file mode 100644
index 36894c9818..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat
deleted file mode 100644
index d0c538aede..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat
deleted file mode 100644
index 65bcec5527..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat
deleted file mode 100644
index bdab359420..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat
deleted file mode 100644
index dc2d278b57..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c400.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c400.dat
deleted file mode 100644
index 3072709cec..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c400.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c41.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c41.dat
deleted file mode 100644
index 61086690f2..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c41.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c411.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c411.dat
deleted file mode 100644
index ca551d8249..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c411.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c420.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c420.dat
deleted file mode 100644
index f04de0840e..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c420.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c431.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c431.dat
deleted file mode 100644
index 398b1672cc..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c431.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c440.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c440.dat
deleted file mode 100644
index af259d0872..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c440.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c451.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c451.dat
deleted file mode 100644
index 772a18c658..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c451.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c460.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c460.dat
deleted file mode 100644
index 505428362d..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c460.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c471.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c471.dat
deleted file mode 100644
index 484d0df42d..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c471.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c481.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c481.dat
deleted file mode 100644
index faac073076..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c481.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c490.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c490.dat
deleted file mode 100644
index 7585319d21..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c490.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat
deleted file mode 100644
index 4fe8b786e3..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c51.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c51.dat
deleted file mode 100644
index 7fc7937b15..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c51.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c60.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c60.dat
deleted file mode 100644
index d1fb08c946..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c60.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c71.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c71.dat
deleted file mode 100644
index d4c2090a3b..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c71.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c81.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c81.dat
deleted file mode 100644
index 38b6ea6520..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c81.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c90.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c90.dat
deleted file mode 100644
index a607a5969c..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/c90.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/ca1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/ca1.dat
deleted file mode 100644
index 19b4c9e340..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/ca1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cb1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cb1.dat
deleted file mode 100644
index 73dc986572..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cb1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cc0.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cc0.dat
deleted file mode 100644
index d1eef3bb56..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cc0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cd1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cd1.dat
deleted file mode 100644
index c7e6db3ef7..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cd1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/ce1.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/ce1.dat
deleted file mode 100644
index 8fd3bf17a8..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/ce1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cf0.dat b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cf0.dat
deleted file mode 100644
index 332b3d9a8a..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/seg0/cf0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/service.properties b/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/service.properties
deleted file mode 100644
index af9511d9c7..0000000000
--- a/branches/sca-java-1.0.1/samples/company-das/src/test/resources/dastest/service.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#C:\apacheSVN\java\target\dastest
-# ********************************************************************
-# *** Please do NOT edit this file. ***
-# *** CHANGING THE CONTENT OF THIS FILE MAY CAUSE DATA CORRUPTION. ***
-# ********************************************************************
-#Fri Feb 17 08:55:29 MST 2006
-SysschemasIndex2Identifier=225
-SyscolumnsIdentifier=144
-SysconglomeratesIndex1Identifier=49
-SysconglomeratesIdentifier=32
-SyscolumnsIndex2Identifier=177
-SysschemasIndex1Identifier=209
-SysconglomeratesIndex3Identifier=81
-SystablesIndex2Identifier=129
-SyscolumnsIndex1Identifier=161
-derby.serviceProtocol=org.apache.derby.database.Database
-SysschemasIdentifier=192
-derby.storage.propertiesId=16
-SysconglomeratesIndex2Identifier=65
-derby.serviceLocale=en_US
-SystablesIdentifier=96
-SystablesIndex1Identifier=113