From bdd0a41aed7edf21ec2a65cfa17a86af2ef8c48a Mon Sep 17 00:00:00 2001 From: dims Date: Tue, 17 Jun 2008 00:23:01 +0000 Subject: Move Tuscany from Incubator to top level. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@668359 13f79535-47bb-0310-9956-ffa450edef68 --- branches/das-java-M2/samples/companyweb/build.xml | 55 ++ .../das-java-M2/samples/companyweb/dastest/db.lck | Bin 0 -> 38 bytes .../samples/companyweb/dastest/log/log.ctrl | Bin 0 -> 48 bytes .../samples/companyweb/dastest/log/log1.dat | Bin 0 -> 1048576 bytes .../samples/companyweb/dastest/log/logmirror.ctrl | Bin 0 -> 48 bytes .../samples/companyweb/dastest/seg0/c10.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c101.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c111.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c121.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c130.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c141.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c150.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c161.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c171.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c180.dat | Bin 0 -> 24576 bytes .../samples/companyweb/dastest/seg0/c191.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c1a1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c1b1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c1c0.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c1d1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c1e0.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c1f1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c20.dat | Bin 0 -> 24576 bytes .../samples/companyweb/dastest/seg0/c200.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c211.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c221.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c230.dat | Bin 0 -> 86016 bytes .../samples/companyweb/dastest/seg0/c241.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c251.dat | Bin 0 -> 12288 bytes .../samples/companyweb/dastest/seg0/c260.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c271.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c281.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c290.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c2a1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c2b1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c2c1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c2d0.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c2e1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c2f0.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c300.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c31.dat | Bin 0 -> 16384 bytes .../samples/companyweb/dastest/seg0/c311.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c320.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c331.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c340.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c351.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c360.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c371.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c380.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c391.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c3a0.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c3b1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c3c0.dat | Bin 0 -> 24576 bytes .../samples/companyweb/dastest/seg0/c3d1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c3e0.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c3f1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c400.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c41.dat | Bin 0 -> 16384 bytes .../samples/companyweb/dastest/seg0/c411.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c420.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c431.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c440.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c451.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c460.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c471.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c481.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c490.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c4a1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c51.dat | Bin 0 -> 16384 bytes .../samples/companyweb/dastest/seg0/c60.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c71.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c81.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/c90.dat | Bin 0 -> 20480 bytes .../samples/companyweb/dastest/seg0/ca1.dat | Bin 0 -> 24576 bytes .../samples/companyweb/dastest/seg0/cb1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/cc0.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/cd1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/ce1.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/seg0/cf0.dat | Bin 0 -> 8192 bytes .../samples/companyweb/dastest/service.properties | 22 + branches/das-java-M2/samples/companyweb/pom.xml | 57 ++ branches/das-java-M2/samples/companyweb/readme.htm | 654 +++++++++++++++++++++ .../samples/das/companyweb/CompanyClient.java | 151 +++++ .../src/main/resources/CompanyConfig.xml | 46 ++ .../src/main/resources/META-INF/LICENSE.txt | 202 +++++++ .../companyweb/src/main/resources/META-INF/NOTICE | 32 + .../src/main/resources/META-INF/README.txt | 35 ++ .../companyweb/src/main/resources/log4j.properties | 29 + .../samples/companyweb/src/main/webapp/Company.jsp | 158 +++++ .../src/main/webapp/META-INF/context.xml | 25 + .../companyweb/src/main/webapp/WEB-INF/web.xml | 30 + 91 files changed, 1496 insertions(+) create mode 100644 branches/das-java-M2/samples/companyweb/build.xml create mode 100644 branches/das-java-M2/samples/companyweb/dastest/db.lck create mode 100644 branches/das-java-M2/samples/companyweb/dastest/log/log.ctrl create mode 100644 branches/das-java-M2/samples/companyweb/dastest/log/log1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/log/logmirror.ctrl create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c10.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c101.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c111.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c121.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c130.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c141.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c150.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c161.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c171.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c180.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c191.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c1a1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c1b1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c1c0.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c1d1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c1e0.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c1f1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c20.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c200.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c211.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c221.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c230.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c241.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c251.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c260.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c271.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c281.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c290.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c2a1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c2b1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c2c1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c2d0.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c2e1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c2f0.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c300.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c31.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c311.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c320.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c331.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c340.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c351.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c360.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c371.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c380.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c391.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c3a0.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c3b1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c3c0.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c3d1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c3e0.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c3f1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c400.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c41.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c411.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c420.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c431.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c440.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c451.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c460.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c471.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c481.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c490.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c4a1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c51.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c60.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c71.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c81.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/c90.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/ca1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/cb1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/cc0.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/cd1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/ce1.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/seg0/cf0.dat create mode 100644 branches/das-java-M2/samples/companyweb/dastest/service.properties create mode 100644 branches/das-java-M2/samples/companyweb/pom.xml create mode 100644 branches/das-java-M2/samples/companyweb/readme.htm create mode 100644 branches/das-java-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java create mode 100644 branches/das-java-M2/samples/companyweb/src/main/resources/CompanyConfig.xml create mode 100644 branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt create mode 100644 branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/NOTICE create mode 100644 branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/README.txt create mode 100644 branches/das-java-M2/samples/companyweb/src/main/resources/log4j.properties create mode 100644 branches/das-java-M2/samples/companyweb/src/main/webapp/Company.jsp create mode 100644 branches/das-java-M2/samples/companyweb/src/main/webapp/META-INF/context.xml create mode 100644 branches/das-java-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml (limited to 'branches/das-java-M2/samples/companyweb') diff --git a/branches/das-java-M2/samples/companyweb/build.xml b/branches/das-java-M2/samples/companyweb/build.xml new file mode 100644 index 0000000000..dd269b628e --- /dev/null +++ b/branches/das-java-M2/samples/companyweb/build.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/branches/das-java-M2/samples/companyweb/dastest/db.lck b/branches/das-java-M2/samples/companyweb/dastest/db.lck new file mode 100644 index 0000000000..9f6b4b3d4b Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/db.lck differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/log/log.ctrl b/branches/das-java-M2/samples/companyweb/dastest/log/log.ctrl new file mode 100644 index 0000000000..edbd775299 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/log/log.ctrl differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/log/log1.dat b/branches/das-java-M2/samples/companyweb/dastest/log/log1.dat new file mode 100644 index 0000000000..7e85ac8e8f Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/log/log1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/log/logmirror.ctrl b/branches/das-java-M2/samples/companyweb/dastest/log/logmirror.ctrl new file mode 100644 index 0000000000..edbd775299 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/log/logmirror.ctrl differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c10.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c10.dat new file mode 100644 index 0000000000..5d8ecaa10f Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c10.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c101.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c101.dat new file mode 100644 index 0000000000..0f79fa7574 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c101.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c111.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c111.dat new file mode 100644 index 0000000000..39d49e3d19 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c111.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c121.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c121.dat new file mode 100644 index 0000000000..2a4311779b Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c121.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c130.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c130.dat new file mode 100644 index 0000000000..64e3c18d62 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c130.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c141.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c141.dat new file mode 100644 index 0000000000..0632d04164 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c141.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c150.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c150.dat new file mode 100644 index 0000000000..d7541026f6 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c150.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c161.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c161.dat new file mode 100644 index 0000000000..6673bf1873 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c161.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c171.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c171.dat new file mode 100644 index 0000000000..c2a753cc5d Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c171.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c180.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c180.dat new file mode 100644 index 0000000000..cb9391aed1 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c180.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c191.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c191.dat new file mode 100644 index 0000000000..d3cf1d6364 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c191.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1a1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c1a1.dat new file mode 100644 index 0000000000..a7a2d536e9 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c1a1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1b1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c1b1.dat new file mode 100644 index 0000000000..19097e69e7 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c1b1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1c0.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c1c0.dat new file mode 100644 index 0000000000..359525a31a Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c1c0.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1d1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c1d1.dat new file mode 100644 index 0000000000..9f257df932 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c1d1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1e0.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c1e0.dat new file mode 100644 index 0000000000..e43e52fb7f Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c1e0.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1f1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c1f1.dat new file mode 100644 index 0000000000..7e6ee3b1e0 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c1f1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c20.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c20.dat new file mode 100644 index 0000000000..1be6390f06 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c20.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c200.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c200.dat new file mode 100644 index 0000000000..b15d56855c Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c200.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c211.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c211.dat new file mode 100644 index 0000000000..84b0022312 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c211.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c221.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c221.dat new file mode 100644 index 0000000000..63106a9523 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c221.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c230.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c230.dat new file mode 100644 index 0000000000..9975f27c1f Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c230.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c241.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c241.dat new file mode 100644 index 0000000000..835c645a16 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c241.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c251.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c251.dat new file mode 100644 index 0000000000..d3d6adf4fb Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c251.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c260.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c260.dat new file mode 100644 index 0000000000..8d7333df7d Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c260.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c271.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c271.dat new file mode 100644 index 0000000000..af722f7d73 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c271.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c281.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c281.dat new file mode 100644 index 0000000000..3972983c2e Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c281.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c290.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c290.dat new file mode 100644 index 0000000000..31577b8124 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c290.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2a1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c2a1.dat new file mode 100644 index 0000000000..0f700d13a7 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c2a1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2b1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c2b1.dat new file mode 100644 index 0000000000..1d6382fb3d Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c2b1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2c1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c2c1.dat new file mode 100644 index 0000000000..3bc60d886b Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c2c1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2d0.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c2d0.dat new file mode 100644 index 0000000000..c542d3c91c Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c2d0.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2e1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c2e1.dat new file mode 100644 index 0000000000..16abd20b5f Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c2e1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2f0.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c2f0.dat new file mode 100644 index 0000000000..eb26be5932 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c2f0.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c300.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c300.dat new file mode 100644 index 0000000000..1214f1df4b Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c300.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c31.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c31.dat new file mode 100644 index 0000000000..18c16f1123 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c31.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c311.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c311.dat new file mode 100644 index 0000000000..926cbf25b5 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c311.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c320.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c320.dat new file mode 100644 index 0000000000..07e7bc023c Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c320.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c331.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c331.dat new file mode 100644 index 0000000000..fd827f9dc2 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c331.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c340.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c340.dat new file mode 100644 index 0000000000..ca70319886 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c340.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c351.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c351.dat new file mode 100644 index 0000000000..8fbe2a527c Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c351.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c360.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c360.dat new file mode 100644 index 0000000000..dcf9c746e1 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c360.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c371.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c371.dat new file mode 100644 index 0000000000..6f21a840ea Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c371.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c380.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c380.dat new file mode 100644 index 0000000000..b512e8065f Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c380.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c391.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c391.dat new file mode 100644 index 0000000000..27006e95a1 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c391.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3a0.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c3a0.dat new file mode 100644 index 0000000000..565dca97ac Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c3a0.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3b1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c3b1.dat new file mode 100644 index 0000000000..36894c9818 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c3b1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3c0.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c3c0.dat new file mode 100644 index 0000000000..d0c538aede Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c3c0.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3d1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c3d1.dat new file mode 100644 index 0000000000..65bcec5527 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c3d1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3e0.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c3e0.dat new file mode 100644 index 0000000000..bdab359420 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c3e0.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3f1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c3f1.dat new file mode 100644 index 0000000000..dc2d278b57 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c3f1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c400.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c400.dat new file mode 100644 index 0000000000..3072709cec Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c400.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c41.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c41.dat new file mode 100644 index 0000000000..61086690f2 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c41.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c411.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c411.dat new file mode 100644 index 0000000000..ca551d8249 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c411.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c420.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c420.dat new file mode 100644 index 0000000000..f04de0840e Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c420.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c431.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c431.dat new file mode 100644 index 0000000000..398b1672cc Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c431.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c440.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c440.dat new file mode 100644 index 0000000000..af259d0872 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c440.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c451.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c451.dat new file mode 100644 index 0000000000..772a18c658 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c451.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c460.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c460.dat new file mode 100644 index 0000000000..505428362d Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c460.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c471.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c471.dat new file mode 100644 index 0000000000..484d0df42d Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c471.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c481.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c481.dat new file mode 100644 index 0000000000..faac073076 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c481.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c490.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c490.dat new file mode 100644 index 0000000000..7585319d21 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c490.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c4a1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c4a1.dat new file mode 100644 index 0000000000..4fe8b786e3 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c4a1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c51.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c51.dat new file mode 100644 index 0000000000..7fc7937b15 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c51.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c60.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c60.dat new file mode 100644 index 0000000000..d1fb08c946 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c60.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c71.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c71.dat new file mode 100644 index 0000000000..d4c2090a3b Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c71.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c81.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c81.dat new file mode 100644 index 0000000000..38b6ea6520 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c81.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c90.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/c90.dat new file mode 100644 index 0000000000..a607a5969c Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/c90.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/ca1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/ca1.dat new file mode 100644 index 0000000000..19b4c9e340 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/ca1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/cb1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/cb1.dat new file mode 100644 index 0000000000..73dc986572 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/cb1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/cc0.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/cc0.dat new file mode 100644 index 0000000000..d1eef3bb56 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/cc0.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/cd1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/cd1.dat new file mode 100644 index 0000000000..c7e6db3ef7 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/cd1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/ce1.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/ce1.dat new file mode 100644 index 0000000000..8fd3bf17a8 Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/ce1.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/cf0.dat b/branches/das-java-M2/samples/companyweb/dastest/seg0/cf0.dat new file mode 100644 index 0000000000..332b3d9a8a Binary files /dev/null and b/branches/das-java-M2/samples/companyweb/dastest/seg0/cf0.dat differ diff --git a/branches/das-java-M2/samples/companyweb/dastest/service.properties b/branches/das-java-M2/samples/companyweb/dastest/service.properties new file mode 100644 index 0000000000..8cfe3b09a5 --- /dev/null +++ b/branches/das-java-M2/samples/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/das-java-M2/samples/companyweb/pom.xml b/branches/das-java-M2/samples/companyweb/pom.xml new file mode 100644 index 0000000000..cfa8171171 --- /dev/null +++ b/branches/das-java-M2/samples/companyweb/pom.xml @@ -0,0 +1,57 @@ + + + + + + org.apache.tuscany.das.samples + tuscany-samples-das + 1.0-incubator-M2-SNAPSHOT + + + 4.0.0 + sample-companyweb + war + Tuscany DAS Company Sample + Sample use of RDB DAS in a Web application + + + + + org.apache.tuscany.das + tuscany-das-rdb + ${pom.version} + compile + + + + + + + src/main/java + + + src/main/java + + + src/main/resources + + + + diff --git a/branches/das-java-M2/samples/companyweb/readme.htm b/branches/das-java-M2/samples/companyweb/readme.htm new file mode 100644 index 0000000000..4af782ff8d --- /dev/null +++ b/branches/das-java-M2/samples/companyweb/readme.htm @@ -0,0 +1,654 @@ + + + + + + + + +Tuscany RDB DAS Sample + + + + + + + + + + +
+ +

Tuscany RDB DAS Sample (companyweb)

+ +

 

+ +

This stand-alone sample demonstrates the SDO RDB Data Access +Service in the context of a simple web application.

+ +

 

+ +

The application starts with a canned database of Companies +and their related Departments.  Through +the web page interface, a user can:

+ +

 

+ +
    +
  1. Display + all Companies in the database
    2. +
  2. Display + all Companies and related Departments
    3. +
  3. Add a + new Department to a Company
    4. +
  4. Delete + all Departments from a Company
    5. +
  5. Change + the names of Departments in a Company
    6. +
+ +

 

+ +

So, this simple application covers all CRUD operations as +well as the some relationship manipulation (adding a Department associates that +Department with the Company).  The sample +runs on Tomcat 5.5 and employs a Derby +database accessed via a DataSource.

+ +

Running the sample

+ +

There are two options for running this sample:

+ +

 

+ +
    +
  1. Run + from Tomcat configured by the build
    2. +
  2. Deploying + the CompanyWeb WAR into a Tomcat you configure + yourself
    3. +
+ +

Running from Tomcat configured by the build

+ +

This sample application is deployed (along with the canned +test database) to an instance of Tomcat as part of our automated sample +testing.  This means you can run the +java/das/samples/testing/tomcat build (see +java/das/samples/testing/tomcat/readme.htm )  and then access the application by pointing +your browser to http://localhost:8080/sample-companyweb/. 

+ +

Deploying the CompanyWeb WAR into a Tomcat you +configure yourself

+ +

Alternatively, you can deploy the sample to your own +configured Tomcat installation by following the instructions below.  These instructions assume that you have either +1) downloaded the Tuscany sample distribution or 2) Downloaded the Tuscany +source and run our maven build, see the following link to more details steps on +how to build DAS Sample applications http://incubator.apache.org/tuscany/java_das_overview.html +.

+ +

Set Up

+ +
    +
  1. Download + and install the most recent stable version of Tomcat 5.5.  You can find it here: http://tomcat.apache.org/download-55.cgi
    2. +
  2. Download + the most recent official release of Derby + from here: http://db.apache.org/derby/index.html.  The only file you’ll need from this + download is derby.jar
    3. +
  3. Stop + Tomcat
    4. +
  4. Copy derby.jar (from the derby distribution) to {Tomcat_Home}/common/lib:
    5. +
  5. Add + the sample war file to {Tomcat_Home}/webapps
    6. +
      +
    1. sample-companyweb-xxx.war (e.g. + “sample-companyweb-1.0-incubator-M2.war”)
      2. +
    +
  6. Install + the canned Derby database to + Tomcat:
    7. +
      +
    1. First, + create a new directory named “Databases” to hold the sample database.  Create {Tomcat_Home}/Databases
      2. +
    2. Copy + the dastest folder (and all its contents) from + {build directory root OR where samples where unzipped}/java/das/samples/companyweb to {Tomcat_Home}/Databases.  
      +
      + NOTE: If you are running this + from a sample distribution, the canned database is available in the + distribution, inside the databases directory.
      3. +
    +
+ +

 

+ +
    +
  1. Define + a DataSource by adding a datasource definition + to {Tomcat_Home}/conf/server.xml.
    2. +
      +
    1. Find + the end-of-section marker </GlobalNamingResources> + and add the following lines just above it:
      2. +
    +
+ +

 

+ +
        <!-- Global Datasource for Derby dastest database -->
         <Resource name="jdbc/dastest"
              type="javax.sql.DataSource"  auth="Container"
              description="Derby database for DAS Company sample"
              maxActive="100" maxIdle="30" maxWait="10000"
              username="" password="" 
              driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
              url="jdbc:derby:{absolute path}Databases/dastest"/>
+ +

 

+ +

 Requirement: +You must include the absolute path to the “Databases” directory in the above url attribute.  Fore example:

+ +

 

+ +
         url="jdbc:derby:c:\apache-tomcat-5.5.17\Databases/dastest"/>
+ +

 

+ +
    +
  1. Start + tomcat and point your browser to: http://localhost:8080/sample-companyweb-{version + tag}/
    2. +
+ +

 

+ +

example: http://localhost:8080/sample-companyweb-1.0-incubator-M2/

+ +

 

+ +

Sample Architecture

+ +

This is a simple, single-page, web application.  The main components of this application are:

+ +
    +
  • The + RDB Data Access Service (DAS)
    • +
  • SDO
    • +
  • CompanyClient.java
    • +
  • Company.jsp
    • +
  • The + canned Derby database
    • +
+ +

 

+ +

 

+ +

The CompanyClient +uses the DAS directly and provides +high-level services to the jsp such as:

+ +

public +final List getCompanies()

+ +

This is a good place to look for how you might use the DAS +in your own application.

+ +

 

+ +

The Company.jsp +responds to client interaction by invoking services of the CompanyClient.  It receives data from the CompanyClient +as SDO data graphs and manipulates SDOs directly to display data.

+ +

 

+ +

The canned Derby +database comes preloaded with Companies and related Departments.  The Derby +database instance is a simple file folder.

+ +

 

+ +

The DAS accepts +directives (commands) from the CompanyClient and +reads and writes to the derby database instance appropriately.

+ +
+ + + + + diff --git a/branches/das-java-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java b/branches/das-java-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java new file mode 100644 index 0000000000..d0519ecc08 --- /dev/null +++ b/branches/das-java-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java @@ -0,0 +1,151 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tuscany.samples.das.companyweb; + +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Random; + +import org.apache.tuscany.das.rdb.Command; +import org.apache.tuscany.das.rdb.DAS; + +import commonj.sdo.DataObject; + +public class CompanyClient { + + private Random generator = new Random(); + + private DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml")); + + public final List getCompanies() { + + Command read = das.getCommand("all companies"); + DataObject root = read.executeQuery(); + return root.getList("COMPANY"); + + } + + public final List getCompaniesWithDepartments() { + + Command read = das.getCommand("all companies and departments"); + DataObject root = read.executeQuery(); + return root.getList("COMPANY"); + } + + public final List getDepartmentsForCompany(int id) { + Command read = das.getCommand("all departments for company"); + read.setParameter(1, new Integer(id)); + DataObject root = read.executeQuery(); + return root.getList("COMPANY"); + } + + public final void addDepartmentToFirstCompany() { + Command read = das.getCommand("all companies and departments"); + DataObject root = read.executeQuery(); + DataObject firstCustomer = root.getDataObject("COMPANY[1]"); + + DataObject newDepartment = root.createDataObject("DEPARTMENT"); + newDepartment.setString("NAME", "Default Name"); + firstCustomer.getList("departments").add(newDepartment); + + das.applyChanges(root); + + } + + public final void deleteDepartmentsFromFirstCompany() { + + // This section gets the ID of the first Company just so I can + // demonstrate a parameterized command next + Command readAll = das.getCommand("all companies and departments"); + DataObject root = readAll.executeQuery(); + int idOfFirstCustomer = root.getInt("COMPANY[1]/ID"); + System.out.println("ID of first company is: " + idOfFirstCustomer); + + // Read a specific company based on the known ID + Command readCust = das.getCommand("company by id with departments"); + readCust.setParameter(1, new Integer(idOfFirstCustomer)); + root = readCust.executeQuery(); + + // Delete all the comany's departments from the graph + DataObject firstCustomer = root.getDataObject("COMPANY[1]"); + + // Shallow copy of list for deleting. This is required to avoid the + // dreaded + // ConcurrentModificationException since #delete operation also removes + // from the original list + List allDepartments = new ArrayList(firstCustomer.getList("departments")); + + Iterator i = allDepartments.iterator(); + DataObject department; + while (i.hasNext()) { + department = (DataObject) i.next(); + System.out.println("Deleting department named: " + department.getString("NAME")); + department.delete(); + } + + das.applyChanges(root); + + } + + public final void changeFirstCompanysDepartmentNames() { + + // This section gets the ID of the first Company just so I can + // demonstrate a parameterized command next + Command readAll = das.getCommand("all companies and departments"); + DataObject root = readAll.executeQuery(); + int idOfFirstCustomer = root.getInt("COMPANY[1]/ID"); + System.out.println("ID of first company is: " + idOfFirstCustomer); + + // Read a specific company based on the known ID + Command readCust = das.getCommand("company by id with departments"); + readCust.setParameter(1, new Integer(idOfFirstCustomer)); + root = readCust.executeQuery(); + + // Modify all the comany's department names + DataObject firstCustomer = root.getDataObject("COMPANY[1]"); + Iterator i = firstCustomer.getList("departments").iterator(); + DataObject department; + while (i.hasNext()) { + department = (DataObject) i.next(); + System.out.println("Modifying department: " + department.getString("NAME")); + department.setString("NAME", getRandomDepartmentName()); + } + das.applyChanges(root); + + } + + + public void releaseResources() { + das.releaseResources(); + } + + // Utilities + + private String getRandomDepartmentName() { + int number = generator.nextInt(1000) + 1; + return "Dept-" + number; + } + + private InputStream getConfig(String fileName) { + return getClass().getClassLoader().getResourceAsStream(fileName); + } + +} diff --git a/branches/das-java-M2/samples/companyweb/src/main/resources/CompanyConfig.xml b/branches/das-java-M2/samples/companyweb/src/main/resources/CompanyConfig.xml new file mode 100644 index 0000000000..1992ab02cd --- /dev/null +++ b/branches/das-java-M2/samples/companyweb/src/main/resources/CompanyConfig.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + diff --git a/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt b/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/NOTICE b/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/NOTICE new file mode 100644 index 0000000000..f1aa4f1921 --- /dev/null +++ b/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/NOTICE @@ -0,0 +1,32 @@ +Apache Tuscany DAS for Java +Copyright 2006 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Apache Tuscany is an effort undergoing incubation at The Apache Software Foundation (ASF), +sponsored by the Apache Web Services PMC. Incubation is required of all newly accepted +projects until a further review indicates that the infrastructure, communications, +and decision making process have stabilized in a manner consistent with other successful +ASF projects. While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be fully endorsed +by the ASF. + +Unless otherwise indicated, all distribution made available by the Apache Software Foundation +is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL"). +A copy of the AL is provided with this distribution as the LICENSE.txt file present in the +root directory, and is also available at http://www.apache.org/licenses/. + +The terms and conditions governing the distribution may refer to the AL or other license +agreements, notices or terms and conditions. Some of these other license agreements may +include (but are not limited to): + + . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html) + . Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html) + +This product also includes software developed by: +- the Eclipse Modeling Framework project (http://www.eclipse.org/emf/) + +It is your obligation to read and accept all such terms and conditions prior to use of the +distribution. If term or condition is provided, please contact the Apache Software Foundation +to determine what terms and conditions govern that particular distribution. diff --git a/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/README.txt b/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/README.txt new file mode 100644 index 0000000000..107de8c3ca --- /dev/null +++ b/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/README.txt @@ -0,0 +1,35 @@ +Apache Tuscany M2 build (October, 2006) +=================================== + +http://incubator.apache.org/tuscany/ + +Tuscany is an effort undergoing incubation at the Apache Software Foundation +(ASF), sponsored by the Web Services PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness or +stability of the code, it does indicate that the project has yet to be fully +endorsed by the ASF. + + +Support +------- + +Any problem with this release can be reported to the Tuscany mailing list +or in the JIRA issue tracker. + +Mailing list subscription: + tuscany-dev-subscribe@ws.apache.org + +Jira: + http://issues.apache.org/jira/browse/Tuscany + + +Thank you for using Tuscany! + + +The Tuscany Team. + diff --git a/branches/das-java-M2/samples/companyweb/src/main/resources/log4j.properties b/branches/das-java-M2/samples/companyweb/src/main/resources/log4j.properties new file mode 100644 index 0000000000..5c49df303c --- /dev/null +++ b/branches/das-java-M2/samples/companyweb/src/main/resources/log4j.properties @@ -0,0 +1,29 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=INFO, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n + +# Print only messages of level WARN or above in the package com.foo. +log4j.logger.org.apache.tuscany=NONE \ No newline at end of file diff --git a/branches/das-java-M2/samples/companyweb/src/main/webapp/Company.jsp b/branches/das-java-M2/samples/companyweb/src/main/webapp/Company.jsp new file mode 100644 index 0000000000..58db88c623 --- /dev/null +++ b/branches/das-java-M2/samples/companyweb/src/main/webapp/Company.jsp @@ -0,0 +1,158 @@ + + + + +<%@ 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.*" +%> + + +Company Test + + + +

Tuscany DAS Companies WEB Example

+ + +
+ + + + + +
+ + +<%if(request.getParameter("doFill") != null){%> + + + + + + + + + + + <% + CompanyClient companyClient = new CompanyClient(); + java.util.Iterator i = companyClient.getCompaniesWithDepartments().iterator(); + while (i.hasNext()) { + DataObject company = (DataObject)i.next(); + %> + + + + + <% + } + companyClient.releaseResources(); + %> + + +
IDName
<%=company.getInt("ID")%><%=company.getString("NAME")%>
+<%}%> + + + +<% +if(request.getParameter("doAddDepartment") != null){ + CompanyClient companyClient = new CompanyClient(); + companyClient.addDepartmentToFirstCompany(); + companyClient.releaseResources(); +} +%> + + +<% +if(request.getParameter("doDeleteDepartments") != null){ + CompanyClient companyClient = new CompanyClient(); + companyClient.deleteDepartmentsFromFirstCompany(); + companyClient.releaseResources(); +} +%> + + +<% +if(request.getParameter("doChangeDepartmentNames") != null){ + CompanyClient companyClient = new CompanyClient(); + companyClient.changeFirstCompanysDepartmentNames(); + companyClient.releaseResources(); +} +%> + + + +<%if(request.getParameter("doFill") == null) {%> + + + + + + + + + + + + + <% + CompanyClient companyClient = new CompanyClient(); + java.util.Iterator i = companyClient.getCompaniesWithDepartments().iterator(); + while (i.hasNext()) { + DataObject company = (DataObject)i.next(); + %> + + + + + + + + <% + java.util.Iterator j = company.getList("departments").iterator(); + while (j.hasNext()) { + DataObject department = (DataObject)j.next(); + %> + + + + + <% + } + %> + <% + } + companyClient.releaseResources(); + %> + + +
IDNameDepartment_IDDepartment_Name
<%=company.getInt("ID")%><%=company.getString("NAME")%>
<%=department.getInt("ID")%><%=department.getString("NAME")%>
+<%}%> + + + +
+ + diff --git a/branches/das-java-M2/samples/companyweb/src/main/webapp/META-INF/context.xml b/branches/das-java-M2/samples/companyweb/src/main/webapp/META-INF/context.xml new file mode 100644 index 0000000000..5f0af32dd5 --- /dev/null +++ b/branches/das-java-M2/samples/companyweb/src/main/webapp/META-INF/context.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/branches/das-java-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml b/branches/das-java-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..dc7e488fef --- /dev/null +++ b/branches/das-java-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,30 @@ + + + + + + Tuscany DAS sample Company WEB + + + Company.jsp + + + -- cgit v1.2.3