summaryrefslogtreecommitdiffstats
path: root/branches/java-post-M1/samples/das
diff options
context:
space:
mode:
Diffstat (limited to 'branches/java-post-M1/samples/das')
-rw-r--r--branches/java-post-M1/samples/das/build.xml26
-rw-r--r--branches/java-post-M1/samples/das/companyweb/build.xml52
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/db.lckbin0 -> 38 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/log/log.ctrlbin0 -> 48 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/log/log1.datbin0 -> 1048576 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/log/logmirror.ctrlbin0 -> 48 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c10.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c101.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c111.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c121.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c130.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c141.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c150.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c161.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c171.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c180.datbin0 -> 24576 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c191.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1a1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1b1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1c0.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1d1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1e0.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1f1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c20.datbin0 -> 24576 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c200.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c211.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c221.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c230.datbin0 -> 86016 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c241.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c251.datbin0 -> 12288 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c260.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c271.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c281.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c290.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2a1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2b1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2c1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2d0.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2e1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2f0.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c300.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c31.datbin0 -> 16384 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c311.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c320.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c331.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c340.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c351.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c360.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c371.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c380.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c391.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3a0.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3b1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3c0.datbin0 -> 24576 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3d1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3e0.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3f1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c400.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c41.datbin0 -> 16384 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c411.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c420.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c431.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c440.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c451.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c460.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c471.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c481.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c490.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c4a1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c51.datbin0 -> 16384 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c60.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c71.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c81.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/c90.datbin0 -> 20480 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/ca1.datbin0 -> 24576 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/cb1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/cc0.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/cd1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/ce1.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/seg0/cf0.datbin0 -> 8192 bytes
-rw-r--r--branches/java-post-M1/samples/das/companyweb/dastest/service.properties22
-rw-r--r--branches/java-post-M1/samples/das/companyweb/pom.xml42
-rw-r--r--branches/java-post-M1/samples/das/companyweb/readme.htm810
-rw-r--r--branches/java-post-M1/samples/das/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java149
-rw-r--r--branches/java-post-M1/samples/das/companyweb/src/main/resources/CompanyConfig.xml43
-rw-r--r--branches/java-post-M1/samples/das/companyweb/src/main/resources/META-INF/LICENSE.txt1277
-rw-r--r--branches/java-post-M1/samples/das/companyweb/src/main/resources/META-INF/NOTICE18
-rw-r--r--branches/java-post-M1/samples/das/companyweb/src/main/resources/META-INF/README.txt35
-rw-r--r--branches/java-post-M1/samples/das/companyweb/src/main/webapp/Company.jsp157
-rw-r--r--branches/java-post-M1/samples/das/companyweb/src/main/webapp/META-INF/context.xml22
-rw-r--r--branches/java-post-M1/samples/das/companyweb/src/main/webapp/WEB-INF/web.xml27
-rw-r--r--branches/java-post-M1/samples/das/pom.xml34
92 files changed, 2714 insertions, 0 deletions
diff --git a/branches/java-post-M1/samples/das/build.xml b/branches/java-post-M1/samples/das/build.xml
new file mode 100644
index 0000000000..7f06f24c0c
--- /dev/null
+++ b/branches/java-post-M1/samples/das/build.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<project name="samples" default="compile">
+
+ <target name="compile">
+ <ant dir="companyweb"/>
+ </target>
+
+ <target name="clean">
+ <ant dir="companyweb" target="clean"/>
+ </target>
+</project>
diff --git a/branches/java-post-M1/samples/das/companyweb/build.xml b/branches/java-post-M1/samples/das/companyweb/build.xml
new file mode 100644
index 0000000000..afc88122f7
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/build.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<project name="samples" default="compile">
+ <property name="mainDir" value="../../.."/>
+ <path id="javac.classpath">
+ <fileset dir="${mainDir}/lib">
+ <include name="tuscany-runtime-incubating-M1.jar"/>
+ </fileset>
+ </path>
+ <path id="java.classpath">
+ <fileset dir="${mainDir}/lib">
+ <include name="tuscany-runtime-incubating-M1.jar"/>
+ </fileset>
+ <pathelement path="target/sample-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/branches/java-post-M1/samples/das/companyweb/dastest/db.lck b/branches/java-post-M1/samples/das/companyweb/dastest/db.lck
new file mode 100644
index 0000000000..9f6b4b3d4b
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/db.lck
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/log/log.ctrl b/branches/java-post-M1/samples/das/companyweb/dastest/log/log.ctrl
new file mode 100644
index 0000000000..edbd775299
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/log/log.ctrl
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/log/log1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/log/log1.dat
new file mode 100644
index 0000000000..7e85ac8e8f
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/log/log1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/log/logmirror.ctrl b/branches/java-post-M1/samples/das/companyweb/dastest/log/logmirror.ctrl
new file mode 100644
index 0000000000..edbd775299
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/log/logmirror.ctrl
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c10.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c10.dat
new file mode 100644
index 0000000000..5d8ecaa10f
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c10.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c101.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c101.dat
new file mode 100644
index 0000000000..0f79fa7574
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c101.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c111.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c111.dat
new file mode 100644
index 0000000000..39d49e3d19
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c111.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c121.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c121.dat
new file mode 100644
index 0000000000..2a4311779b
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c121.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c130.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c130.dat
new file mode 100644
index 0000000000..64e3c18d62
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c130.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c141.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c141.dat
new file mode 100644
index 0000000000..0632d04164
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c141.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c150.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c150.dat
new file mode 100644
index 0000000000..d7541026f6
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c150.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c161.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c161.dat
new file mode 100644
index 0000000000..6673bf1873
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c161.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c171.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c171.dat
new file mode 100644
index 0000000000..c2a753cc5d
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c171.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c180.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c180.dat
new file mode 100644
index 0000000000..cb9391aed1
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c180.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c191.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c191.dat
new file mode 100644
index 0000000000..d3cf1d6364
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c191.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1a1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1a1.dat
new file mode 100644
index 0000000000..a7a2d536e9
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1a1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1b1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1b1.dat
new file mode 100644
index 0000000000..19097e69e7
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1b1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1c0.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1c0.dat
new file mode 100644
index 0000000000..359525a31a
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1c0.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1d1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1d1.dat
new file mode 100644
index 0000000000..9f257df932
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1d1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1e0.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1e0.dat
new file mode 100644
index 0000000000..e43e52fb7f
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1e0.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1f1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1f1.dat
new file mode 100644
index 0000000000..7e6ee3b1e0
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c1f1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c20.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c20.dat
new file mode 100644
index 0000000000..1be6390f06
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c20.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c200.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c200.dat
new file mode 100644
index 0000000000..b15d56855c
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c200.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c211.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c211.dat
new file mode 100644
index 0000000000..84b0022312
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c211.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c221.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c221.dat
new file mode 100644
index 0000000000..63106a9523
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c221.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c230.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c230.dat
new file mode 100644
index 0000000000..9975f27c1f
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c230.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c241.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c241.dat
new file mode 100644
index 0000000000..835c645a16
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c241.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c251.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c251.dat
new file mode 100644
index 0000000000..d3d6adf4fb
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c251.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c260.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c260.dat
new file mode 100644
index 0000000000..8d7333df7d
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c260.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c271.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c271.dat
new file mode 100644
index 0000000000..af722f7d73
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c271.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c281.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c281.dat
new file mode 100644
index 0000000000..3972983c2e
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c281.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c290.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c290.dat
new file mode 100644
index 0000000000..31577b8124
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c290.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2a1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2a1.dat
new file mode 100644
index 0000000000..0f700d13a7
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2a1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2b1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2b1.dat
new file mode 100644
index 0000000000..1d6382fb3d
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2b1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2c1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2c1.dat
new file mode 100644
index 0000000000..3bc60d886b
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2c1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2d0.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2d0.dat
new file mode 100644
index 0000000000..c542d3c91c
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2d0.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2e1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2e1.dat
new file mode 100644
index 0000000000..16abd20b5f
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2e1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2f0.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2f0.dat
new file mode 100644
index 0000000000..eb26be5932
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c2f0.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c300.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c300.dat
new file mode 100644
index 0000000000..1214f1df4b
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c300.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c31.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c31.dat
new file mode 100644
index 0000000000..18c16f1123
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c31.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c311.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c311.dat
new file mode 100644
index 0000000000..926cbf25b5
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c311.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c320.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c320.dat
new file mode 100644
index 0000000000..07e7bc023c
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c320.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c331.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c331.dat
new file mode 100644
index 0000000000..fd827f9dc2
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c331.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c340.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c340.dat
new file mode 100644
index 0000000000..ca70319886
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c340.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c351.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c351.dat
new file mode 100644
index 0000000000..8fbe2a527c
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c351.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c360.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c360.dat
new file mode 100644
index 0000000000..dcf9c746e1
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c360.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c371.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c371.dat
new file mode 100644
index 0000000000..6f21a840ea
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c371.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c380.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c380.dat
new file mode 100644
index 0000000000..b512e8065f
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c380.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c391.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c391.dat
new file mode 100644
index 0000000000..27006e95a1
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c391.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3a0.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3a0.dat
new file mode 100644
index 0000000000..565dca97ac
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3a0.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3b1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3b1.dat
new file mode 100644
index 0000000000..36894c9818
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3b1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3c0.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3c0.dat
new file mode 100644
index 0000000000..d0c538aede
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3c0.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3d1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3d1.dat
new file mode 100644
index 0000000000..65bcec5527
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3d1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3e0.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3e0.dat
new file mode 100644
index 0000000000..bdab359420
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3e0.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3f1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3f1.dat
new file mode 100644
index 0000000000..dc2d278b57
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c3f1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c400.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c400.dat
new file mode 100644
index 0000000000..3072709cec
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c400.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c41.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c41.dat
new file mode 100644
index 0000000000..61086690f2
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c41.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c411.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c411.dat
new file mode 100644
index 0000000000..ca551d8249
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c411.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c420.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c420.dat
new file mode 100644
index 0000000000..f04de0840e
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c420.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c431.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c431.dat
new file mode 100644
index 0000000000..398b1672cc
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c431.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c440.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c440.dat
new file mode 100644
index 0000000000..af259d0872
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c440.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c451.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c451.dat
new file mode 100644
index 0000000000..772a18c658
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c451.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c460.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c460.dat
new file mode 100644
index 0000000000..505428362d
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c460.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c471.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c471.dat
new file mode 100644
index 0000000000..484d0df42d
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c471.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c481.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c481.dat
new file mode 100644
index 0000000000..faac073076
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c481.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c490.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c490.dat
new file mode 100644
index 0000000000..7585319d21
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c490.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c4a1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c4a1.dat
new file mode 100644
index 0000000000..4fe8b786e3
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c4a1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c51.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c51.dat
new file mode 100644
index 0000000000..7fc7937b15
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c51.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c60.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c60.dat
new file mode 100644
index 0000000000..d1fb08c946
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c60.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c71.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c71.dat
new file mode 100644
index 0000000000..d4c2090a3b
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c71.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c81.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c81.dat
new file mode 100644
index 0000000000..38b6ea6520
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c81.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c90.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c90.dat
new file mode 100644
index 0000000000..a607a5969c
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/c90.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/ca1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/ca1.dat
new file mode 100644
index 0000000000..19b4c9e340
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/ca1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/cb1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/cb1.dat
new file mode 100644
index 0000000000..73dc986572
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/cb1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/cc0.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/cc0.dat
new file mode 100644
index 0000000000..d1eef3bb56
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/cc0.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/cd1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/cd1.dat
new file mode 100644
index 0000000000..c7e6db3ef7
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/cd1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/ce1.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/ce1.dat
new file mode 100644
index 0000000000..8fd3bf17a8
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/ce1.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/seg0/cf0.dat b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/cf0.dat
new file mode 100644
index 0000000000..332b3d9a8a
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/seg0/cf0.dat
Binary files differ
diff --git a/branches/java-post-M1/samples/das/companyweb/dastest/service.properties b/branches/java-post-M1/samples/das/companyweb/dastest/service.properties
new file mode 100644
index 0000000000..8cfe3b09a5
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/dastest/service.properties
@@ -0,0 +1,22 @@
+#C:\apacheSVN\java\target\dastest
+# ********************************************************************
+# *** Please do NOT edit this file. ***
+# *** CHANGING THE CONTENT OF THIS FILE MAY CAUSE DATA CORRUPTION. ***
+# ********************************************************************
+#Fri Feb 17 08:55:29 MST 2006
+SysschemasIndex2Identifier=225
+SyscolumnsIdentifier=144
+SysconglomeratesIndex1Identifier=49
+SysconglomeratesIdentifier=32
+SyscolumnsIndex2Identifier=177
+SysschemasIndex1Identifier=209
+SysconglomeratesIndex3Identifier=81
+SystablesIndex2Identifier=129
+SyscolumnsIndex1Identifier=161
+derby.serviceProtocol=org.apache.derby.database.Database
+SysschemasIdentifier=192
+derby.storage.propertiesId=16
+SysconglomeratesIndex2Identifier=65
+derby.serviceLocale=en_US
+SystablesIdentifier=96
+SystablesIndex1Identifier=113
diff --git a/branches/java-post-M1/samples/das/companyweb/pom.xml b/branches/java-post-M1/samples/das/companyweb/pom.xml
new file mode 100644
index 0000000000..8dbf952e89
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<project>
+
+ <parent>
+ <groupId>org.apache.tuscany.samples.das</groupId>
+ <artifactId>tuscany-samples-das</artifactId>
+ <version>incubating-M1</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>
+ <version>incubating-M1</version>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.das</groupId>
+ <artifactId>tuscany-das-rdb</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/branches/java-post-M1/samples/das/companyweb/readme.htm b/branches/java-post-M1/samples/das/companyweb/readme.htm
new file mode 100644
index 0000000000..349fee547a
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/readme.htm
@@ -0,0 +1,810 @@
+<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="place"/>
+<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
+ name="State"/>
+<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
+ name="City"/>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+ <o:Author>IBM_USER</o:Author>
+ <o:LastAuthor>IBM_USER</o:LastAuthor>
+ <o:Revision>2</o:Revision>
+ <o:TotalTime>487</o:TotalTime>
+ <o:Created>2006-05-17T18:53:00Z</o:Created>
+ <o:LastSaved>2006-05-17T18:53:00Z</o:LastSaved>
+ <o:Pages>1</o:Pages>
+ <o:Words>1174</o:Words>
+ <o:Characters>6695</o:Characters>
+ <o:Company>IBM</o:Company>
+ <o:Lines>55</o:Lines>
+ <o:Paragraphs>15</o:Paragraphs>
+ <o:CharactersWithSpaces>7854</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:Compatibility>
+ <w:BreakWrappedTables/>
+ <w:SnapToGridInCell/>
+ <w:WrapTextWithPunct/>
+ <w:UseAsianBreakRules/>
+ </w:Compatibility>
+ <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>
+<!--
+ /* Font Definitions */
+ @font-face
+ {font-family:Helv;
+ panose-1:2 11 6 4 2 2 2 3 2 4;
+ mso-font-alt:Arial;
+ mso-font-charset:0;
+ mso-generic-font-family:swiss;
+ mso-font-format:other;
+ mso-font-pitch:variable;
+ mso-font-signature:3 0 0 0 1 0;}
+@font-face
+ {font-family:Wingdings;
+ panose-1:5 0 0 0 0 0 0 0 0 0;
+ mso-font-charset:2;
+ mso-generic-font-family:auto;
+ mso-font-pitch:variable;
+ mso-font-signature:0 268435456 0 0 -2147483648 0;}
+ /* Style Definitions */
+ p.MsoNormal, li.MsoNormal, div.MsoNormal
+ {mso-style-parent:"";
+ margin:0in;
+ margin-bottom:.0001pt;
+ mso-pagination:widow-orphan;
+ font-size:12.0pt;
+ font-family:"Times New Roman";
+ mso-fareast-font-family:"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:280770398;
+ mso-list-type:hybrid;
+ mso-list-template-ids:-1591061486 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
+@list l0: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 l1
+ {mso-list-id:400835612;
+ mso-list-type:hybrid;
+ mso-list-template-ids:1528458504 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
+@list l1: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 l1:level2
+ {mso-level-number-format:bullet;
+ mso-level-text:o;
+ mso-level-tab-stop:1.0in;
+ mso-level-number-position:left;
+ text-indent:-.25in;
+ font-family:"Courier New";}
+@list l2
+ {mso-list-id:646667692;
+ mso-list-type:hybrid;
+ mso-list-template-ids:-728441462 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
+@list l2: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 l3
+ {mso-list-id:975526902;
+ mso-list-type:hybrid;
+ mso-list-template-ids:1435802096 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
+@list l3:level1
+ {mso-level-tab-stop:.5in;
+ mso-level-number-position:left;
+ text-indent:-.25in;}
+@list l4
+ {mso-list-id:1071007661;
+ mso-list-type:simple;
+ mso-list-template-ids:-338687628;}
+@list l4:level1
+ {mso-level-tab-stop:none;
+ mso-level-number-position:left;
+ mso-level-legacy:yes;
+ mso-level-legacy-indent:0in;
+ mso-level-legacy-space:0in;
+ margin-left:0in;
+ text-indent:0in;
+ font-family:Helv;
+ mso-ansi-font-weight:normal;}
+@list l5
+ {mso-list-id:1305811547;
+ mso-list-type:hybrid;
+ mso-list-template-ids:42887628 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-number-format:alpha-lower;
+ mso-level-tab-stop:1.0in;
+ mso-level-number-position:left;
+ text-indent:-.25in;}
+@list l5:level3
+ {mso-level-number-format:roman-lower;
+ mso-level-tab-stop:1.5in;
+ mso-level-number-position:right;
+ text-indent:-9.0pt;}
+@list l6
+ {mso-list-id:1605966365;
+ mso-list-type:hybrid;
+ mso-list-template-ids:14685132 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 l7
+ {mso-list-id:1727725721;
+ mso-list-type:hybrid;
+ mso-list-template-ids:1480507190 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
+@list l7: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 l8
+ {mso-list-id:1766462262;
+ mso-list-type:hybrid;
+ mso-list-template-ids:2029450580 67698689 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
+@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;
+ font-family:Symbol;}
+@list l8:level2
+ {mso-level-number-format:alpha-lower;
+ mso-level-tab-stop:1.0in;
+ mso-level-number-position:left;
+ text-indent:-.25in;}
+@list l9
+ {mso-list-id:1923829381;
+ mso-list-template-ids:559690966;}
+@list l9: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:level2
+ {mso-level-number-format:bullet;
+ mso-level-text:o;
+ mso-level-tab-stop:1.0in;
+ mso-level-number-position:left;
+ text-indent:-.25in;
+ mso-ansi-font-size:10.0pt;
+ font-family:"Courier New";
+ mso-bidi-font-family:"Times New Roman";}
+@list l10
+ {mso-list-id:2004123601;
+ mso-list-type:hybrid;
+ mso-list-template-ids:2035459332 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
+@list l10: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 l11
+ {mso-list-id:2114665119;
+ mso-list-type:hybrid;
+ mso-list-template-ids:1704226536 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
+@list l11: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;}
+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>
+ <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 class=GramE><span style='font-size:9.0pt'>Copyright<span
+style='color:black'> </span>(c)<span style='color:black'> </span>2005<span
+style='color:black'> </span>The<span style='color:black'> </span>Apache<span
+style='color:black'> </span>Software<span style='color:black'> </span>Foundation<span
+style='color:black'> </span>or<span style='color:black'> </span>its<span
+style='color:black'> </span>licensors,<span style='color:black'> </span>as<span
+style='color:black'> </span>applicable.</span></span><span style='font-size:
+9.0pt'><o:p></o:p></span></p>
+
+<p class=MsoNormal><span style='font-size:9.0pt'>Licensed<span
+style='color:black'> </span>under<span style='color:black'> </span>the<span
+style='color:black'> </span>Apache<span style='color:black'> </span>License,<span
+style='color:black'> </span>Version<span style='color:black'> </span>2.0<span
+style='color:black'> </span>(the<span style='color:black'> </span>&quot;License&quot;);
+you<span style='color:black'> </span>may<span style='color:black'> </span>not<span
+style='color:black'> </span>use<span style='color:black'> </span>this<span
+style='color:black'> </span>file<span style='color:black'> </span>except<span
+style='color:black'> </span>in<span style='color:black'> </span>compliance<span
+style='color:black'> </span>with<span style='color:black'> </span>the<span
+style='color:black'> </span>License. You<span style='color:black'> </span>may<span
+style='color:black'> </span>obtain<span style='color:black'> </span>a<span
+style='color:black'> </span>copy<span style='color:black'> </span>of<span
+style='color:black'> </span>the<span style='color:black'> </span>License<span
+style='color:black'> </span>at<o:p></o:p></span></p>
+
+<p class=MsoNormal><span style='font-size:9.0pt'><o:p>&nbsp;</o:p></span></p>
+
+<p class=MsoNormal><span style='font-size:9.0pt;color:black'><span
+style='mso-spacerun:yes'>   </span><span style='mso-spacerun:yes'>  </span></span><span
+style='font-size:9.0pt'>http://www.apache.org/licenses/LICENSE-2.0<o:p></o:p></span></p>
+
+<p class=MsoNormal><span style='font-size:9.0pt'><o:p>&nbsp;</o:p></span></p>
+
+<p class=MsoNormal><span style='font-size:9.0pt'>Unless<span style='color:black'>
+</span>required<span style='color:black'> </span>by<span style='color:black'> </span>applicable<span
+style='color:black'> </span>law<span style='color:black'> </span>or<span
+style='color:black'> </span>agreed<span style='color:black'> </span>to<span
+style='color:black'> </span>in<span style='color:black'> </span>writing,<span
+style='color:black'> </span>software distributed<span style='color:black'> </span>under<span
+style='color:black'> </span>the<span style='color:black'> </span>License<span
+style='color:black'> </span>is<span style='color:black'> </span>distributed<span
+style='color:black'> </span>on<span style='color:black'> </span>an<span
+style='color:black'> </span>&quot;AS<span style='color:black'> </span>IS&quot;<span
+style='color:black'> </span>BASIS, WITHOUT<span style='color:black'> </span>WARRANTIES<span
+style='color:black'> </span>OR<span style='color:black'> </span>CONDITIONS<span
+style='color:black'> </span>OF<span style='color:black'> </span>ANY<span
+style='color:black'> </span>KIND,<span style='color:black'> </span>either<span
+style='color:black'> </span>express<span style='color:black'> </span>or<span
+style='color:black'> </span>implied. See<span style='color:black'> </span>the<span
+style='color:black'> </span>License<span style='color:black'> </span>for<span
+style='color:black'> </span>the<span style='color:black'> </span>specific<span
+style='color:black'> </span>language<span style='color:black'> </span>governing<span
+style='color:black'> </span>permissions<span style='color:black'> </span>and
+limitations<span style='color:black'> </span>under<span style='color:black'> </span>the<span
+style='color:black'> </span>License.<o:p></o:p></span></p>
+
+<p class=MsoNormal><span style='font-size:9.0pt'><o:p>&nbsp;</o:p></span></p>
+
+<p class=MsoNormal align=right style='text-align:right'><span style='font-size:
+9.0pt'>Kevin Williams<o:p></o:p></span></p>
+
+<p class=MsoNormal align=right style='text-align:right'><span style='font-size:
+9.0pt'>V-0.4<o:p></o:p></span></p>
+
+<h1><st1:State><st1:place>Tuscany</st1:place></st1:State> RDB DAS Sample (<span
+class=SpellE>companyweb</span>)</h1>
+
+<p class=MsoNormal><o:p>&nbsp;</o:p></p>
+
+<p class=MsoNormal><o:p>&nbsp;</o:p></p>
+
+<p class=MsoNormal>This stand-alone sample demonstrates the SDO RDB Data Access
+Service in the context of a simple web application.</p>
+
+<p class=MsoNormal><o:p>&nbsp;</o: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:</p>
+
+<p class=MsoNormal><o:p>&nbsp;</o:p></p>
+
+<ol style='margin-top:0in' start=1 type=1>
+ <li class=MsoNormal style='mso-list:l3 level1 lfo1;tab-stops:list .5in'>Display
+ all Companies in the database</li>
+ <li class=MsoNormal style='mso-list:l3 level1 lfo1;tab-stops:list .5in'>Display
+ all Companies and related Departments</li>
+ <li class=MsoNormal style='mso-list:l3 level1 lfo1;tab-stops:list .5in'>Add a
+ new Department to a Company</li>
+ <li class=MsoNormal style='mso-list:l3 level1 lfo1;tab-stops:list .5in'>Delete
+ all Departments from a Company</li>
+ <li class=MsoNormal style='mso-list:l3 level1 lfo1;tab-stops:list .5in'>Change
+ the names of Departments in a Company</li>
+</ol>
+
+<p class=MsoNormal><o:p>&nbsp;</o: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>Derby</st1:place></st1:City>
+database accessed via a DataSource.</p>
+
+<p class=MsoNormal><o:p>&nbsp;</o:p></p>
+
+<h1>Running the sample</h1>
+
+<p class=MsoNormal>There are three options for running this sample:</p>
+
+<p class=MsoNormal><o:p>&nbsp;</o:p></p>
+
+<ol style='margin-top:0in' start=1 type=1>
+ <li class=MsoNormal style='mso-list:l6 level1 lfo12;tab-stops:list .5in'>Run
+ from Tomcat in the binary distribution</li>
+ <li class=MsoNormal style='mso-list:l6 level1 lfo12;tab-stops:list .5in'>Run
+ from Tomcat configured by the build</li>
+ <li class=MsoNormal style='mso-list:l6 level1 lfo12;tab-stops:list .5in'>Run
+ from Tomcat you configure yourself</li>
+</ol>
+
+<h3>Running from binary distribution</h3>
+
+<p class=MsoNormal>This sample is also pre-deployed in a Tomcat instance as
+part of the <st1:State><st1:place>Tuscany</st1:place></st1:State> binary
+distribution.<span style='mso-spacerun:yes'>  </span>When running the sample
+this way, you just:</p>
+
+<ul type=disc>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l9 level1 lfo11;tab-stops:list .5in'>Unzip the distribution
+ archive</li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l9 level1 lfo11;tab-stops:list .5in'>Change the directory to
+ &nbsp;<b>apache-tomcat-5.5.17\bin</b><o:p></o:p></li>
+ <ul type=circle>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l9 level2 lfo11;tab-stops:list 1.0in'><span
+ style='mso-bidi-font-weight:bold'>If you start Tomcat from some other
+ location then it will not find the canned database</span></li>
+ </ul>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l9 level1 lfo11;tab-stops:list .5in'>Execute: <code><span
+ style='font-size:10.0pt'>startup</span></code><code><span
+ style='mso-ansi-font-size:12.0pt;mso-bidi-font-size:12.0pt;font-family:
+ "Times New Roman"'><o:p></o:p></span></code></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l9 level1 lfo11;tab-stops:list .5in'>Point your browser to http://localhost:8080/sample-companyweb/</li>
+</ul>
+
+<h3>Running from Tomcat configured by the build<o:p></o: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/testing/tomcat build (see java/testing/tomcat/<span class=GramE>readme.htm
+)</span><span style='mso-spacerun:yes'>  </span>and then access the application
+by pointing your browser to http://localhost:8080/sample-companyweb/.<span
+style='mso-spacerun:yes'>  </span></p>
+
+<h3>Running from 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 <st1:State><st1:place>Tuscany</st1:place></st1:State> source and
+run our maven build.<span style='mso-spacerun:yes'>  </span><a
+href="https://svn.apache.org/repos/asf/incubator/tuscany/java/BUILDING.txt">https://svn.apache.org/repos/asf/incubator/tuscany/java/BUILDING.txt</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<o:p></o:p></span></h1>
+
+<ol style='margin-top:0in' start=1 type=1>
+ <li class=MsoNormal style='mso-list:l5 level1 lfo2;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:l5 level1 lfo2;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:l5 level1 lfo2;tab-stops:list .5in'>Stop
+ Tomcat</li>
+ <li class=MsoNormal style='mso-list:l5 level1 lfo2;tab-stops:list .5in'>Move
+ the following files (details in appendix) to {<span class=SpellE>Tomcat_Home</span>}/common/lib:</li>
+ <ol style='margin-top:0in' start=1 type=a>
+ <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
+ class=SpellE>tuscany-das-rdb-xxx.jar</span></li>
+ <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
+ class=SpellE>sdo-api-xxx.jar</span></li>
+ <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
+ class=SpellE>tuscany-sdo-impl-xxx.jar</span></li>
+ <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
+ class=SpellE>xsd</span>{latest version}.jar</li>
+ <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
+ class=SpellE>ecore</span>-{latest version}.jar</li>
+ <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
+ class=SpellE>ecore</span>-change-{latest version}.jar</li>
+ <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
+ class=SpellE>ecore-xmi</span>-{latest version}.jar</li>
+ <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'>common-{latest
+ version}.jar</li>
+ <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
+ class=SpellE>derby.jar</span></li>
+ </ol>
+ <li class=MsoNormal style='mso-list:l5 level1 lfo2;tab-stops:list .5in'>Add
+ the sample war file (details in appendix) 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:l5 level2 lfo2;tab-stops:list 1.0in'>sample-<span
+ class=SpellE>companyweb-xxx.war</span></li>
+ </ol>
+ <li class=MsoNormal style='mso-list:l5 level1 lfo2;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:l5 level2 lfo2;tab-stops:list 1.0in'>Create
+ {<span class=SpellE>Tomcat_Home</span>}/Databases</li>
+ <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'>Copy
+ the <span class=SpellE>dastest</span> folder (and all its contents) from {build
+ directory root}/java/samples/<span class=SpellE>das/companyweb</span> to
+ {<span class=SpellE>Tomcat_Home</span>}/Databases.<span
+ style='mso-spacerun:yes'>   </span></li>
+ </ol>
+ <li class=MsoNormal style='mso-list:l5 level1 lfo2;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:l5 level2 lfo2;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: </li>
+ </ol>
+</ol>
+
+<p class=MsoNormal style='margin-left:.5in'><o:p>&nbsp;</o: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 </span><st1:City><st1:place><span
+ style='font-size:9.0pt'>Derby</span></st1:place></st1:City><span
+style='font-size:9.0pt'> <span class=SpellE>dastest</span> database --&gt;<o:p></o: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;<o:p></o: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;<o:p></o:p></span></pre><pre><span
+style='font-size:9.0pt'><span style='mso-spacerun:yes'>              </span><span
+class=GramE>description</span>=&quot;</span><st1:City><st1:place><span
+ style='font-size:9.0pt'>Derby</span></st1:place></st1:City><span
+style='font-size:9.0pt'> database for DAS Company sample&quot;<o:p></o: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;<o:p></o:p></span></pre><pre><span
+style='font-size:9.0pt'><span style='mso-spacerun:yes'>              </span>username=&quot;&quot; password=&quot;&quot; <o:p></o: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;<o:p></o: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;<o:p></o:p></span></pre>
+
+<p class=MsoNormal style='margin-left:.5in'><span
+style='mso-spacerun:yes'> </span>NOTE: If you are NOT starting Tomcat as a
+service then you will need to provide the absolute path in the above <span
+class=SpellE><span class=GramE>url</span></span>.<span
+style='mso-spacerun:yes'>  </span>Fore example:</p>
+
+<p class=MsoNormal style='margin-left:.5in'><o:p>&nbsp;</o: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;<span
+style='font-size:9.0pt'><o:p></o:p></span></pre>
+
+<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:l5 level1 lfo2;tab-stops:list .5in'>Start
+ tomcat and either:</li>
+</ol>
+
+<p class=MsoNormal style='margin-left:1.0in'><span class=GramE>go</span> to the
+manager console <a href="http://localhost:8080/manager/html">http://localhost:8080/manager/html</a>
+and select the application named “<span style='font-size:10.0pt'>Tuscany DAS
+sample Company WEB”</span><o:p></o:p></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span class=GramE>or</span>:</p>
+
+<p class=MsoNormal style='margin-left:1.0in'><span class=GramE>point</span>
+your browser to :</p>
+
+<p class=MsoNormal style='margin-left:1.5in'><a
+href="http://localhost:8080/sample-companyweb-%7bversion%20name%7d/">http://localhost:8080/sample-companyweb-{version
+name}/</a></p>
+
+<p class=MsoNormal style='margin-left:1.0in'><o:p>&nbsp;</o:p></p>
+
+<p class=MsoNormal style='margin-left:1.0in'>NOTE: for the M1 version of <st1:State><st1:place>Tuscany</st1:place></st1:State>
+sample the <span class=SpellE><span class=GramE>url</span></span> is:</p>
+
+<p class=MsoNormal style='margin-left:1.5in'>http://localhost:8080/sample-companyweb-incubating-M1/<o:p></o:p></p>
+
+<p class=MsoNormal><sub><o:p>&nbsp;</o:p></sub></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:l2 level1 lfo3;tab-stops:list .5in'>The
+ RDB Data Access Service (DAS)</li>
+ <li class=MsoNormal style='mso-list:l2 level1 lfo3;tab-stops:list .5in'>SDO</li>
+ <li class=MsoNormal style='mso-list:l2 level1 lfo3;tab-stops:list .5in'><span
+ class=SpellE>CompanyClient.java</span></li>
+ <li class=MsoNormal style='mso-list:l2 level1 lfo3;tab-stops:list .5in'><span
+ class=SpellE>Company.jsp</span></li>
+ <li class=MsoNormal style='mso-list:l2 level1 lfo3;tab-stops:list .5in'>The
+ canned <st1:City><st1:place>Derby</st1:place></st1:City> database</li>
+</ul>
+
+<p class=MsoNormal><o:p>&nbsp;</o:p></p>
+
+<p class=MsoNormal><o:p>&nbsp;</o: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.</p>
+
+<p class=MsoNormal style='margin-left:.5in'><o:p>&nbsp;</o: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.</p>
+
+<p class=MsoNormal><o:p>&nbsp;</o:p></p>
+
+<p class=MsoNormal>The canned <st1:City><st1:place><b style='mso-bidi-font-weight:
+ normal'>Derby</b></st1:place></st1:City><b style='mso-bidi-font-weight:normal'>
+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.</p>
+
+<p class=MsoNormal><o:p>&nbsp;</o: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'> <o:p></o:p></b></p>
+
+<p class=MsoNormal><b style='mso-bidi-font-weight:normal'><o:p>&nbsp;</o:p></b></p>
+
+<h1>Appendix</h1>
+
+<p class=MsoNormal><o:p>&nbsp;</o:p></p>
+
+<p class=MsoNormal>The following specifies the location of all dependency jars needed
+to run this sample.<span style='mso-spacerun:yes'>  </span>These jars are
+available <b style='mso-bidi-font-weight:normal'>only</b> after you have
+successfully downloaded and built Tuscany/java.<span style='mso-spacerun:yes'> 
+</span>Instructions for building can be found here: </p>
+
+<p class=MsoNormal style='margin-left:.5in'><a
+href="https://svn.apache.org/repos/asf/incubator/tuscany/java/BUILDING.txt">https://svn.apache.org/repos/asf/incubator/tuscany/java/BUILDING.txt</a></p>
+
+<p class=MsoNormal style='margin-left:.5in'><o:p>&nbsp;</o:p></p>
+
+<p class=MsoNormal><span class=GramE>Dependency jar</span> locations:</p>
+
+<p class=MsoNormal><o:p>&nbsp;</o:p></p>
+
+<p class=MsoNormal style='margin-left:.25in'><span style='font-size:10.0pt'>For
+Step #4<o:p></o:p></span></p>
+
+<ul style='margin-top:0in' type=disc>
+ <li class=MsoNormal style='mso-list:l8 level1 lfo4;tab-stops:list .5in'><span
+ class=SpellE><span style='font-size:10.0pt'>tuscany-das-rdb-xxx.jar</span></span><span
+ style='font-size:10.0pt'> – {build directory root}/java/<span
+ class=SpellE>das/rdb/target</span><o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l8 level1 lfo4;tab-stops:list .5in'><span
+ class=SpellE><span style='font-size:10.0pt'>sdo-api-xxx.jar</span></span><span
+ style='font-size:10.0pt'> – {build directory root}/java/spec/<span
+ class=SpellE>sdo</span>/target<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l8 level1 lfo4;tab-stops:list .5in'><span
+ class=SpellE><span style='font-size:10.0pt'>tuscany-sdo-impl-xxx.jar</span></span><span
+ style='font-size:10.0pt'> – {build directory root}//java/<span
+ class=SpellE>sdo/impl/target</span><o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l8 level1 lfo4;tab-stops:list .5in'><span
+ class=SpellE><span style='font-size:10.0pt'>xsd</span></span><span
+ style='font-size:10.0pt'>{latest version}.jar –
+ {user}/.m2/repository/org/eclipse/xsd<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l8 level1 lfo4;tab-stops:list .5in'><span
+ class=SpellE><span style='font-size:10.0pt'>ecore</span></span><span
+ style='font-size:10.0pt'>-{latest version}.jar –
+ {user}/.m2/repository/org/eclipse/emf/ecore<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l8 level1 lfo4;tab-stops:list .5in'><span
+ class=SpellE><span style='font-size:10.0pt'>ecore</span></span><span
+ style='font-size:10.0pt'>-change-{latest version}.jar –
+ {user}/.m2/repository/org/eclipse/emf/ecore-change<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l8 level1 lfo4;tab-stops:list .5in'><span
+ class=SpellE><span style='font-size:10.0pt'>ecore-xmi</span></span><span
+ style='font-size:10.0pt'>-{latest version}.jar <span
+ style='mso-spacerun:yes'> </span>– {user}/.m2/repository/org/eclipse/emf/ecore-xmi<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l8 level1 lfo4;tab-stops:list .5in'><span
+ style='font-size:10.0pt'>common-{latest version}.jar<span
+ style='mso-spacerun:yes'>  </span>– {user}/.m2/repository/org/eclipse/emf/common<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l8 level1 lfo4;tab-stops:list .5in'><span
+ class=SpellE><span style='font-size:10.0pt'>derby.jar</span></span><span
+ style='font-size:10.0pt'> – Extract from the archive file you downloaded
+ in step #2<o:p></o:p></span></li>
+</ul>
+
+<p class=MsoNormal><span style='font-size:10.0pt'><o:p>&nbsp;</o:p></span></p>
+
+<p class=MsoNormal>Application artifact locations:</p>
+
+<p class=MsoNormal style='margin-left:.25in'><span style='font-size:10.0pt'><o:p>&nbsp;</o:p></span></p>
+
+<p class=MsoNormal style='margin-left:.25in'><span style='font-size:10.0pt'>For
+Step #5<o:p></o:p></span></p>
+
+<ul style='margin-top:0in' type=disc>
+ <li class=MsoNormal style='mso-list:l11 level1 lfo10;tab-stops:list .5in'><span
+ style='font-size:10.0pt'>sample-<span class=SpellE>companyweb-xxx.war</span>
+ - {build directory root}/java/samples/<span class=SpellE>das/companyweb/target</span><o:p></o:p></span></li>
+</ul>
+
+<p class=MsoNormal><o:p>&nbsp;</o:p></p>
+
+<p class=MsoNormal>Conventions:</p>
+
+<ul style='margin-top:0in' type=disc>
+ <li class=MsoNormal style='mso-list:l0 level1 lfo5;tab-stops:list .5in'><span
+ style='font-size:10.0pt'>{<span class=GramE>user</span>} refers the
+ directory where Maven2 is installed on your machine.<span
+ style='mso-spacerun:yes'>  </span>On my machine, “{user}” is “C:\Documents
+ and Settings\Administrator”<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l0 level1 lfo5;tab-stops:list .5in'><span
+ style='font-size:10.0pt'>{<span class=SpellE>Tomcat_Home</span>} refers to
+ the directory that Tomcat is installed on your machine.<span
+ style='mso-spacerun:yes'>  </span>On my machine, this is “C:\Program
+ Files\Apache Software Foundation\Tomcat 5.5”<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l0 level1 lfo5;tab-stops:list .5in'><span
+ style='font-size:10.0pt'>{<span class=GramE>latest</span> version} means
+ the tag associated with the latest version available in the maven2
+ repository.<span style='mso-spacerun:yes'>  </span>For example the version
+ of <span class=SpellE>ecore</span>-{latest version}.jar that I used for
+ testing this sample is “ecore-2.2.0-RC4.jar”<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l0 level1 lfo5;tab-stops:list .5in'><span
+ style='font-size:10.0pt'>{build directory root} refers to the target
+ directory for the <span class=SpellE>tuscany</span>/java source you are
+ building from<o:p></o:p></span></li>
+</ul>
+
+</div>
+
+</body>
+
+</html>
diff --git a/branches/java-post-M1/samples/das/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java b/branches/java-post-M1/samples/das/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java
new file mode 100644
index 0000000000..fe223f94e1
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java
@@ -0,0 +1,149 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+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/branches/java-post-M1/samples/das/companyweb/src/main/resources/CompanyConfig.xml b/branches/java-post-M1/samples/das/companyweb/src/main/resources/CompanyConfig.xml
new file mode 100644
index 0000000000..27dd1f49f0
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/src/main/resources/CompanyConfig.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<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/branches/java-post-M1/samples/das/companyweb/src/main/resources/META-INF/LICENSE.txt b/branches/java-post-M1/samples/das/companyweb/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000000..25d78feeac
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,1277 @@
+
+ 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.
+
+
+APACHE TUSCANY SUBCOMPONENTS:
+
+The Apache Tuscany distribution includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+===============================================================================
+
+For the Eclipse Modeling Framework component and the Celtix binding:
+
+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.
+
+===============================================================================
+
+For the Rhino JavaScript container component:
+
+Mozilla Public License 1.1 (MPL 1.1)
+
+1. Definitions.
+
+ 1.0.1. "Commercial Use" means distribution or otherwise making the
+Covered Code available to a third party.
+
+ 1.1. "Contributor" means each entity that creates or contributes to
+the creation of Modifications.
+
+ 1.2. "Contributor Version" means the combination of the Original Code,
+prior Modifications used by a Contributor, and the Modifications made by that
+particular Contributor.
+
+ 1.3. "Covered Code" means the Original Code or Modifications or the
+combination of the Original Code and Modifications, in each case including
+portions thereof.
+
+ 1.4. "Electronic Distribution Mechanism" means a mechanism generally
+accepted in the software development community for the electronic transfer of
+data.
+
+ 1.5. "Executable" means Covered Code in any form other than Source
+Code.
+
+ 1.6. "Initial Developer" means the individual or entity identified as
+the Initial Developer in the Source Code notice required by Exhibit A.
+
+ 1.7. "Larger Work" means a work which combines Covered Code or
+portions thereof with code not governed by the terms of this License.
+
+ 1.8. "License" means this document.
+
+ 1.8.1. "Licensable" means having the right to grant, to the maximum
+extent possible, whether at the time of the initial grant or subsequently
+acquired, any and all of the rights conveyed herein.
+
+ 1.9. "Modifications" means any addition to or deletion from the
+substance or structure of either the Original Code or any previous
+Modifications. When Covered Code is released as a series of files, a
+Modification is:
+ A. Any addition to or deletion from the contents of a file
+containing Original Code or previous Modifications.
+
+ B. Any new file that contains any part of the Original Code or
+previous Modifications.
+
+ 1.10. "Original Code" means Source Code of computer software code
+which is described in the Source Code notice required by Exhibit A as Original
+Code, and which, at the time of its release under this License is not already
+Covered Code governed by this License.
+
+ 1.10.1. "Patent Claims" means any patent claim(s), now owned or
+hereafter acquired, including without limitation, method, process, and
+apparatus claims, in any patent Licensable by grantor.
+
+ 1.11. "Source Code" means the preferred form of the Covered Code for
+making modifications to it, including all modules it contains, plus any
+associated interface definition files, scripts used to control compilation and
+installation of an Executable, or source code differential comparisons against
+either the Original Code or another well known, available Covered Code of the
+Contributor's choice. The Source Code can be in a compressed or archival form,
+provided the appropriate decompression or de-archiving software is widely
+available for no charge.
+
+ 1.12. "You" (or "Your") means an individual or a legal entity
+exercising rights under, and complying with all of the terms of, this License
+or a future version of this License issued under Section 6.1. For legal
+entities, "You" includes any entity which controls, is controlled by, or is
+under common control with You. For purposes of this definition, "control"
+means (a) the power, direct or indirect, to cause the direction or management
+of such entity, whether by contract or otherwise, or (b) ownership of more
+than fifty percent (50%) of the outstanding shares or beneficial ownership of
+such entity.
+
+2. Source Code License.
+
+ 2.1. The Initial Developer Grant.
+ The Initial Developer hereby grants You a world-wide, royalty-free,
+non-exclusive license, subject to third party intellectual property claims:
+ (a) under intellectual property rights (other than patent or
+trademark) Licensable by Initial Developer to use, reproduce, modify, display,
+perform, sublicense and distribute the Original Code (or portions thereof)
+with or without Modifications, and/or as part of a Larger Work; and
+
+ (b) under Patents Claims infringed by the making, using or selling
+of Original Code, to make, have made, use, practice, sell, and offer for sale,
+and/or otherwise dispose of the Original Code (or portions thereof).
+ (c) the licenses granted in this Section 2.1(a) and
+(b) are effective on the date Initial Developer first distributes Original
+Code under the terms of this License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is
+granted: 1) for code that You delete from the Original Code; 2) separate from
+the Original Code; or 3) for infringements caused by: i) the modification of
+the Original Code or ii) the combination of the Original Code with other
+software or devices.
+
+ 2.2. Contributor Grant.
+ Subject to third party intellectual property claims, each Contributor
+hereby grants You a world-wide, royalty-free, non-exclusive license
+
+ (a) under intellectual property rights (other than patent or
+trademark) Licensable by Contributor, to use, reproduce, modify, display,
+perform, sublicense and distribute the Modifications created by such
+Contributor (or portions thereof) either on an unmodified basis, with other
+Modifications, as Covered Code and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using, or selling
+of Modifications made by that Contributor either alone and/or in combination
+with its Contributor Version (or portions of such combination), to make, use,
+sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications
+made by that Contributor (or portions thereof); and 2) the combination of
+Modifications made by that Contributor with its Contributor Version (or
+portions of such combination).
+
+ (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+effective on the date Contributor first makes Commercial Use of the Covered
+Code.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent license is
+granted: 1) for any code that Contributor has deleted from the Contributor
+Version; 2) separate from the Contributor Version; 3) for infringements
+caused by: i) third party modifications of Contributor Version or ii) the
+combination of Modifications made by that Contributor with other software
+(except as part of the Contributor Version) or other devices; or 4) under
+Patent Claims infringed by Covered Code in the absence of Modifications made
+by that Contributor.
+
+
+3. Distribution Obligations.
+
+ 3.1. Application of License.
+ The Modifications which You create or to which You contribute are
+governed by the terms of this License, including without limitation Section
+2.2. The Source Code version of Covered Code may be distributed only under the
+terms of this License or a future version of this License released under
+Section 6.1, and You must include a copy of this License with every copy of
+the Source Code You distribute. You may not offer or impose any terms on any
+Source Code version that alters or restricts the applicable version of this
+License or the recipients' rights hereunder. However, You may include an
+additional document offering the additional rights described in Section 3.5.
+
+ 3.2. Availability of Source Code.
+ Any Modification which You create or to which You contribute must be
+made available in Source Code form under the terms of this License either on
+the same media as an Executable version or via an accepted Electronic
+Distribution Mechanism to anyone to whom you made an Executable version
+available; and if made available via Electronic Distribution Mechanism, must
+remain available for at least twelve (12) months after the date it initially
+became available, or at least six (6) months after a subsequent version of
+that particular Modification has been made available to such recipients. You
+are responsible for ensuring that the Source Code version remains available
+even if the Electronic Distribution Mechanism is maintained by a third party.
+
+ 3.3. Description of Modifications.
+ You must cause all Covered Code to which You contribute to contain a
+file documenting the changes You made to create that Covered Code and the date
+of any change. You must include a prominent statement that the Modification is
+derived, directly or indirectly, from Original Code provided by the Initial
+Developer and including the name of the Initial Developer in (a) the Source
+Code, and (b) in any notice in an Executable version or related documentation
+in which You describe the origin or ownership of the Covered Code.
+
+ 3.4. Intellectual Property Matters
+ (a) Third Party Claims.
+ If Contributor has knowledge that a license under a third party's
+intellectual property rights is required to exercise the rights granted by
+such Contributor under Sections 2.1 or 2.2, Contributor must include a text
+file with the Source Code distribution titled "LEGAL" which describes the
+claim and the party making the claim in sufficient detail that a recipient
+will know whom to contact. If Contributor obtains such knowledge after the
+Modification is made available as described in Section 3.2, Contributor shall
+promptly modify the LEGAL file in all copies Contributor makes available
+thereafter and shall take other steps (such as notifying appropriate mailing
+lists or newsgroups) reasonably calculated to inform those who received the
+Covered Code that new knowledge has been obtained.
+
+ (b) Contributor APIs.
+ If Contributor's Modifications include an application programming
+interface and Contributor has knowledge of patent licenses which are
+reasonably necessary to implement that API, Contributor must also include this
+information in the LEGAL file.
+
+ (c) Representations.
+ Contributor represents that, except as disclosed pursuant to
+Section 3.4(a) above, Contributor believes that Contributor's Modifications
+are Contributor's original creation(s) and/or Contributor has sufficient
+rights to grant the rights conveyed by this License.
+
+
+ 3.5. Required Notices.
+ You must duplicate the notice in Exhibit A in each file of the Source
+Code. If it is not possible to put such notice in a particular Source Code
+file due to its structure, then You must include such notice in a location
+(such as a relevant directory) where a user would be likely to look for such a
+notice. If You created one or more Modification(s) You may add your name as a
+Contributor to the notice described in Exhibit A. You must also duplicate
+this License in any documentation for the Source Code where You describe
+recipients' rights or ownership rights relating to Covered Code. You may
+choose to offer, and to charge a fee for, warranty, support, indemnity or
+liability obligations to one or more recipients of Covered Code. However, You
+may do so only on Your own behalf, and not on behalf of the Initial Developer
+or any Contributor. You must make it absolutely clear than any such warranty,
+support, indemnity or liability obligation is offered by You alone, and You
+hereby agree to indemnify the Initial Developer and every Contributor for any
+liability incurred by the Initial Developer or such Contributor as a result of
+warranty, support, indemnity or liability terms You offer.
+
+ 3.6. Distribution of Executable Versions.
+ You may distribute Covered Code in Executable form only if the
+requirements of Section 3.1-3.5 have been met for that Covered Code, and if
+You include a notice stating that the Source Code version of the Covered Code
+is available under the terms of this License, including a description of how
+and where You have fulfilled the obligations of Section 3.2. The notice must
+be conspicuously included in any notice in an Executable version, related
+documentation or collateral in which You describe recipients' rights relating
+to the Covered Code. You may distribute the Executable version of Covered Code
+or ownership rights under a license of Your choice, which may contain terms
+different from this License, provided that You are in compliance with the
+terms of this License and that the license for the Executable version does not
+attempt to limit or alter the recipient's rights in the Source Code version
+from the rights set forth in this License. If You distribute the Executable
+version under a different license You must make it absolutely clear that any
+terms which differ from this License are offered by You alone, not by the
+Initial Developer or any Contributor. You hereby agree to indemnify the
+Initial Developer and every Contributor for any liability incurred by the
+Initial Developer or such Contributor as a result of any such terms You offer.
+
+ 3.7. Larger Works.
+ You may create a Larger Work by combining Covered Code with other code
+not governed by the terms of this License and distribute the Larger Work as a
+single product. In such a case, You must make sure the requirements of this
+License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+ If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Code due to statute,
+judicial order, or regulation then You must: (a) comply with the terms of this
+License to the maximum extent possible; and (b) describe the limitations and
+the code they affect. Such description must be included in the LEGAL file
+described in Section 3.4 and must be included with all distributions of the
+Source Code. Except to the extent prohibited by statute or regulation, such
+description must be sufficiently detailed for a recipient of ordinary skill to
+be able to understand it.
+
+5. Application of this License.
+
+ This License applies to code to which the Initial Developer has attached
+the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+ 6.1. New Versions.
+ Netscape Communications Corporation ("Netscape") may publish revised
+and/or new versions of the License from time to time. Each version will be
+given a distinguishing version number.
+
+ 6.2. Effect of New Versions.
+ Once Covered Code has been published under a particular version of the
+License, You may always continue to use it under the terms of that version.
+You may also choose to use such Covered Code under the terms of any subsequent
+version of the License published by Netscape. No one other than Netscape has
+the right to modify the terms applicable to Covered Code created under this
+License.
+
+ 6.3. Derivative Works.
+ If You create or use a modified version of this License (which you may
+only do in order to apply it to code which is not already Covered Code
+governed by this License), You must (a) rename Your license so that the
+phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "MPL", "NPL" or
+any confusingly similar phrase do not appear in your license (except to note
+that your license differs from this License) and (b) otherwise make it clear
+that Your version of the license contains terms which differ from the Mozilla
+Public License and Netscape Public License. (Filling in the name of the
+Initial Developer, Original Code or Contributor in the notice described in
+Exhibit A shall not of themselves be deemed to be modifications of this
+License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+ COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
+LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE,
+FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE
+QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED
+CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY
+OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR
+CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+DISCLAIMER.
+
+8. TERMINATION.
+
+ 8.1. This License and the rights granted hereunder will terminate
+automatically if You fail to comply with terms herein and fail to cure such
+breach within 30 days of becoming aware of the breach. All sublicenses to the
+Covered Code which are properly granted shall survive any termination of this
+License. Provisions which, by their nature, must remain in effect beyond the
+termination of this License shall survive.
+
+ 8.2. If You initiate litigation by asserting a patent infringement
+claim (excluding declatory judgment actions) against Initial Developer or a
+Contributor (the Initial Developer or Contributor against whom You file such
+action is referred to as "Participant") alleging that:
+
+ (a) such Participant's Contributor Version directly or indirectly
+infringes any patent, then any and all rights granted by such Participant to
+You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice
+from Participant terminate prospectively, unless if within 60 days after
+receipt of notice You either: (i) agree in writing to pay Participant a
+mutually agreeable reasonable royalty for Your past and future use of
+Modifications made by such Participant, or (ii) withdraw Your litigation claim
+with respect to the Contributor Version against such Participant. If within
+60 days of notice, a reasonable royalty and payment arrangement are not
+mutually agreed upon in writing by the parties or the litigation claim is not
+withdrawn, the rights granted by Participant to You under Sections 2.1 and/or
+2.2 automatically terminate at the expiration of the 60 day notice period
+specified above.
+
+ (b) any software, hardware, or device, other than such Participant's
+Contributor Version, directly or indirectly infringes any patent, then any
+rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are
+revoked effective as of the date You first made, used, sold, distributed, or
+had made, Modifications made by that Participant.
+
+ 8.3. If You assert a patent infringement claim against Participant
+alleging that such Participant's Contributor Version directly or indirectly
+infringes any patent where such claim is resolved (such as by license or
+settlement) prior to the initiation of patent infringement litigation, then
+the reasonable value of the licenses granted by such Participant under
+Sections 2.1 or 2.2 shall be taken into account in determining the amount or
+value of any payment or license.
+
+ 8.4. In the event of termination under Sections 8.1 or 8.2 above, all
+end user license agreements (excluding distributors and resellers) which have
+been validly granted by You or any distributor hereunder prior to termination
+shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY
+SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
+WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
+FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES,
+EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH
+DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH
+OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
+APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS
+EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+ The Covered Code is a "commercial item," as that term is defined in 48
+C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and
+"commercial computer software documentation," as such terms are used in 48
+C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.
+227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users
+acquire Covered Code with only those rights set forth herein.
+
+11. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject matter
+hereof. If any provision of this License is held to be unenforceable, such
+provision shall be reformed only to the extent necessary to make it
+enforceable. This License shall be governed by California law provisions
+(except to the extent applicable law, if any, provides otherwise), excluding
+its conflict-of-law provisions. With respect to disputes in which at least one
+party is a citizen of, or an entity chartered or registered to do business in
+the United States of America, any litigation relating to this License shall be
+subject to the jurisdiction of the Federal Courts of the Northern District of
+California, with venue lying in Santa Clara County, California, with the
+losing party responsible for costs, including without limitation, court costs
+and reasonable attorneys' fees and expenses. The application of the United
+Nations Convention on Contracts for the International Sale of Goods is
+expressly excluded. Any law or regulation which provides that the language of
+a contract shall be construed against the drafter shall not apply to this
+License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is
+responsible for claims and damages arising, directly or indirectly, out of its
+utilization of rights under this License and You agree to work with Initial
+Developer and Contributors to distribute such responsibility on an equitable
+basis. Nothing herein is intended or shall be deemed to constitute any
+admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+ Initial Developer may designate portions of the Covered Code as
+Multiple-Licensed. Multiple-Licensed means that the Initial Developer permits
+you to utilize portions of the Covered Code under Your choice of the MPL or
+the alternative licenses, if any, specified by the Initial Developer in the
+file described in Exhibit A.
+
+
+EXHIBIT A -Mozilla Public License.
+
+ ``The contents of this file are subject to the Mozilla Public License
+Version 1.1 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS"
+basis, WITHOUT WARRANTY OF
+ ANY KIND, either express or implied. See the License for the specific
+language governing rights and
+ limitations under the License.
+
+ The Original Code is ______________________________________.
+
+ The Initial Developer of the Original Code is ________________________.
+Portions created by
+ ______________________ are Copyright (C) ______
+_______________________. All Rights
+ Reserved.
+
+ Contributor(s): ______________________________________.
+
+ Alternatively, the contents of this file may be used under the terms of
+the _____ license (the [___] License), in which case the provisions of
+[______] License are applicable instead of those above. If you wish to allow
+use of your version of this file only under the terms of the [____] License
+and not to allow others to use your version of this file under the MPL,
+indicate your decision by deleting the provisions above and replace them
+with the notice and other provisions required by the [___] License. If you do
+not delete the provisions above, a recipient may use your version of this file
+under either the MPL or the [___] License."
+
+ [NOTE: The text of this Exhibit A may differ slightly from the text of
+the notices in the Source Code files of the Original Code. You should use the
+text of this Exhibit A rather than the text found in the Original Code Source
+Code for Your Modifications.]
+
+
+===============================================================================
+
+For the JAX-WS Reference Implementation component:
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+
+ 1. Definitions.
+
+ 1.1. "Contributor" means each individual or entity that
+ creates or contributes to the creation of Modifications.
+
+ 1.2. "Contributor Version" means the combination of the
+ Original Software, prior Modifications used by a
+ Contributor (if any), and the Modifications made by that
+ particular Contributor.
+
+ 1.3. "Covered Software" means (a) the Original Software, or
+ (b) Modifications, or (c) the combination of files
+ containing Original Software with files containing
+ Modifications, in each case including portions thereof.
+
+ 1.4. "Executable" means the Covered Software in any form
+ other than Source Code.
+
+ 1.5. "Initial Developer" means the individual or entity
+ that first makes Original Software available under this
+ License.
+
+ 1.6. "Larger Work" means a work which combines Covered
+ Software or portions thereof with code not governed by the
+ terms of this License.
+
+ 1.7. "License" means this document.
+
+ 1.8. "Licensable" means having the right to grant, to the
+ maximum extent possible, whether at the time of the initial
+ grant or subsequently acquired, any and all of the rights
+ conveyed herein.
+
+ 1.9. "Modifications" means the Source Code and Executable
+ form of any of the following:
+
+ A. Any file that results from an addition to,
+ deletion from or modification of the contents of a
+ file containing Original Software or previous
+ Modifications;
+
+ B. Any new file that contains any part of the
+ Original Software or previous Modification; or
+
+ C. Any new file that is contributed or otherwise made
+ available under the terms of this License.
+
+ 1.10. "Original Software" means the Source Code and
+ Executable form of computer software code that is
+ originally released under this License.
+
+ 1.11. "Patent Claims" means any patent claim(s), now owned
+ or hereafter acquired, including without limitation,
+ method, process, and apparatus claims, in any patent
+ Licensable by grantor.
+
+ 1.12. "Source Code" means (a) the common form of computer
+ software code in which modifications are made and (b)
+ associated documentation included in or with such code.
+
+ 1.13. "You" (or "Your") means an individual or a legal
+ entity exercising rights under, and complying with all of
+ the terms of, this License. For legal entities, "You"
+ includes any entity which controls, is controlled by, or is
+ under common control with You. For purposes of this
+ definition, "control" means (a) the power, direct or
+ indirect, to cause the direction or management of such
+ entity, whether by contract or otherwise, or (b) ownership
+ of more than fifty percent (50%) of the outstanding shares
+ or beneficial ownership of such entity.
+
+ 2. License Grants.
+
+ 2.1. The Initial Developer Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and
+ subject to third party intellectual property claims, the
+ Initial Developer hereby grants You a world-wide,
+ royalty-free, non-exclusive license:
+
+ (a) under intellectual property rights (other than
+ patent or trademark) Licensable by Initial Developer,
+ to use, reproduce, modify, display, perform,
+ sublicense and distribute the Original Software (or
+ portions thereof), with or without Modifications,
+ and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making,
+ using or selling of Original Software, to make, have
+ made, use, practice, sell, and offer for sale, and/or
+ otherwise dispose of the Original Software (or
+ portions thereof).
+
+ (c) The licenses granted in Sections 2.1(a) and (b)
+ are effective on the date Initial Developer first
+ distributes or otherwise makes the Original Software
+ available to a third party under the terms of this
+ License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent
+ license is granted: (1) for code that You delete from
+ the Original Software, or (2) for infringements
+ caused by: (i) the modification of the Original
+ Software, or (ii) the combination of the Original
+ Software with other software or devices.
+
+ 2.2. Contributor Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and
+ subject to third party intellectual property claims, each
+ Contributor hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+
+ (a) under intellectual property rights (other than
+ patent or trademark) Licensable by Contributor to
+ use, reproduce, modify, display, perform, sublicense
+ and distribute the Modifications created by such
+ Contributor (or portions thereof), either on an
+ unmodified basis, with other Modifications, as
+ Covered Software and/or as part of a Larger Work; and
+
+
+ (b) under Patent Claims infringed by the making,
+ using, or selling of Modifications made by that
+ Contributor either alone and/or in combination with
+ its Contributor Version (or portions of such
+ combination), to make, use, sell, offer for sale,
+ have made, and/or otherwise dispose of: (1)
+ Modifications made by that Contributor (or portions
+ thereof); and (2) the combination of Modifications
+ made by that Contributor with its Contributor Version
+ (or portions of such combination).
+
+ (c) The licenses granted in Sections 2.2(a) and
+ 2.2(b) are effective on the date Contributor first
+ distributes or otherwise makes the Modifications
+ available to a third party.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent
+ license is granted: (1) for any code that Contributor
+ has deleted from the Contributor Version; (2) for
+ infringements caused by: (i) third party
+ modifications of Contributor Version, or (ii) the
+ combination of Modifications made by that Contributor
+ with other software (except as part of the
+ Contributor Version) or other devices; or (3) under
+ Patent Claims infringed by Covered Software in the
+ absence of Modifications made by that Contributor.
+
+ 3. Distribution Obligations.
+
+ 3.1. Availability of Source Code.
+
+ Any Covered Software that You distribute or otherwise make
+ available in Executable form must also be made available in
+ Source Code form and that Source Code form must be
+ distributed only under the terms of this License. You must
+ include a copy of this License with every copy of the
+ Source Code form of the Covered Software You distribute or
+ otherwise make available. You must inform recipients of any
+ such Covered Software in Executable form as to how they can
+ obtain such Covered Software in Source Code form in a
+ reasonable manner on or through a medium customarily used
+ for software exchange.
+
+ 3.2. Modifications.
+
+ The Modifications that You create or to which You
+ contribute are governed by the terms of this License. You
+ represent that You believe Your Modifications are Your
+ original creation(s) and/or You have sufficient rights to
+ grant the rights conveyed by this License.
+
+ 3.3. Required Notices.
+
+ You must include a notice in each of Your Modifications
+ that identifies You as the Contributor of the Modification.
+ You may not remove or alter any copyright, patent or
+ trademark notices contained within the Covered Software, or
+ any notices of licensing or any descriptive text giving
+ attribution to any Contributor or the Initial Developer.
+
+ 3.4. Application of Additional Terms.
+
+ You may not offer or impose any terms on any Covered
+ Software in Source Code form that alters or restricts the
+ applicable version of this License or the recipients'
+ rights hereunder. You may choose to offer, and to charge a
+ fee for, warranty, support, indemnity or liability
+ obligations to one or more recipients of Covered Software.
+ However, you may do so only on Your own behalf, and not on
+ behalf of the Initial Developer or any Contributor. You
+ must make it absolutely clear that any such warranty,
+ support, indemnity or liability obligation is offered by
+ You alone, and You hereby agree to indemnify the Initial
+ Developer and every Contributor for any liability incurred
+ by the Initial Developer or such Contributor as a result of
+ warranty, support, indemnity or liability terms You offer.
+
+
+ 3.5. Distribution of Executable Versions.
+
+ You may distribute the Executable form of the Covered
+ Software under the terms of this License or under the terms
+ of a license of Your choice, which may contain terms
+ different from this License, provided that You are in
+ compliance with the terms of this License and that the
+ license for the Executable form does not attempt to limit
+ or alter the recipient's rights in the Source Code form
+ from the rights set forth in this License. If You
+ distribute the Covered Software in Executable form under a
+ different license, You must make it absolutely clear that
+ any terms which differ from this License are offered by You
+ alone, not by the Initial Developer or Contributor. You
+ hereby agree to indemnify the Initial Developer and every
+ Contributor for any liability incurred by the Initial
+ Developer or such Contributor as a result of any such terms
+ You offer.
+
+ 3.6. Larger Works.
+
+ You may create a Larger Work by combining Covered Software
+ with other code not governed by the terms of this License
+ and distribute the Larger Work as a single product. In such
+ a case, You must make sure the requirements of this License
+ are fulfilled for the Covered Software.
+
+ 4. Versions of the License.
+
+ 4.1. New Versions.
+
+ Sun Microsystems, Inc. is the initial license steward and
+ may publish revised and/or new versions of this License
+ from time to time. Each version will be given a
+ distinguishing version number. Except as provided in
+ Section 4.3, no one other than the license steward has the
+ right to modify this License.
+
+ 4.2. Effect of New Versions.
+
+ You may always continue to use, distribute or otherwise
+ make the Covered Software available under the terms of the
+ version of the License under which You originally received
+ the Covered Software. If the Initial Developer includes a
+ notice in the Original Software prohibiting it from being
+ distributed or otherwise made available under any
+ subsequent version of the License, You must distribute and
+ make the Covered Software available under the terms of the
+ version of the License under which You originally received
+ the Covered Software. Otherwise, You may also choose to
+ use, distribute or otherwise make the Covered Software
+ available under the terms of any subsequent version of the
+ License published by the license steward.
+
+ 4.3. Modified Versions.
+
+ When You are an Initial Developer and You want to create a
+ new license for Your Original Software, You may create and
+ use a modified version of this License if You: (a) rename
+ the license and remove any references to the name of the
+ license steward (except to note that the license differs
+ from this License); and (b) otherwise make it clear that
+ the license contains terms which differ from this License.
+
+
+ 5. DISCLAIMER OF WARRANTY.
+
+ COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
+ BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+ SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+ PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+ PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+ COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+ INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
+ ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+ WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+ DISCLAIMER.
+
+ 6. TERMINATION.
+
+ 6.1. This License and the rights granted hereunder will
+ terminate automatically if You fail to comply with terms
+ herein and fail to cure such breach within 30 days of
+ becoming aware of the breach. Provisions which, by their
+ nature, must remain in effect beyond the termination of
+ this License shall survive.
+
+ 6.2. If You assert a patent infringement claim (excluding
+ declaratory judgment actions) against Initial Developer or
+ a Contributor (the Initial Developer or Contributor against
+ whom You assert such claim is referred to as "Participant")
+ alleging that the Participant Software (meaning the
+ Contributor Version where the Participant is a Contributor
+ or the Original Software where the Participant is the
+ Initial Developer) directly or indirectly infringes any
+ patent, then any and all rights granted directly or
+ indirectly to You by such Participant, the Initial
+ Developer (if the Initial Developer is not the Participant)
+ and all Contributors under Sections 2.1 and/or 2.2 of this
+ License shall, upon 60 days notice from Participant
+ terminate prospectively and automatically at the expiration
+ of such 60 day notice period, unless if within such 60 day
+ period You withdraw Your claim with respect to the
+ Participant Software against such Participant either
+ unilaterally or pursuant to a written agreement with
+ Participant.
+
+ 6.3. In the event of termination under Sections 6.1 or 6.2
+ above, all end user licenses that have been validly granted
+ by You or any distributor hereunder prior to termination
+ (excluding licenses granted to You by any distributor)
+ shall survive termination.
+
+ 7. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+ COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
+ LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+ CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+ LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+ STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+ COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+ INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+ LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+ INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
+ APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+ NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+ CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
+ APPLY TO YOU.
+
+ 8. U.S. GOVERNMENT END USERS.
+
+ The Covered Software is a "commercial item," as that term is
+ defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+ computer software" (as that term is defined at 48 C.F.R.
+ 252.227-7014(a)(1)) and "commercial computer software
+ documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
+ 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+ through 227.7202-4 (June 1995), all U.S. Government End Users
+ acquire Covered Software with only those rights set forth herein.
+ This U.S. Government Rights clause is in lieu of, and supersedes,
+ any other FAR, DFAR, or other clause or provision that addresses
+ Government rights in computer software under this License.
+
+ 9. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the
+ extent necessary to make it enforceable. This License shall be
+ governed by the law of the jurisdiction specified in a notice
+ contained within the Original Software (except to the extent
+ applicable law, if any, provides otherwise), excluding such
+ jurisdiction's conflict-of-law provisions. Any litigation
+ relating to this License shall be subject to the jurisdiction of
+ the courts located in the jurisdiction and venue specified in a
+ notice contained within the Original Software, with the losing
+ party responsible for costs, including, without limitation, court
+ costs and reasonable attorneys' fees and expenses. The
+ application of the United Nations Convention on Contracts for the
+ International Sale of Goods is expressly excluded. Any law or
+ regulation which provides that the language of a contract shall
+ be construed against the drafter shall not apply to this License.
+ You agree that You alone are responsible for compliance with the
+ United States export administration regulations (and the export
+ control laws and regulation of any other countries) when You use,
+ distribute or otherwise make available any Covered Software.
+
+ 10. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is
+ responsible for claims and damages arising, directly or
+ indirectly, out of its utilization of rights under this License
+ and You agree to work with Initial Developer and Contributors to
+ distribute such responsibility on an equitable basis. Nothing
+ herein is intended or shall be deemed to constitute any admission
+ of liability.
+
diff --git a/branches/java-post-M1/samples/das/companyweb/src/main/resources/META-INF/NOTICE b/branches/java-post-M1/samples/das/companyweb/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000000..d48810c0ec
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,18 @@
+=========================================================================
+== NOTICE file corresponding to the section 4 d of ==
+== the Apache License, Version 2.0, ==
+== in this case for the Apache Tuscany distribution. ==
+=========================================================================
+
+This product includes software developed by the Apache Software Foundation
+(http://www.apache.org/).
+
+This product also includes software developed by:
+- the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
+- the Celtix project (http://celtix.objectweb.org/)
+- the Mozilla Rhino project (http://www.mozilla.org/rhino/)
+- the GlassFish JAX-WS project (https://jax-ws.dev.java.net/)
+
+Please read the LICENSE.txt file present in the root directory of this
+distribution.
+
diff --git a/branches/java-post-M1/samples/das/companyweb/src/main/resources/META-INF/README.txt b/branches/java-post-M1/samples/das/companyweb/src/main/resources/META-INF/README.txt
new file mode 100644
index 0000000000..9b26d1690a
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/src/main/resources/META-INF/README.txt
@@ -0,0 +1,35 @@
+Apache Tuscany M1 build (May, 2006)
+===================================
+
+http://incubator.apache.org/tuscany/
+
+Tuscany is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Web Services PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness or
+stability of the code, it does indicate that the project has yet to be fully
+endorsed by the ASF.
+
+
+Support
+-------
+
+Any problem with this release can be reported to the Tuscany mailing list
+or in the JIRA issue tracker.
+
+Mailing list subscription:
+ tuscany-dev-subscribe@ws.apache.org
+
+Jira:
+ http://issues.apache.org/jira/browse/Tuscany
+
+
+Thank you for using Tuscany!
+
+
+The Tuscany Team.
+
diff --git a/branches/java-post-M1/samples/das/companyweb/src/main/webapp/Company.jsp b/branches/java-post-M1/samples/das/companyweb/src/main/webapp/Company.jsp
new file mode 100644
index 0000000000..12b9bd736e
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/src/main/webapp/Company.jsp
@@ -0,0 +1,157 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<%--
+ * Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ --%>
+
+<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/branches/java-post-M1/samples/das/companyweb/src/main/webapp/META-INF/context.xml b/branches/java-post-M1/samples/das/companyweb/src/main/webapp/META-INF/context.xml
new file mode 100644
index 0000000000..fa95e589d3
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/src/main/webapp/META-INF/context.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<Context path="/DAS Stand alone app" debug="5" reloadable="true" crossContext="true">
+
+ <Manager pathname=""/>
+ <ResourceLink name="jdbc/dastest" global="jdbc/dastest" type="javax.sql.DataSource" />
+
+</Context>
diff --git a/branches/java-post-M1/samples/das/companyweb/src/main/webapp/WEB-INF/web.xml b/branches/java-post-M1/samples/das/companyweb/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..2908daece9
--- /dev/null
+++ b/branches/java-post-M1/samples/das/companyweb/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+ <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>
diff --git a/branches/java-post-M1/samples/das/pom.xml b/branches/java-post-M1/samples/das/pom.xml
new file mode 100644
index 0000000000..fb59eef88e
--- /dev/null
+++ b/branches/java-post-M1/samples/das/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<project>
+ <parent>
+ <groupId>org.apache.tuscany.samples</groupId>
+ <artifactId>tuscany-samples</artifactId>
+ <version>incubating-M1</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.samples.das</groupId>
+ <artifactId>tuscany-samples-das</artifactId>
+ <packaging>pom</packaging>
+ <name>Tuscany DAS Samples</name>
+ <version>incubating-M1</version>
+
+ <modules>
+ <module>companyweb</module>
+ </modules>
+</project>