summaryrefslogtreecommitdiffstats
path: root/tags/java/das/1.0-incubator-M2/samples/companyweb
diff options
context:
space:
mode:
Diffstat (limited to 'tags/java/das/1.0-incubator-M2/samples/companyweb')
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/build.xml55
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/db.lckbin38 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/log/log.ctrlbin48 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/log/log1.datbin1048576 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/log/logmirror.ctrlbin48 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c10.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c101.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c111.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c121.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c130.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c141.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c150.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c161.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c171.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c180.datbin24576 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c191.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1a1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1b1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1c0.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1d1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1e0.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1f1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c20.datbin24576 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c200.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c211.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c221.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c230.datbin86016 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c241.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c251.datbin12288 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c260.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c271.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c281.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c290.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2a1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2b1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2c1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2d0.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2e1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2f0.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c300.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c31.datbin16384 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c311.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c320.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c331.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c340.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c351.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c360.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c371.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c380.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c391.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3a0.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3b1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3c0.datbin24576 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3d1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3e0.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3f1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c400.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c41.datbin16384 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c411.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c420.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c431.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c440.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c451.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c460.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c471.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c481.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c490.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c4a1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c51.datbin16384 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c60.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c71.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c81.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c90.datbin20480 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/ca1.datbin24576 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cb1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cc0.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cd1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/ce1.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cf0.datbin8192 -> 0 bytes
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/service.properties22
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/pom.xml57
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/readme.htm642
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java151
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/CompanyConfig.xml46
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt416
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/META-INF/NOTICE32
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/META-INF/README.txt35
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/log4j.properties29
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/webapp/Company.jsp158
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/webapp/META-INF/context.xml25
-rw-r--r--tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml30
91 files changed, 0 insertions, 1698 deletions
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/build.xml b/tags/java/das/1.0-incubator-M2/samples/companyweb/build.xml
deleted file mode 100644
index dd269b628e..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/build.xml
+++ /dev/null
@@ -1,55 +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 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/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/db.lck b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/db.lck
deleted file mode 100644
index 9f6b4b3d4b..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/db.lck
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/log/log.ctrl b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/log/log.ctrl
deleted file mode 100644
index edbd775299..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/log/log.ctrl
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/log/log1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/log/log1.dat
deleted file mode 100644
index 7e85ac8e8f..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/log/log1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/log/logmirror.ctrl b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/log/logmirror.ctrl
deleted file mode 100644
index edbd775299..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/log/logmirror.ctrl
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c10.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c10.dat
deleted file mode 100644
index 5d8ecaa10f..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c10.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c101.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c101.dat
deleted file mode 100644
index 0f79fa7574..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c101.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c111.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c111.dat
deleted file mode 100644
index 39d49e3d19..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c111.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c121.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c121.dat
deleted file mode 100644
index 2a4311779b..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c121.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c130.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c130.dat
deleted file mode 100644
index 64e3c18d62..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c130.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c141.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c141.dat
deleted file mode 100644
index 0632d04164..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c141.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c150.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c150.dat
deleted file mode 100644
index d7541026f6..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c150.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c161.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c161.dat
deleted file mode 100644
index 6673bf1873..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c161.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c171.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c171.dat
deleted file mode 100644
index c2a753cc5d..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c171.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c180.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c180.dat
deleted file mode 100644
index cb9391aed1..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c180.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c191.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c191.dat
deleted file mode 100644
index d3cf1d6364..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c191.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1a1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1a1.dat
deleted file mode 100644
index a7a2d536e9..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1a1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1b1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1b1.dat
deleted file mode 100644
index 19097e69e7..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1b1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1c0.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1c0.dat
deleted file mode 100644
index 359525a31a..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1c0.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1d1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1d1.dat
deleted file mode 100644
index 9f257df932..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1d1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1e0.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1e0.dat
deleted file mode 100644
index e43e52fb7f..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1e0.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1f1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1f1.dat
deleted file mode 100644
index 7e6ee3b1e0..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c1f1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c20.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c20.dat
deleted file mode 100644
index 1be6390f06..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c20.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c200.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c200.dat
deleted file mode 100644
index b15d56855c..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c200.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c211.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c211.dat
deleted file mode 100644
index 84b0022312..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c211.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c221.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c221.dat
deleted file mode 100644
index 63106a9523..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c221.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c230.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c230.dat
deleted file mode 100644
index 9975f27c1f..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c230.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c241.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c241.dat
deleted file mode 100644
index 835c645a16..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c241.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c251.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c251.dat
deleted file mode 100644
index d3d6adf4fb..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c251.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c260.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c260.dat
deleted file mode 100644
index 8d7333df7d..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c260.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c271.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c271.dat
deleted file mode 100644
index af722f7d73..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c271.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c281.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c281.dat
deleted file mode 100644
index 3972983c2e..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c281.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c290.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c290.dat
deleted file mode 100644
index 31577b8124..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c290.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2a1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2a1.dat
deleted file mode 100644
index 0f700d13a7..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2a1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2b1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2b1.dat
deleted file mode 100644
index 1d6382fb3d..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2b1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2c1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2c1.dat
deleted file mode 100644
index 3bc60d886b..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2c1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2d0.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2d0.dat
deleted file mode 100644
index c542d3c91c..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2d0.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2e1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2e1.dat
deleted file mode 100644
index 16abd20b5f..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2e1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2f0.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2f0.dat
deleted file mode 100644
index eb26be5932..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c2f0.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c300.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c300.dat
deleted file mode 100644
index 1214f1df4b..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c300.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c31.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c31.dat
deleted file mode 100644
index 18c16f1123..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c31.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c311.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c311.dat
deleted file mode 100644
index 926cbf25b5..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c311.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c320.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c320.dat
deleted file mode 100644
index 07e7bc023c..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c320.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c331.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c331.dat
deleted file mode 100644
index fd827f9dc2..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c331.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c340.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c340.dat
deleted file mode 100644
index ca70319886..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c340.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c351.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c351.dat
deleted file mode 100644
index 8fbe2a527c..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c351.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c360.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c360.dat
deleted file mode 100644
index dcf9c746e1..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c360.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c371.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c371.dat
deleted file mode 100644
index 6f21a840ea..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c371.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c380.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c380.dat
deleted file mode 100644
index b512e8065f..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c380.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c391.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c391.dat
deleted file mode 100644
index 27006e95a1..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c391.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3a0.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3a0.dat
deleted file mode 100644
index 565dca97ac..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3a0.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3b1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3b1.dat
deleted file mode 100644
index 36894c9818..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3b1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3c0.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3c0.dat
deleted file mode 100644
index d0c538aede..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3c0.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3d1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3d1.dat
deleted file mode 100644
index 65bcec5527..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3d1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3e0.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3e0.dat
deleted file mode 100644
index bdab359420..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3e0.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3f1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3f1.dat
deleted file mode 100644
index dc2d278b57..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c3f1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c400.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c400.dat
deleted file mode 100644
index 3072709cec..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c400.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c41.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c41.dat
deleted file mode 100644
index 61086690f2..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c41.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c411.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c411.dat
deleted file mode 100644
index ca551d8249..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c411.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c420.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c420.dat
deleted file mode 100644
index f04de0840e..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c420.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c431.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c431.dat
deleted file mode 100644
index 398b1672cc..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c431.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c440.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c440.dat
deleted file mode 100644
index af259d0872..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c440.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c451.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c451.dat
deleted file mode 100644
index 772a18c658..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c451.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c460.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c460.dat
deleted file mode 100644
index 505428362d..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c460.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c471.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c471.dat
deleted file mode 100644
index 484d0df42d..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c471.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c481.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c481.dat
deleted file mode 100644
index faac073076..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c481.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c490.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c490.dat
deleted file mode 100644
index 7585319d21..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c490.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c4a1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c4a1.dat
deleted file mode 100644
index 4fe8b786e3..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c4a1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c51.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c51.dat
deleted file mode 100644
index 7fc7937b15..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c51.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c60.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c60.dat
deleted file mode 100644
index d1fb08c946..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c60.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c71.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c71.dat
deleted file mode 100644
index d4c2090a3b..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c71.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c81.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c81.dat
deleted file mode 100644
index 38b6ea6520..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c81.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c90.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c90.dat
deleted file mode 100644
index a607a5969c..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/c90.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/ca1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/ca1.dat
deleted file mode 100644
index 19b4c9e340..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/ca1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cb1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cb1.dat
deleted file mode 100644
index 73dc986572..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cb1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cc0.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cc0.dat
deleted file mode 100644
index d1eef3bb56..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cc0.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cd1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cd1.dat
deleted file mode 100644
index c7e6db3ef7..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cd1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/ce1.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/ce1.dat
deleted file mode 100644
index 8fd3bf17a8..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/ce1.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cf0.dat b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cf0.dat
deleted file mode 100644
index 332b3d9a8a..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/seg0/cf0.dat
+++ /dev/null
Binary files differ
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/service.properties b/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/service.properties
deleted file mode 100644
index 8cfe3b09a5..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/dastest/service.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#C:\apacheSVN\java\target\dastest
-# ********************************************************************
-# *** Please do NOT edit this file. ***
-# *** CHANGING THE CONTENT OF THIS FILE MAY CAUSE DATA CORRUPTION. ***
-# ********************************************************************
-#Fri Feb 17 08:55:29 MST 2006
-SysschemasIndex2Identifier=225
-SyscolumnsIdentifier=144
-SysconglomeratesIndex1Identifier=49
-SysconglomeratesIdentifier=32
-SyscolumnsIndex2Identifier=177
-SysschemasIndex1Identifier=209
-SysconglomeratesIndex3Identifier=81
-SystablesIndex2Identifier=129
-SyscolumnsIndex1Identifier=161
-derby.serviceProtocol=org.apache.derby.database.Database
-SysschemasIdentifier=192
-derby.storage.propertiesId=16
-SysconglomeratesIndex2Identifier=65
-derby.serviceLocale=en_US
-SystablesIdentifier=96
-SystablesIndex1Identifier=113
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/pom.xml b/tags/java/das/1.0-incubator-M2/samples/companyweb/pom.xml
deleted file mode 100644
index adbfe32a74..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/pom.xml
+++ /dev/null
@@ -1,57 +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>
-
- <parent>
- <groupId>org.apache.tuscany.das.samples</groupId>
- <artifactId>tuscany-samples-das</artifactId>
- <version>1.0-incubator-M2</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>sample-companyweb</artifactId>
- <packaging>war</packaging>
- <name>Tuscany DAS Company Sample</name>
- <description>Sample use of RDB DAS in a Web application</description>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.das</groupId>
- <artifactId>tuscany-das-rdb</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
-
- </dependencies>
-
- <!-- this will place the java source files inside the war -->
- <build>
- <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/tags/java/das/1.0-incubator-M2/samples/companyweb/readme.htm b/tags/java/das/1.0-incubator-M2/samples/companyweb/readme.htm
deleted file mode 100644
index daaba81b4c..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/readme.htm
+++ /dev/null
@@ -1,642 +0,0 @@
-<html xmlns:v="urn:schemas-microsoft-com:vml"
-xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:st1="urn:schemas-microsoft-com:office:smarttags"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 10">
-<meta name=Originator content="Microsoft Word 10">
-<link rel=File-List href="readme_files/filelist.xml">
-<title>Tuscany RDB DAS Sample</title>
-<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
- name="City"/>
-<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
- name="State"/>
-<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
- name="place"/>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Author>IBM_USER</o:Author>
- <o:LastAuthor>IBM_USER</o:LastAuthor>
- <o:Revision>3</o:Revision>
- <o:TotalTime>16</o:TotalTime>
- <o:Created>2006-10-19T16:54:00Z</o:Created>
- <o:LastSaved>2006-10-19T17:10:00Z</o:LastSaved>
- <o:Pages>1</o:Pages>
- <o:Words>714</o:Words>
- <o:Characters>4076</o:Characters>
- <o:Company>IBM</o:Company>
- <o:Lines>33</o:Lines>
- <o:Paragraphs>9</o:Paragraphs>
- <o:CharactersWithSpaces>4781</o:CharactersWithSpaces>
- <o:Version>10.6735</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:SpellingState>Clean</w:SpellingState>
- <w:GrammarState>Clean</w:GrammarState>
- <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
- </w:WordDocument>
-</xml><![endif]--><!--[if !mso]><object
- classid="clsid:38481807-CA0E-42D2-BF39-B33AF135CC4D" id=ieooui></object>
-<style>
-st1\:*{behavior:url(#ieooui) }
-</style>
-<![endif]-->
-<style>
-<!--
- /* Style Definitions */
- p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-h1
- {mso-style-next:Normal;
- margin-top:12.0pt;
- margin-right:0in;
- margin-bottom:3.0pt;
- margin-left:0in;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:1;
- font-size:16.0pt;
- font-family:Arial;
- mso-font-kerning:16.0pt;}
-h3
- {mso-style-next:Normal;
- margin-top:12.0pt;
- margin-right:0in;
- margin-bottom:3.0pt;
- margin-left:0in;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:3;
- font-size:13.0pt;
- font-family:Arial;}
-p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
- {mso-style-noshow:yes;
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-span.MsoFootnoteReference
- {mso-style-noshow:yes;
- vertical-align:super;}
-a:link, span.MsoHyperlink
- {color:blue;
- text-decoration:underline;
- text-underline:single;}
-a:visited, span.MsoHyperlinkFollowed
- {color:purple;
- text-decoration:underline;
- text-underline:single;}
-code
- {font-family:"Courier New";
- mso-ascii-font-family:"Courier New";
- mso-fareast-font-family:"Times New Roman";
- mso-hansi-font-family:"Courier New";
- mso-bidi-font-family:"Courier New";}
-pre
- {margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Courier New";
- mso-fareast-font-family:"Times New Roman";}
-span.codefrag
- {mso-style-name:codefrag;}
-span.SpellE
- {mso-style-name:"";
- mso-spl-e:yes;}
-span.GramE
- {mso-style-name:"";
- mso-gram-e:yes;}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
- /* List Definitions */
- @list l0
- {mso-list-id:61222257;
- mso-list-template-ids:-241238724;}
-@list l1
- {mso-list-id:109520856;
- mso-list-type:hybrid;
- mso-list-template-ids:2095364756 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l1:level1
- {mso-level-tab-stop:1.0in;
- mso-level-number-position:left;
- margin-left:1.0in;
- text-indent:-.25in;}
-@list l2
- {mso-list-id:203906862;
- mso-list-template-ids:1109012252;}
-@list l2:level1
- {mso-level-start-at:8;
- mso-level-tab-stop:.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l3
- {mso-list-id:415592251;
- mso-list-template-ids:-511440876;}
-@list l4
- {mso-list-id:646667692;
- mso-list-type:hybrid;
- mso-list-template-ids:-728441462 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l4:level1
- {mso-level-number-format:bullet;
- mso-level-text:\F0B7;
- mso-level-tab-stop:.5in;
- mso-level-number-position:left;
- text-indent:-.25in;
- font-family:Symbol;}
-@list l4:level2
- {mso-level-tab-stop:1.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l4:level3
- {mso-level-tab-stop:1.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l4:level4
- {mso-level-tab-stop:2.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l4:level5
- {mso-level-tab-stop:2.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l4:level6
- {mso-level-tab-stop:3.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l4:level7
- {mso-level-tab-stop:3.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l4:level8
- {mso-level-tab-stop:4.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l4:level9
- {mso-level-tab-stop:4.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5
- {mso-list-id:975526902;
- mso-list-type:hybrid;
- mso-list-template-ids:1435802096 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l5:level1
- {mso-level-tab-stop:.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level2
- {mso-level-tab-stop:1.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level3
- {mso-level-tab-stop:1.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level4
- {mso-level-tab-stop:2.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level5
- {mso-level-tab-stop:2.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level6
- {mso-level-tab-stop:3.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level7
- {mso-level-tab-stop:3.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level8
- {mso-level-tab-stop:4.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level9
- {mso-level-tab-stop:4.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6
- {mso-list-id:1305811547;
- mso-list-type:hybrid;
- mso-list-template-ids:1677090400 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l6:level1
- {mso-level-tab-stop:.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level2
- {mso-level-number-format:alpha-lower;
- mso-level-tab-stop:1.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level3
- {mso-level-number-format:roman-lower;
- mso-level-tab-stop:1.5in;
- mso-level-number-position:right;
- text-indent:-9.0pt;}
-@list l6:level4
- {mso-level-tab-stop:2.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level5
- {mso-level-tab-stop:2.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level6
- {mso-level-tab-stop:3.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level7
- {mso-level-tab-stop:3.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level8
- {mso-level-tab-stop:4.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level9
- {mso-level-tab-stop:4.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l7
- {mso-list-id:1519539635;
- mso-list-template-ids:-91987502;}
-@list l7:level2
- {mso-level-number-format:alpha-lower;
- mso-level-tab-stop:1.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l8
- {mso-list-id:1545750289;
- mso-list-template-ids:642011556;}
-@list l8:level1
- {mso-level-number-format:bullet;
- mso-level-text:\F0B7;
- mso-level-tab-stop:.5in;
- mso-level-number-position:left;
- text-indent:-.25in;
- mso-ansi-font-size:10.0pt;
- font-family:Symbol;}
-@list l9
- {mso-list-id:1605966365;
- mso-list-type:hybrid;
- mso-list-template-ids:14685132 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l9:level1
- {mso-level-tab-stop:.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level2
- {mso-level-tab-stop:1.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level3
- {mso-level-tab-stop:1.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level4
- {mso-level-tab-stop:2.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level5
- {mso-level-tab-stop:2.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level6
- {mso-level-tab-stop:3.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level7
- {mso-level-tab-stop:3.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level8
- {mso-level-tab-stop:4.0in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level9
- {mso-level-tab-stop:4.5in;
- mso-level-number-position:left;
- text-indent:-.25in;}
-ol
- {margin-bottom:0in;}
-ul
- {margin-bottom:0in;}
--->
-</style>
-<!--[if gte mso 10]>
-<style>
- /* Style Definitions */
- table.MsoNormalTable
- {mso-style-name:"Table Normal";
- mso-tstyle-rowband-size:0;
- mso-tstyle-colband-size:0;
- mso-style-noshow:yes;
- mso-style-parent:"";
- mso-padding-alt:0in 5.4pt 0in 5.4pt;
- mso-para-margin:0in;
- mso-para-margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Times New Roman";}
-</style>
-<![endif]--><!--[if gte mso 9]><xml>
- <u1:shapelayout u2:ext="edit">
- <u1:idmap u2:ext="edit" data="1"/>
- </u1:shapelayout>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="2050"/>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapelayout v:ext="edit">
- <o:idmap v:ext="edit" data="1"/>
- </o:shapelayout></xml><![endif]-->
-</head>
-
-<body lang=EN-US link=blue vlink=purple style='tab-interval:.5in'>
-
-<div class=Section1><!--
-
-
-<p class=MsoNormal><span style="font-size: 9pt">&nbsp;</span></p>
-<pre><a name="header-text">Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-&quot;License&quot;); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-&quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License. </a></pre>
-<p class=MsoNormal><span style="font-size: 9pt"><br>
-&nbsp;</span></p>
-<p class=MsoNormal><span style='font-size:9.0pt'>
-<o:p>&nbsp;</o:p></span></p>
-
--->
-
-<h1><st1:State><st1:place><st1:State><st1:place>Tuscany</st1:place></st1:State></st1:place></st1:State>
-RDB DAS Sample (<span class=SpellE>companyweb</span>)<o:p></o:p></h1>
-
-<p class=MsoNormal><u3:p>&nbsp;</u3:p></p>
-
-<p class=MsoNormal>This stand-alone sample demonstrates the SDO RDB Data Access
-Service in the context of a simple web application.<o:p></o:p></p>
-
-<p class=MsoNormal><u3:p>&nbsp;</u3:p></p>
-
-<p class=MsoNormal>The application starts with a canned database of Companies
-and their related Departments.<span style='mso-spacerun:yes'>  </span>Through
-the web page interface, a user can:<o:p></o:p></p>
-
-<p class=MsoNormal><u3:p>&nbsp;</u3:p></p>
-
-<ol style='margin-top:0in' start=1 type=1>
- <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list .5in'>Display
- all Companies in the database</li>
- <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list .5in'>Display
- all Companies and related Departments</li>
- <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list .5in'>Add a
- new Department to a Company</li>
- <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list .5in'>Delete
- all Departments from a Company</li>
- <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list .5in'>Change
- the names of Departments in a Company<o:p></o:p></li>
-</ol>
-
-<p class=MsoNormal><u3:p>&nbsp;</u3:p></p>
-
-<p class=MsoNormal>So, this simple application covers all CRUD operations as
-well as the some relationship manipulation (adding a Department associates that
-Department with the Company).<span style='mso-spacerun:yes'>  </span>The sample
-runs on Tomcat 5.5 and employs a <st1:City><st1:place><st1:City><st1:place>Derby</st1:place></st1:City></st1:place></st1:City>
-database accessed via a DataSource.</p>
-
-<h1>Running the sample</h1>
-
-<p class=MsoNormal>There are two options for running this sample:<o:p></o:p></p>
-
-<p class=MsoNormal><u3:p>&nbsp;</u3:p></p>
-
-<ol style='margin-top:0in' start=1 type=1>
- <li class=MsoNormal style='mso-list:l9 level1 lfo6;tab-stops:list .5in'>Run
- from Tomcat configured by the build</li>
- <li class=MsoNormal style='mso-list:l9 level1 lfo6;tab-stops:list .5in'>Deploying
- the <span class=SpellE>CompanyWeb</span> WAR into a Tomcat you configure
- yourself</li>
-</ol>
-
-<h3>Running from Tomcat configured by the build<u3:p></u3:p></h3>
-
-<p class=MsoNormal>This sample application is deployed (along with the canned
-test database) to an instance of Tomcat as part of our automated sample
-testing.<span style='mso-spacerun:yes'>  </span>This means you can run the
-java/<span class=SpellE>das</span>/samples/testing/tomcat build (see
-java/das/samples/testing/tomcat/<span class=GramE>readme.htm )</span><span
-style='mso-spacerun:yes'>  </span>and then access the application by pointing
-your browser to <span class=MsoHyperlink>http://localhost:8080/sample-companyweb/</span>.<span
-style='mso-spacerun:yes'>  </span></p>
-
-<h3>Deploying the <span class=SpellE>CompanyWeb</span> WAR into a Tomcat you
-configure yourself</h3>
-
-<p class=MsoNormal>Alternatively, you can deploy the sample to your own
-configured Tomcat installation by following the instructions below.<span
-style='mso-spacerun:yes'>  </span>These instructions assume that you have
-downloaded the Tuscany sample distribution or 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>
-
-<h1><span style='font-size:12.0pt;mso-bidi-font-size:16.0pt;font-family:"Times New Roman";
-mso-bidi-font-family:Arial;mso-font-kerning:0pt'>Set Up<u3:p></u3:p></span></h1>
-
-<ol style='margin-top:0in' start=1 type=1>
- <li class=MsoNormal style='mso-list:l6 level1 lfo9;tab-stops:list .5in'>Download
- and install the most recent stable version of Tomcat 5.5.<span
- style='mso-spacerun:yes'>  </span>You can find it here: <a
- href="http://tomcat.apache.org/download-55.cgi">http://tomcat.apache.org/download-55.cgi</a></li>
- <li class=MsoNormal style='mso-list:l6 level1 lfo9;tab-stops:list .5in'>Download
- the most recent official release of <st1:City><st1:place>Derby</st1:place></st1:City>
- from here: <a href="http://db.apache.org/derby/index.html">http://db.apache.org/derby/index.html</a>.<span
- style='mso-spacerun:yes'>  </span>The only file you’ll need from this
- download is <span class=SpellE>derby.jar</span></li>
- <li class=MsoNormal style='mso-list:l6 level1 lfo9;tab-stops:list .5in'>Stop
- Tomcat</li>
- <li class=MsoNormal style='mso-list:l6 level1 lfo9;tab-stops:list .5in'>Copy <span
- class=SpellE>derby.jar</span> (from the derby distribution) to {<span
- class=SpellE>Tomcat_Home</span>}/common/lib:</li>
- <li class=MsoNormal style='mso-list:l6 level1 lfo9;tab-stops:list .5in'>Add
- the sample war file to {<span class=SpellE>Tomcat_Home</span>}/<span
- class=SpellE>webapps</span></li>
- <ol style='margin-top:0in' start=1 type=a>
- <li class=MsoNormal style='mso-list:l6 level2 lfo9;tab-stops:list 1.0in'>sample-<span
- class=SpellE>companyweb-xxx.war</span> (e.g. “sample-companyweb-1.0-incubator-M2.war”)</li>
- </ol>
- <li class=MsoNormal style='mso-list:l6 level1 lfo9;tab-stops:list .5in'>Install
- the canned <st1:City><st1:place>Derby</st1:place></st1:City> database to
- Tomcat: </li>
- <ol style='margin-top:0in' start=1 type=a>
- <li class=MsoNormal style='mso-list:l6 level2 lfo9;tab-stops:list 1.0in'>Create
- {<span class=SpellE>Tomcat_Home</span>}/Databases</li>
- <li class=MsoNormal style='mso-list:l6 level2 lfo9;tab-stops:list 1.0in'>Copy
- the <span class=SpellE>dastest</span> folder (and all its contents) from
- {build directory root}/java/<span class=SpellE>das/samples/companyweb</span>
- to {<span class=SpellE>Tomcat_Home</span>}/Databases.<span
- style='mso-spacerun:yes'>   </span><br>
- <br>
- <b style='mso-bidi-font-weight:normal'>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>
-</ol>
-
-<p class=MsoNormal style='margin-left:.75in'><o:p>&nbsp;</o:p></p>
-
-<ol style='margin-top:0in' start=7 type=1>
- <li class=MsoNormal style='mso-list:l6 level1 lfo9;tab-stops:list .5in'>Define
- a DataSource by adding a <span class=SpellE>datasource</span> definition
- to {<span class=SpellE><span class=codefrag>Tomcat_Home</span></span><span
- class=codefrag>}/conf/<span class=SpellE>server.xml</span></span>.</li>
- <ol style='margin-top:0in' start=1 type=a>
- <li class=MsoNormal style='mso-list:l6 level2 lfo9;tab-stops:list 1.0in'>Find
- the end-of-section marker <span class=codefrag>&lt;/<span class=SpellE>GlobalNamingResources</span>&gt;</span>
- and add the following lines just above it: <o:p></o:p></li>
- </ol>
-</ol>
-
-<p class=MsoNormal style='margin-left:.5in'><u3:p>&nbsp;</u3:p></p>
-
-<pre><span style='mso-spacerun:yes'>        </span><span class=GramE><span
-style='font-size:9.0pt'>&lt;!--</span></span><span style='font-size:9.0pt'> Global <span
-class=SpellE>Datasource</span> for <st1:City><st1:place>Derby</st1:place></st1:City> <span
-class=SpellE>dastest</span> database --&gt;<u3:p></u3:p></span></pre><pre><span
-style='font-size:9.0pt'><span style='mso-spacerun:yes'>         </span>&lt;Resource name=&quot;<span
-class=SpellE>jdbc/dastest</span>&quot;<u3:p></u3:p></span></pre><pre><span
-style='font-size:9.0pt'><span style='mso-spacerun:yes'>              </span><span
-class=GramE>type</span>=&quot;<span class=SpellE>javax.sql.DataSource</span>&quot;<span style='mso-spacerun:yes'>  </span>auth=&quot;Container&quot;<u3:p></u3:p></span></pre><pre><span
-style='font-size:9.0pt'><span style='mso-spacerun:yes'>              </span><span
-class=GramE>description</span>=&quot;<st1:City><st1:place>Derby</st1:place></st1:City> database for DAS Company sample&quot;<u3:p></u3:p></span></pre><pre><span
-style='font-size:9.0pt'><span style='mso-spacerun:yes'>              </span><span
-class=SpellE><span class=GramE>maxActive</span></span>=&quot;100&quot; <span
-class=SpellE>maxIdle</span>=&quot;30&quot; <span class=SpellE>maxWait</span>=&quot;10000&quot;<u3:p></u3:p></span></pre><pre><span
-style='font-size:9.0pt'><span style='mso-spacerun:yes'>              </span>username=&quot;&quot; password=&quot;&quot; <u3:p></u3:p></span></pre><pre><span
-style='font-size:9.0pt'><span style='mso-spacerun:yes'>              </span><span
-class=SpellE><span class=GramE>driverClassName</span></span>=&quot;<span
-class=SpellE>org.apache.derby.jdbc.EmbeddedDriver</span>&quot;<u3:p></u3:p></span></pre><pre><span
-style='font-size:9.0pt'><span style='mso-spacerun:yes'>              </span><span
-class=SpellE><span class=GramE>url</span></span>=&quot;<span class=SpellE>jdbc:derby:Databases/dastest</span>&quot;/&gt;<u3:p></u3:p></span></pre>
-
-<p class=MsoNormal><o:p>&nbsp;</o:p></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span
-style='mso-spacerun:yes'> </span><b style='mso-bidi-font-weight:normal'>NOTE</b>:
-You must include the absolute path to the “Databases” directory in the above <span
-class=SpellE><span class=GramE>url</span></span> attribute.<span
-style='mso-spacerun:yes'>  </span>Fore example:<o:p></o:p></p>
-
-<p class=MsoNormal style='margin-left:.5in'><u3:p>&nbsp;</u3:p></p>
-
-<pre><span style='mso-spacerun:yes'>         </span><span class=SpellE>url</span>=&quot;jdbc:derby:c:\apache-tomcat-5.5.17\Databases/dastest&quot;/&gt;</pre><u3:p></u3:p>
-
-<p class=MsoNormal style='margin-left:.5in'><span
-style='mso-spacerun:yes'> </span></p>
-
-<ol style='margin-top:0in' start=8 type=1>
- <li class=MsoNormal style='mso-list:l6 level1 lfo9;tab-stops:list .5in'>Start
- tomcat and point your browser to: <a
- href="http://localhost:8080/sample-companyweb-%7bversion%20tag%7d/"><span
- style='color:windowtext;text-decoration:none;text-underline:none'>http://localhost:8080/sample-companyweb-{version
- tag}/</span></a><o:p></o:p></li>
-</ol>
-
-<p class=MsoNormal style='margin-left:1.5in'><o:p>&nbsp;</o:p></p>
-
-<p class=MsoNormal style='margin-left:1.5in'><span class=GramE>example</span>: <span
-class=MsoHyperlink>http://localhost:8080/sample-companyweb-1.0-incubator-M2/</span><o:p></o:p></p>
-
-<p class=MsoNormal style='margin-left:1.0in'><u3:p>&nbsp;</u3:p></p>
-
-<h1>Sample Architecture</h1>
-
-<p class=MsoNormal>This is a simple, single-page, web application.<span
-style='mso-spacerun:yes'>  </span>The main components of this application are:</p>
-
-<ul style='margin-top:0in' type=disc>
- <li class=MsoNormal style='mso-list:l4 level1 lfo15;tab-stops:list .5in'>The
- RDB Data Access Service (DAS)</li>
- <li class=MsoNormal style='mso-list:l4 level1 lfo15;tab-stops:list .5in'>SDO</li>
- <li class=MsoNormal style='mso-list:l4 level1 lfo15;tab-stops:list .5in'><span
- class=SpellE>CompanyClient.java</span></li>
- <li class=MsoNormal style='mso-list:l4 level1 lfo15;tab-stops:list .5in'><span
- class=SpellE>Company.jsp</span></li>
- <li class=MsoNormal style='mso-list:l4 level1 lfo15;tab-stops:list .5in'>The
- canned <st1:City><st1:place>Derby</st1:place></st1:City> database<o:p></o:p></li>
-</ul>
-
-<p class=MsoNormal><u3:p>&nbsp;</u3:p><o:p></o:p></p>
-
-<p class=MsoNormal><u3:p>&nbsp;</u3:p></p>
-
-<p class=MsoNormal>The <span class=SpellE><b style='mso-bidi-font-weight:normal'>CompanyClient</b></span>
-uses the <b style='mso-bidi-font-weight:normal'>DAS</b> directly and provides
-high-level services to the <span class=SpellE>jsp</span> such as:</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span class=GramE>public</span>
-final List <span class=SpellE>getCompanies</span>()</p>
-
-<p class=MsoNormal>This is a good place to look for how you might use the DAS
-in your own application.<o:p></o:p></p>
-
-<p class=MsoNormal style='margin-left:.5in'><u3:p>&nbsp;</u3:p></p>
-
-<p class=MsoNormal>The <span class=SpellE><b style='mso-bidi-font-weight:normal'>Company.jsp</b></span>
-responds to client interaction by invoking services of the <span class=SpellE>CompanyClient</span>.<span
-style='mso-spacerun:yes'>  </span>It receives data from the <span class=SpellE>CompanyClient</span>
-as SDO data graphs and manipulates SDOs directly to display data.<o:p></o:p></p>
-
-<p class=MsoNormal><u3:p>&nbsp;</u3:p></p>
-
-<p class=MsoNormal>The canned <st1:City><st1:place><b style='mso-bidi-font-weight:
-normal'>Derby</st1:place></st1:City> database</b> comes preloaded with
-Companies and related Departments.<span style='mso-spacerun:yes'>  </span>The <st1:City><st1:place>Derby</st1:place></st1:City>
-database instance is a simple file folder.<o:p></o:p></p>
-
-<p class=MsoNormal><u3:p>&nbsp;</u3:p></p>
-
-<p class=MsoNormal>The <b style='mso-bidi-font-weight:normal'>DAS</b> accepts
-directives (commands) from the <span class=SpellE><b style='mso-bidi-font-weight:
-normal'>CompanyClient</b></span><b style='mso-bidi-font-weight:normal'> </b>and
-reads and writes to the derby database instance appropriately.<b
-style='mso-bidi-font-weight:normal'> </b></p>
-
-<u3:p></u3:p></div>
-
-</body>
-
-</html>
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java b/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java
deleted file mode 100644
index d0519ecc08..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java
+++ /dev/null
@@ -1,151 +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 org.apache.tuscany.samples.das.companyweb;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.DAS;
-
-import commonj.sdo.DataObject;
-
-public class CompanyClient {
-
- private Random generator = new Random();
-
- private DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"));
-
- public final List getCompanies() {
-
- Command read = das.getCommand("all companies");
- DataObject root = read.executeQuery();
- return root.getList("COMPANY");
-
- }
-
- public final List getCompaniesWithDepartments() {
-
- Command read = das.getCommand("all companies and departments");
- DataObject root = read.executeQuery();
- return root.getList("COMPANY");
- }
-
- public final List getDepartmentsForCompany(int id) {
- Command read = das.getCommand("all departments for company");
- read.setParameter(1, new Integer(id));
- DataObject root = read.executeQuery();
- return root.getList("COMPANY");
- }
-
- public final void addDepartmentToFirstCompany() {
- Command read = das.getCommand("all companies and departments");
- DataObject root = read.executeQuery();
- DataObject firstCustomer = root.getDataObject("COMPANY[1]");
-
- DataObject newDepartment = root.createDataObject("DEPARTMENT");
- newDepartment.setString("NAME", "Default Name");
- firstCustomer.getList("departments").add(newDepartment);
-
- das.applyChanges(root);
-
- }
-
- public final void deleteDepartmentsFromFirstCompany() {
-
- // This section gets the ID of the first Company just so I can
- // demonstrate a parameterized command next
- Command readAll = das.getCommand("all companies and departments");
- DataObject root = readAll.executeQuery();
- int idOfFirstCustomer = root.getInt("COMPANY[1]/ID");
- System.out.println("ID of first company is: " + idOfFirstCustomer);
-
- // Read a specific company based on the known ID
- Command readCust = das.getCommand("company by id with departments");
- readCust.setParameter(1, new Integer(idOfFirstCustomer));
- root = readCust.executeQuery();
-
- // Delete all the comany's departments from the graph
- DataObject firstCustomer = root.getDataObject("COMPANY[1]");
-
- // Shallow copy of list for deleting. This is required to avoid the
- // dreaded
- // ConcurrentModificationException since #delete operation also removes
- // from the original list
- List allDepartments = new ArrayList(firstCustomer.getList("departments"));
-
- Iterator i = allDepartments.iterator();
- DataObject department;
- while (i.hasNext()) {
- department = (DataObject) i.next();
- System.out.println("Deleting department named: " + department.getString("NAME"));
- department.delete();
- }
-
- das.applyChanges(root);
-
- }
-
- public final void changeFirstCompanysDepartmentNames() {
-
- // This section gets the ID of the first Company just so I can
- // demonstrate a parameterized command next
- Command readAll = das.getCommand("all companies and departments");
- DataObject root = readAll.executeQuery();
- int idOfFirstCustomer = root.getInt("COMPANY[1]/ID");
- System.out.println("ID of first company is: " + idOfFirstCustomer);
-
- // Read a specific company based on the known ID
- Command readCust = das.getCommand("company by id with departments");
- readCust.setParameter(1, new Integer(idOfFirstCustomer));
- root = readCust.executeQuery();
-
- // Modify all the comany's department names
- DataObject firstCustomer = root.getDataObject("COMPANY[1]");
- Iterator i = firstCustomer.getList("departments").iterator();
- DataObject department;
- while (i.hasNext()) {
- department = (DataObject) i.next();
- System.out.println("Modifying department: " + department.getString("NAME"));
- department.setString("NAME", getRandomDepartmentName());
- }
- das.applyChanges(root);
-
- }
-
-
- public void releaseResources() {
- das.releaseResources();
- }
-
- // Utilities
-
- private String getRandomDepartmentName() {
- int number = generator.nextInt(1000) + 1;
- return "Dept-" + number;
- }
-
- private InputStream getConfig(String fileName) {
- return getClass().getClassLoader().getResourceAsStream(fileName);
- }
-
-}
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/CompanyConfig.xml b/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/CompanyConfig.xml
deleted file mode 100644
index 1992ab02cd..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/CompanyConfig.xml
+++ /dev/null
@@ -1,46 +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 xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <ConnectionInfo dataSource="java:comp/env/jdbc/dastest"/>
-
- <Command name="all companies" SQL="select * from COMPANY" kind="Select"/>
-
- <Command name="all companies and departments" SQL="select * from COMPANY left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID" kind="Select"/>
-
- <Command name="all departments for company" SQL="select * from COMPANY inner join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID = ?" kind="Select"/>
-
- <Command name="company by id with departments" SQL="select * from COMPANY left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID = ?" kind="Select"/>
-
-
- <Table tableName="COMPANY">
- <Column columnName="ID" primaryKey="true" generated="true"/>
- </Table>
-
- <Table tableName="DEPARTMENT">
- <Column columnName="ID" primaryKey="true" generated="true"/>
- </Table>
-
- <Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT" many="true">
- <KeyPair primaryKeyColumn="ID" foreignKeyColumn="COMPANYID"/>
- </Relationship>
-
-
-</Config>
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt b/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index bdec70a4fa..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,416 +0,0 @@
-
- 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.
-
-===============================================================================================================
-
-
-License for the Service Data Objects JavaDoc and Interface Definition files.
-
-Permission to copy, make derivative works of, and distribute the Service Data Objects
-JavaDoc and Interface Definition Files files in any medium without fee or royalty as part
-of a compliant implementation of the Service Data Objects Specification is hereby granted.
-The Service Data Objects Specification may be found at any of the following locations:
-
-http://dev2dev.bea.com/technologies/commonj/index.jsp
-http://www.ibm.com/developerworks/library/specification/ws-sdo/
-http://oracle.com/technology/webservices/sca
-https://www.sdn.sap.com/
-http://www.xcalia/xdn/specs/sdo
-
-THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES
-ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS
-SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES AND THE IMPLEMENTATION OF THEIR CONTENTS,
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE
-SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or
-publicity pertaining to the Service Component Architecture Specification or its contents without specific,
-written prior permission. Title to copyright in the Service Data Objects Specification and the
-JavaDoc and Interface Definition Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-=================================================================================================================
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
-===================================================================================================
-
-Common Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
- a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
- b) in the case of each subsequent Contributor:
-
- i) changes to the Program, and
-
- ii) additions to the Program;
-
- where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
- a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
- b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
- c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
- d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
- a) it complies with the terms and conditions of this Agreement; and
-
- b) its license agreement:
-
- i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
- ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
- iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
- iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
- a) it must be made available under this Agreement; and
-
- b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
-
-
-
-
-
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/META-INF/NOTICE b/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index f1aa4f1921..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,32 +0,0 @@
-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/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/META-INF/README.txt b/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/META-INF/README.txt
deleted file mode 100644
index 107de8c3ca..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/META-INF/README.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-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/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/log4j.properties b/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/log4j.properties
deleted file mode 100644
index 5c49df303c..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,29 +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.
-#
-# 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/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/webapp/Company.jsp b/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/webapp/Company.jsp
deleted file mode 100644
index 58db88c623..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/webapp/Company.jsp
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<html>
-<head>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-
- pageEncoding="ISO-8859-1"
-
- import="org.apache.tuscany.samples.das.companyweb.CompanyClient"
- import="commonj.sdo.*"
-%>
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Company Test</title>
-</head>
-<body>
-
-<H2>Tuscany DAS Companies WEB Example</H2>
-
-
-<form>
-<input type="submit" id="doFill" name="doFill" value="All Companies">
-<input type="submit" id="doFillAll" name="doFillAll" value="All Companies/Departments">
-<input type="submit" id="doAddDepartment" name="doAddDepartment" value="Add department to first company">
-<input type="submit" id="doChangeDepartmentNames" name="doChangeDepartmentNames" value="Change Company(1) Dept names">
-<input type="submit" id="doDeleteDepartments" name="doDeleteDepartments" value="Delete Company(1) Depts">
-<hr>
-
-<!-- Do Fill -->
-<%if(request.getParameter("doFill") != null){%>
-
-<table border>
- <thead>
- <tr>
- <th>ID</th>
- <th>Name</th>
- </tr>
- </thead>
- <tbody>
-
- <%
- CompanyClient companyClient = new CompanyClient();
- java.util.Iterator i = companyClient.getCompaniesWithDepartments().iterator();
- while (i.hasNext()) {
- DataObject company = (DataObject)i.next();
- %>
- <tr>
- <td><%=company.getInt("ID")%></td>
- <td><%=company.getString("NAME")%></td>
- <tr>
- <%
- }
- companyClient.releaseResources();
- %>
-
- </tbody>
-</table>
-<%}%>
-
-
-<!-- Do Add Department -->
-<%
-if(request.getParameter("doAddDepartment") != null){
- CompanyClient companyClient = new CompanyClient();
- companyClient.addDepartmentToFirstCompany();
- companyClient.releaseResources();
-}
-%>
-
-<!-- Do Delete Departments from first company -->
-<%
-if(request.getParameter("doDeleteDepartments") != null){
- CompanyClient companyClient = new CompanyClient();
- companyClient.deleteDepartmentsFromFirstCompany();
- companyClient.releaseResources();
-}
-%>
-
-<!-- Do Change First Company's Department Names -->
-<%
-if(request.getParameter("doChangeDepartmentNames") != null){
- CompanyClient companyClient = new CompanyClient();
- companyClient.changeFirstCompanysDepartmentNames();
- companyClient.releaseResources();
-}
-%>
-
-
-<!-- Do FillAll -->
-<%if(request.getParameter("doFill") == null) {%>
-
-<table border>
- <thead>
- <tr>
- <th>ID</th>
- <th>Name</th>
- <th>Department_ID</th>
- <th>Department_Name</th>
- </tr>
- </thead>
- <tbody>
-
- <%
- CompanyClient companyClient = new CompanyClient();
- java.util.Iterator i = companyClient.getCompaniesWithDepartments().iterator();
- while (i.hasNext()) {
- DataObject company = (DataObject)i.next();
- %>
- <tr>
- <td><%=company.getInt("ID")%></td>
- <td><%=company.getString("NAME")%></td>
- <tr>
-
-
-
- <%
- java.util.Iterator j = company.getList("departments").iterator();
- while (j.hasNext()) {
- DataObject department = (DataObject)j.next();
- %>
- <tr>
- <td></td><td></td><td><%=department.getInt("ID")%></td>
- <td><%=department.getString("NAME")%></td>
- <tr>
- <%
- }
- %>
- <%
- }
- companyClient.releaseResources();
- %>
-
- </tbody>
-</table>
-<%}%>
-
-
-
-</form>
-</body>
-</html>
diff --git a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/webapp/META-INF/context.xml b/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/webapp/META-INF/context.xml
deleted file mode 100644
index 5f0af32dd5..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/webapp/META-INF/context.xml
+++ /dev/null
@@ -1,25 +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.
- -->
-<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/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml b/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index dc7e488fef..0000000000
--- a/tags/java/das/1.0-incubator-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
- <display-name>Tuscany DAS sample Company WEB</display-name>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>Company.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>