summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5/samples/customer-dojo-webapp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/README104
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/build-dojo.xml92
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/build.xml70
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.pngbin9947 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg177
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/customer.sql33
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/pom.xml225
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/Customer.java93
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java26
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java101
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java31
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java117
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/launch/Launch.java34
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml51
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml40
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml25
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/customer.composite37
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml23
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml34
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml41
-rw-r--r--branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/customer.jsp80
21 files changed, 0 insertions, 1434 deletions
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/README b/branches/sca-java-1.5/samples/customer-dojo-webapp/README
deleted file mode 100644
index 9c1729123f..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/README
+++ /dev/null
@@ -1,104 +0,0 @@
-Customer Dojo RPC Sample
-===========================
-
-Note. This sample is currently not working correctly on WebSphere - see TUSCANY-1990
-
-This sample demostrates the SCA JSONRPC binding using a simple web app that
-uses the RPC support of the Dojo Toolkit to an SCA service.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want
-to give this sample a go deploy the WAR file (target/sample-helloworld-dojo-webapp.war)
-to you web application server.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-dojo-webapp
-
-The port and hostname will of course vary depending on your local installation.
-
-See also the similar helloworld-jsonrpc-webapp sample which also uses the SCA JSONRPC binding
-but uses SCA scaDomain.js script on the client instead of the Dojo Toolkit.
-
-Sample Overview
----------------
-The sample provides a single service with an operation that reflects
-a greeting back to the caller. The service is exposed using the JSONRPC
-binding. The web app provided shows how the Dojo Toolkit JSON-RPC support can be
-used to invoke the SCA service.
-
-The web app provided shows how the service can be called by using the DOJO toolkit.
-
-helloworld-dojo-webapp/
- build-dojo.xml - This file is an Ant script used by the
- sample build process to download the Dojo Toolkit
- and get it included in the WAR file
- for use by the sample.
- src/
- main/
- java/
- helloworldjsonrpc/
- HelloWorldService.java - service interface
- HelloWorldServiceImpl.java - service implementation
- resources/
- jsonrpc.composite - the SCA assembly for this sample
- webapp
- dojo/ - the Dojo toolkit (this directory is created only
- when you build the samples from the source distribution)
- META-INF/
- sca-contribution.xml - specifies the composite to be deployed
- WEB-INF/
- web.xml - defines the listener that starts up the
- Tuscany SCA runtime
- HelloWorldJSONRPC.html - the web application that calls the
- SCA service via JSONRPC
- style.css - style sheet
-
- helloworld-jsonrpc-webapp.png - a pictorial representation of the
- sample .composite file
- build.xml - the Ant build file that unpacks the
- dojo installation
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as
-follows
-
-cd helloworld-dojo-webapp
-ant package
-
-This should result in a war file (sample-helloworld-dojo-webapp.war) in the target
-directory. Copy this war file to your web app deployment directory in your
-web app container.
-
-The process for getting the web app running will depend on which web app container
-you are using. For example, if you are using Tomcat then it is simply a matter
-of copying the WAR file to the webapps directory.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-dojo-webapp
-
-The port and hostname will of course vary depending on your local installation.
-
-You should see a web page that allows you to send messages, via JSONRPC, to the
-application running in the Tuscany SCA Runtime
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd helloworld-dojo-webapp
-mvn
-
-Again this should result in a war file (sample-helloworld-dojo-webapp.war) in the target
-directory. Follow the steps described in the previous section for running the web
-app and for the expected results.
-
-
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/build-dojo.xml b/branches/sca-java-1.5/samples/customer-dojo-webapp/build-dojo.xml
deleted file mode 100644
index 040e6d6a89..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/build-dojo.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="DojoZipInstaller">
-
-
- <property name="dojo.version" value="1.3.0b3"/>
- <property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/>
-
-
- <target name="check-dojo-installed">
- <condition property="already.installed" >
- <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
- </condition>
- <condition property="maven.suffix" value="">
- <os family="unix"/>
- </condition>
- <condition property="maven.suffix" value=".bat">
- <os family="windows"/>
- </condition>
- </target>
-
-
- <target name="check-dojo-unpacked">
- <condition property="already.unpacked" >
- <available file="${unpack.location}"/>
- </condition>
- </target>
-
- <target name="install-dojo" depends="check-dojo-installed" unless="already.installed">
- <mkdir dir="${basedir}/target/dojo-download/"/>
- <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
- dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
- verbose="true"
- usetimestamp="true"/>
- <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
- <arg line="install:install-file -DgroupId=dojo -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"/>
- </exec>
- </target>
-
- <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed">
- <mkdir dir="${basedir}/target/dojo-download/"/>
- <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
- dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
- verbose="true"
- usetimestamp="true"/>
- <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
- tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
- </target>
-
-
- <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">
- <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
- <mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
- <unzip src="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"
- dest="${basedir}/target/dojo-unpack-temp/"
- overwrite="false">
- <patternset>
- <include name="dojo-release-${dojo.version}/dojo/**"/>
- <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/>
- <include name="dojo-release-${dojo.version}/dijit/**"/>
- <exclude name="dojo-release-${dojo.version}/dojox/**"/>
- <exclude name="dojo-release-${dojo.version}/util/**"/>
- </patternset>
- </unzip>
- <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}"
- tofile="${unpack.location}"
- verbose="true"/>
- <delete dir="${basedir}/target/dojo-unpack-temp/"/>
- </target>
-
-
- <target name="clean-dojo-files">
- <delete dir="${unpack.location}"/>
- </target>
-</project>
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/build.xml b/branches/sca-java-1.5/samples/customer-dojo-webapp/build.xml
deleted file mode 100644
index f93d1fd091..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/build.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!DOCTYPE project [
-<!ENTITY buildDependency SYSTEM "build-dependency.xml">
-]>
-
-<project name="sample-customer-dojo-webapp" default="compile">
-
- &buildDependency;
-
- <target name="compile">
- <mkdir dir="target/classes"/>
- <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
- <src path="src\main\java"/>
- <classpath>
- <fileset refid="tuscany.jars"/>
- <fileset refid="3rdparty.jars"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src\main\resources"/>
- <fileset dir="src\main\resources"/>
- </copy>
-
- <ant antfile="./build-dojo.xml" target="install-dojo-nomaven">
- <property name="localRepository" value="./target/repo"/>
- </ant>
-
- <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
- <property name="localRepository" value="./target/repo"/>
- </ant>
-
- <war destfile="target/sample-helloworld-dojo-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">
- <fileset dir="src/main/webapp"/>
- <lib refid="tuscany.jars"/>
- <lib refid="3rdparty.jars"/>
- <classes dir="target/classes"/>
- </war>
-
- <ant antfile="./build-dojo.xml" target="clean-dojo-files">
- <property name="localRepository" value="./target/repo"/>
- </ant>
- </target>
-
- <target name="package" depends="compile"/>
-
- <target name="clean">
- <delete includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-
-
-</project>
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png b/branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png
deleted file mode 100644
index 57f90aed01..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg b/branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg
deleted file mode 100644
index d5c3bc5d3e..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp"
- sodipodi:docname="helloworld-jsonrpc-webapp.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp\helloworld-jsonrpc.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="516.28571"
- inkscape:cy="414.63224"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="158"
- inkscape:window-y="164" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="translate(144.2857,52.85714)">
- <rect
- rx="8.0946665"
- ry="12.692303"
- y="192.00233"
- x="258.31134"
- height="299.99988"
- width="262.14267"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999893;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">helloworldjsonrpc</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="449.91632"
- y="349.31049"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(190.3256,143.3719)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">HelloWorld</flowPara><flowPara
- id="flowPara1883">JSONService</flowPara><flowPara
- id="flowPara1885">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 373.48019,364.72909 L 455.16689,364.72909 L 470.019,392.34681 L 452.69154,417.84009 L 373.48019,417.84009 L 392.04536,392.34681 L 373.48019,364.72909 z "
- id="path3017" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1887"
- transform="translate(113.6483,167.4037)"><flowRegion
- id="flowRegion1889"><rect
- id="rect1891"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1893">HelloWorld</flowPara><flowPara
- id="flowPara1897">Service</flowPara></flowRoot> <rect
- style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1888"
- width="85"
- height="97.85714"
- x="214.28571"
- y="340.52307"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1892"
- transform="translate(-56.88742,135.3526)"><flowRegion
- id="flowRegion1894"><rect
- id="rect1896"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1900">WebApp</flowPara></flowRoot> <rect
- style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1912"
- width="45.714287"
- height="40.714287"
- x="277.85715"
- y="370.52304"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1914"
- transform="translate(1.400116,166.6895)"><flowRegion
- id="flowRegion1916"><rect
- id="rect1918"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1920">DOJO</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 324.28571,391.23734 C 391.42857,391.95163 391.42857,391.95163 391.42857,391.95163"
- id="path1922" />
- </g>
-</svg>
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/customer.sql b/branches/sca-java-1.5/samples/customer-dojo-webapp/customer.sql
deleted file mode 100644
index a3caf8e050..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/customer.sql
+++ /dev/null
@@ -1,33 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-DROP TABLE CUSTOMER;
-
-CREATE TABLE CUSTOMER (
- ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY,
- NAME VARCHAR(30),
- PHONE VARCHAR(10),
- ADDRESS VARCHAR(25),
- CITY VARCHAR(15),
- STATE VARCHAR(2),
- ZIP VARCHAR(5));
-
-INSERT INTO CUSTOMER (NAME, PHONE, ADDRESS, CITY, STATE, ZIP ) VALUES('Joe Smith', '4081234567', '1440 N 1st ST', 'SAN JOSE', 'CA', '95134');
-INSERT INTO CUSTOMER (NAME, PHONE, ADDRESS, CITY, STATE, ZIP ) VALUES('Erik Johnson', '4081230987', '1440 N 1st ST', 'SAN JOSE', 'CA', '95134');
-INSERT INTO CUSTOMER (NAME, PHONE, ADDRESS, CITY, STATE, ZIP ) VALUES('Mark Pensacola', '4085679988', '1440 N 1st ST', 'SAN JOSE', 'CA', '95134'); \ No newline at end of file
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/pom.xml b/branches/sca-java-1.5/samples/customer-dojo-webapp/pom.xml
deleted file mode 100644
index e0af2d0033..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/pom.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>1.5-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-customer-dojo-webapp</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA Sample Customer DOJO WebApp</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-data-api</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>1.0.0</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.3.1.4</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <!-- version>1.1</version -->
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>install-dojo</id>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="install-dojo">
- <property name="localRepository" value="${settings.localRepository}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>copy-dojo-files</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${artifactId}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>clean-dojo-files</id>
- <phase>clean</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="clean-dojo-files">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${artifactId}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-ant-generator</artifactId>
- <version>1.5-SNAPSHOT</version>
- <executions>
- <execution>
- <configuration>
- <buildDependencyFileOnly>true</buildDependencyFileOnly>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sql-maven-plugin</artifactId>
- <version>1.3</version>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.3.1.4</version>
- </dependency>
- </dependencies>
-
- <executions>
- <execution>
- <id>create-db</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
- <url>jdbc:derby:${pom.basedir}/target/classes/customer-db;create=true</url>
- <autocommit>true</autocommit>
- <onError>continue</onError>
- <onConnectionError>skip</onConnectionError>
- <delimiter>;</delimiter>
- <srcFiles>
- <srcFile>${pom.basedir}/customer.sql</srcFile>
- </srcFiles>
- </configuration>
- </execution>
-
- <!-- Shutdown DB in order to be able to run unit tests -->
- <execution>
- <id>shutdown-database-sothat-test-can-run</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
- <url>jdbc:derby:${pom.basedir}/target/classes/customer-db;shutdown=true</url>
- <skipOnConnectionError>true</skipOnConnectionError>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/Customer.java b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
deleted file mode 100644
index 6d207ea2ef..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package customer;
-
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class Customer {
-
- @Id protected int id;
- @Basic protected String name;
- @Basic protected String phone;
- @Basic protected String address;
- @Basic protected String city;
- @Basic protected String state;
- @Basic protected String zip;
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getZip() {
- return zip;
- }
-
- public void setZip(String zip) {
- this.zip = zip;
- }
-
-}
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
deleted file mode 100644
index 5ad39aad5c..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package customer;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-
-
-public interface CustomerCollection extends Collection<String, Customer> {
-
-}
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
deleted file mode 100644
index c0a2f25f15..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package customer;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-
-
-public class CustomerCollectionImpl implements CustomerCollection {
- EntityManagerFactory emf = null;
- EntityManager em = null;
-
- public CustomerCollectionImpl() {
- System.out.println(">>>");
- try {
- emf = Persistence.createEntityManagerFactory("customer-openJPA");
- em = emf.createEntityManager();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void delete(String arg0) throws NotFoundException {
- // TODO Auto-generated method stub
-
- }
-
- public Customer get(String arg0) throws NotFoundException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Entry<String, Customer>[] getAll() {
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- Query q = em.createQuery("SELECT c FROM customer c");
- List results = q.getResultList();
- Iterator iter = results.iterator();
- while (iter.hasNext()) {
- Customer customer = (Customer)iter.next();
-
- System.out.println(customer);
- }
-
- tx.commit();
- } catch(Exception e) {
- e.printStackTrace();
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
-
- em.close();
- }
-
- return null;
- }
-
- public String post(String arg0, Customer arg1) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void put(String arg0, Customer arg1) throws NotFoundException {
- // TODO Auto-generated method stub
-
- }
-
- public Entry<String, Customer>[] query(String arg0) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java
deleted file mode 100644
index 7915cc6e77..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package customer;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CustomerService {
-
- Customer[] get();
-
- Customer findCustomerByName(String name);
-
-}
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
deleted file mode 100644
index 0cba7d8bc1..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package customer;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-
-public class CustomerServiceImpl implements CustomerService {
- EntityManagerFactory emf = null;
- EntityManager em = null;
-
- public CustomerServiceImpl() {
-
- }
-
- @Init
- public void init() {
- System.out.println(">>> Initializing JPA");
- try {
- emf = Persistence.createEntityManagerFactory("customer-openJPA");
- em = emf.createEntityManager();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Destroy
- public void destroy() {
- emf.close();
- }
-
- public Customer[] get() {
- EntityTransaction tx = em.getTransaction();
- List<Customer> customers = new ArrayList<Customer>();
- try {
- tx.begin();
-
- Query q = em.createQuery("SELECT c FROM customer c");
- List results = q.getResultList();
- Iterator iter = results.iterator();
- while (iter.hasNext()) {
- Customer customer = (Customer)iter.next();
- customers.add(customer);
- }
-
- tx.commit();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
-
- em.close();
- }
-
- Customer[] customerArray = new Customer[customers.size()];
- customers.toArray(customerArray);
- return customerArray;
- }
-
- public Customer findCustomerByName(String name) {
- EntityTransaction tx = em.getTransaction();
- Customer customer = null;
-
- try {
- tx.begin();
-
- Query q = em.createQuery("SELECT c FROM customer c WHERE c.name = '" + name + "'");
- List results = q.getResultList();
- Iterator iter = results.iterator();
- while (iter.hasNext()) {
- customer = (Customer)iter.next();
- }
-
- tx.commit();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
-
- em.close();
- }
-
- return customer;
- }
-
-}
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/launch/Launch.java b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
deleted file mode 100644
index d7f88b8dd4..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package launch;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class Launch {
- public static void main(String[] args) throws Exception {
- System.out.println("Starting ...");
- SCADomain scaDomain = SCADomain.newInstance("customer.composite");
- System.out.println("store.composite ready for big business !!!");
- System.in.read();
- System.out.println("Stopping ...");
- scaDomain.close();
- System.out.println();
- }
-}
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
deleted file mode 100644
index 64be295302..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
- version="1.0">
- <entity class="customer.Customer" name="customer">
- <table name="CUSTOMER"/>
- <attributes>
- <id name="id">
- <generated-value strategy="TABLE"/>
- </id>
- <basic name="name">
- <column name="NAME" length="30"/>
- </basic>
- <basic name="phone">
- <column name="PHONE" length="10"/>
- </basic>
- <basic name="address">
- <column name="ADDRESS" length="25"/>
- </basic>
- <basic name="city">
- <column name="CITY" length="15"/>
- </basic>
- <basic name="state">
- <column name="STATE" length="2"/>
- </basic>
- <basic name="zip">
- <column name="ZIP" length="5"/>
- </basic>
- </attributes>
- </entity>
-</entity-mappings> \ No newline at end of file
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 5674dede06..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
- http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
-
- <persistence-unit name="customer-openJPA">
- <mapping-file>orm.xml</mapping-file>
- <class>customer.Customer</class>
-
- <properties>
- <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
- <property name="openjpa.ConnectionURL" value="jdbc:derby:/opt/apache-tomcat-6.0.16/webapps/sample-customer-dojo-webapp/WEB-INF/classes/customer-db"/>
- <property name="openjpa.ConnectionUserName" value=""/>
- <property name="openjpa.ConnectionPassword" value=""/>
-
- <property name="openjpa.Log" value="DefaultLevel=TRACE, Tool=TRACE"/>
- </properties>
- </persistence-unit>
-
-</persistence> \ No newline at end of file
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 59840213e4..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
--->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:sample="http://sample">
- <deployable composite="sample:customer"/>
-</contribution>
-
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/customer.composite b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/customer.composite
deleted file mode 100644
index 8b8a413499..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/customer.composite
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="customer">
-
- <service name="CustomerService" promote="CustomerServiceComponent/CustomerService">
- <interface.java interface="customer.CustomerService"/>
- <tuscany:binding.jsonrpc/>
- </service>
-
- <component name="CustomerServiceComponent">
- <implementation.java class="customer.CustomerServiceImpl"/>
- </component>
-
-</composite>
-
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index b390efd009..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:sample="http://sample">
- <deployable composite="sample:customer"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 5c1b72aec3..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
- xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <d:environment>
- <d:moduleId>
- <d:groupId>org.apache.tuscany.sca</d:groupId>
- <d:artifactId>sample-customer-dojo-webapp</d:artifactId>
- <d:version>1.5-SNAPSHOT</d:version>
- <d:type>war</d:type>
- </d:moduleId>
-
- <!-- TUSCANY-1986 -->
- <d:inverse-classloading />
- </d:environment>
-</web-app>
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d90b4a7d62..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
- <display-name>Apache Tuscany Customer dojo web application sample</display-name>
-
- <filter>
- <filter-name>tuscany</filter-name>
- <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>tuscany</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>customer.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/customer.jsp b/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
deleted file mode 100644
index f7e864053e..0000000000
--- a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
+++ /dev/null
@@ -1,80 +0,0 @@
-<%--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
---%>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-
-<html>
-<head>
- <title>Tuscany Dojo JSON-RPC Customer Example</TITLE>
-
- <style type="text/css">
- @import "dojo/dijit/themes/soria/soria.css";
- @import "dojo/dojo/resources/dojo.css"
- </style>
-
- <script type="text/javascript">
- var djConfig = {
- parseOnLoad: true,
- baseRelativePath: "dojo",
- isDebug: true,
- debugContainerId: "dojoDebug"
- };
- djConfig.usePlainJson=true ;
- //djConfig.debugAtAllCosts = true;
- </script>
-
- <script type="text/javascript" src="dojo/dojo/dojo.js"></script>
- <script type="text/javascript" src="dojo/dijit/dijit.js"></script>
-
- <script type="text/javascript">
- dojo.require("dojo.parser");
- dojo.require("dojo.rpc.JsonService");
- dojo.require("dijit.form.ValidationTextBox");
- dojo.require("dijit.form.Button");
- </script>
-
- <link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-
-<body class="soria">
-
-<h2>Tuscany Dojo JSON-RPC Customer Sample</h2>
-
-Customer Name :<br>
-<input type="text" id="name" size="30" value="Joe Smith" dojoType="dijit.form.TextBox" trim="true" propercase="true" required="true" />
-<input type="button" dojoType="dijit.form.Button" onclick="findCustomerByName()" />
-
-
-<script type="text/javascript">
- function findCustomerByName() {
- var name = document.getElementById("name").value;
- customerService.findCustomerByName(name).addCallback(contentCallBack);;
- }
-
- function contentCallBack(result) {
- alert(result.name);
- //var handlerNode = document.getElementById("ReturnedContent");
- //handlerNode.innerHTML = "<p>" + result + "</p>" ;
- }
-
- var customerService = new dojo.rpc.JsonService("CustomerService?smd");
-</script>
-
-</body>
-</html>