Starting to clean up android branch, creating subsets of samples, demos, tutorials that can be ported to android.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@696177 13f79535-47bb-0310-9956-ffa450edef68

30 files changed, 0 insertions, 2350 deletions

diff --git a/branches/sca-android/samples/quote-xquery/README b/branches/sca-android/samples/quote-xquery/README
deleted file mode 100644
index cf8a4609a6..0000000000
--- a/branches/sca-android/samples/quote-xquery/README
+++ /dev/null
@@ -1,450 +0,0 @@
-Quote Xquery Sample

-===================

-

- This sample covers the most important integration scenarios for the xquery

- implementation type and its corresponding saxon data bindings.

- 

-If you just want to run it to see what happens open two command prompts (one for the server

-and the other for the client), navigate to this sample directory and do:

-

-Command Prompt 1:

-ant

-ant run-server

-

-Command Prompt 2:

-ant run

-

-OR if you don't have ant, on Windows do

-

-In the directory samples\quote-xquery use the JDK 1.5 java command to run the class xquery.quote.XQueryQuoteClient 

-

-Linux:   java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-quote-xquery.jar xquery.quote.XQueryQuoteServer

-Linux:   java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-quote-xquery.jar xquery.quote.XQueryQuoteClient

-

-Windows: java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-quote-xquery.jar xquery.quote.XQueryQuoteServer

-Windows: java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-quote-xquery.jar xquery.quote.XQueryQuoteClient

-

-Results

-----------

-The sample when run should simply display on the standard output some startup messages followed by:

-

-The compilation:

-

-Buildfile: build.xml

-

-init:

-

-generate-sdo:

-     [java] >>  Generating code

-     [java] >>  Generating packages

-     [java] >>  Generating package QuotePackageImpl

-     [java] >>  Generating Java interface org.example.quote.QuoteFactory

-     [java] >>  Generating /TargetProject/org/example/quote/QuoteFactory.java

-     [java] >>  Examining old /TargetProject/org/example/quote/QuoteFactory.java

-     [java] >>  Generating Java class org.example.quote.impl.QuoteFactoryImpl

-     [java] >>  Generating /TargetProject/org/example/quote/impl/QuoteFactoryImpl.java

-     [java] >>  Examining old /TargetProject/org/example/quote/impl/QuoteFactoryImpl.java

-     [java] >>  Generating Quote

-     [java] >>  Generating Java interface org.example.quote.Quote

-     [java] >>  Generating /TargetProject/org/example/quote/Quote.java

-     [java] >>  Examining old /TargetProject/org/example/quote/Quote.java

-     [java] >>  Generating Java class org.example.quote.impl.QuoteImpl

-     [java] >>  Generating /TargetProject/org/example/quote/impl/QuoteImpl.java

-     [java] >>  Examining old /TargetProject/org/example/quote/impl/QuoteImpl.java

-     [java] >>  Generating Response

-     [java] >>  Generating Java interface org.example.quote.QuoteResponse

-     [java] >>  Generating /TargetProject/org/example/quote/QuoteResponse.java

-     [java] >>  Examining old /TargetProject/org/example/quote/QuoteResponse.java

-     [java] >>  Generating Java class org.example.quote.impl.QuoteResponseImpl

-     [java] >>  Generating /TargetProject/org/example/quote/impl/QuoteResponseImpl.java

-     [java] >>  Examining old /TargetProject/org/example/quote/impl/QuoteResponseImpl.java

-     [java] >>  Generating code

-     [java] >>  Generating packages

-     [java] >>  Generating package AvailPackageImpl

-     [java] >>  Generating Java interface org.example.avail.AvailFactory

-     [java] >>  Generating /TargetProject/org/example/avail/AvailFactory.java

-     [java] >>  Examining old /TargetProject/org/example/avail/AvailFactory.java

-     [java] >>  Generating Java class org.example.avail.impl.AvailFactoryImpl

-     [java] >>  Generating /TargetProject/org/example/avail/impl/AvailFactoryImpl.java

-     [java] >>  Examining old /TargetProject/org/example/avail/impl/AvailFactoryImpl.java

-     [java] >>  Generating Quote

-     [java] >>  Generating Java interface org.example.avail.AvailQuote

-     [java] >>  Generating /TargetProject/org/example/avail/AvailQuote.java

-     [java] >>  Examining old /TargetProject/org/example/avail/AvailQuote.java

-     [java] >>  Generating Java class org.example.avail.impl.AvailQuoteImpl

-     [java] >>  Generating /TargetProject/org/example/avail/impl/AvailQuoteImpl.java

-     [java] >>  Examining old /TargetProject/org/example/avail/impl/AvailQuoteImpl.java

-     [java] >>  Generating Request

-     [java] >>  Generating Java interface org.example.avail.AvailRequest

-     [java] >>  Generating /TargetProject/org/example/avail/AvailRequest.java

-     [java] >>  Examining old /TargetProject/org/example/avail/AvailRequest.java

-     [java] >>  Generating Java class org.example.avail.impl.AvailRequestImpl

-     [java] >>  Generating /TargetProject/org/example/avail/impl/AvailRequestImpl.java

-     [java] >>  Examining old /TargetProject/org/example/avail/impl/AvailRequestImpl.java

-     [java] >>  Generating code

-     [java] >>  Generating packages

-     [java] >>  Generating package PricePackageImpl

-     [java] >>  Generating Java interface org.example.price.PriceFactory

-     [java] >>  Generating /TargetProject/org/example/price/PriceFactory.java

-     [java] >>  Examining old /TargetProject/org/example/price/PriceFactory.java

-     [java] >>  Generating Java class org.example.price.impl.PriceFactoryImpl

-     [java] >>  Generating /TargetProject/org/example/price/impl/PriceFactoryImpl.java

-     [java] >>  Examining old /TargetProject/org/example/price/impl/PriceFactoryImpl.java

-     [java] >>  Generating Quote

-     [java] >>  Generating Java interface org.example.price.PriceQuote

-     [java] >>  Generating /TargetProject/org/example/price/PriceQuote.java

-     [java] >>  Examining old /TargetProject/org/example/price/PriceQuote.java

-     [java] >>  Generating Java class org.example.price.impl.PriceQuoteImpl

-     [java] >>  Generating /TargetProject/org/example/price/impl/PriceQuoteImpl.java

-     [java] >>  Examining old /TargetProject/org/example/price/impl/PriceQuoteImpl.java

-     [java] >>  Generating Request

-     [java] >>  Generating Java interface org.example.price.PriceRequest

-     [java] >>  Generating /TargetProject/org/example/price/PriceRequest.java

-     [java] >>  Examining old /TargetProject/org/example/price/PriceRequest.java

-     [java] >>  Generating Java class org.example.price.impl.PriceRequestImpl

-     [java] >>  Generating /TargetProject/org/example/price/impl/PriceRequestImpl.java

-     [java] >>  Examining old /TargetProject/org/example/price/impl/PriceRequestImpl.java

-     [java] >>  Generating Requests

-     [java] >>  Generating Java interface org.example.price.PriceRequests

-     [java] >>  Generating /TargetProject/org/example/price/PriceRequests.java

-     [java] >>  Examining old /TargetProject/org/example/price/PriceRequests.java

-     [java] >>  Generating Java class org.example.price.impl.PriceRequestsImpl

-     [java] >>  Generating /TargetProject/org/example/price/impl/PriceRequestsImpl.java

-     [java] >>  Examining old /TargetProject/org/example/price/impl/PriceRequestsImpl.java

-     [java] >>  Generating Ship Address

-     [java] >>  Generating Java interface org.example.price.ShipAddress

-     [java] >>  Generating /TargetProject/org/example/price/ShipAddress.java

-     [java] >>  Examining old /TargetProject/org/example/price/ShipAddress.java

-     [java] >>  Generating Java class org.example.price.impl.ShipAddressImpl

-     [java] >>  Generating /TargetProject/org/example/price/impl/ShipAddressImpl.java

-     [java] >>  Examining old /TargetProject/org/example/price/impl/ShipAddressImpl.java

-

-compile:

-      [jar] Building jar: C:\Apache\tuscany-sca-1.0-incubating-SNAPSHOT\samples\quote-xquery\target\sample-quote-xquery.jar

-BUILD SUCCESSFUL

-

-

-The service side:

-

-run-server:

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.core.StandardEngine start

-     [java] INFO: Starting Servlet Engine: Apache Tomcat/6.0.10

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.startup.ContextConfig defaultWebConfig

-     [java] INFO: No default web.xml

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.startup.DigesterFactory register

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.startup.DigesterFactory register

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.startup.DigesterFactory register

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.startup.DigesterFactory register

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.startup.DigesterFactory register

-     [java] WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xsd

-     [java] Sep 18, 2007 1:14:17 PM org.apache.coyote.http11.Http11Protocol init

-     [java] INFO: Initializing Coyote HTTP/1.1 on http-8085

-     [java] Sep 18, 2007 1:14:17 PM org.apache.coyote.http11.Http11Protocol start

-     [java] INFO: Starting Coyote HTTP/1.1 on http-8085

-     [java] Sep 18, 2007 1:14:17 PM org.apache.tuscany.sca.http.tomcat.TomcatServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8085/QuoteJoinService

-     [java] Sep 18, 2007 1:14:17 PM org.apache.tuscany.sca.http.tomcat.TomcatServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8085/AvailQuoteProviderService

-     [java] XQuery Quote server started (press enter to shutdown)

-     [java] Sep 18, 2007 1:16:54 PM org.apache.coyote.http11.Http11Protocol destroy

-     [java] INFO: Stopping Coyote HTTP/1.1 on http-8085

-

-BUILD SUCCESSFUL

-Total time: 2 minutes 51 seconds

-

-The client side:

-Buildfile: build.xml

-

-run:

-     [java] Input quote for the price list:

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <priceQuote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pri="http://www.example.org/price" xsi:type="pri:PriceQuote">

-     [java]   <customerName>Acme Inc</customerName>

-     [java]   <shipAddress street="12 Springs Rd" city="Morris Plains" state="nj" zip="07960"/>

-     [java]   <priceRequests>

-     [java]     <priceRequest>

-     [java]       <widgetId>12</widgetId>

-     [java]       <price>1.0</price>

-     [java]     </priceRequest>

-     [java]     <priceRequest>

-     [java]       <widgetId>134</widgetId>

-     [java]       <price>34.1</price>

-     [java]     </priceRequest>

-     [java]     <priceRequest>

-     [java]       <widgetId>211</widgetId>

-     [java]       <price>10.0</price>

-     [java]     </priceRequest>

-     [java]   </priceRequests>

-     [java] </priceQuote>

-     [java] 

-     [java] Input quote for the availability:

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <availQuote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ava="http://www.example.org/avail" xsi:type="ava:AvailQuote">

-     [java]   <availRequest>

-     [java]     <widgetId>12</widgetId>

-     [java]     <requestedQuantity>10</requestedQuantity>

-     [java]     <quantityAvail>true</quantityAvail>

-     [java]     <shipDate>2003-03-22</shipDate>

-     [java]   </availRequest>

-     [java]   <availRequest>

-     [java]     <widgetId>134</widgetId>

-     [java]     <requestedQuantity>345</requestedQuantity>

-     [java]     <quantityAvail>false</quantityAvail>

-     [java]     <shipDate>BackOrder</shipDate>

-     [java]   </availRequest>

-     [java]   <availRequest>

-     [java]     <widgetId>211</widgetId>

-     [java]     <requestedQuantity>100</requestedQuantity>

-     [java]     <quantityAvail>true</quantityAvail>

-     [java]     <shipDate>2003-04-21</shipDate>

-     [java]   </availRequest>

-     [java] </availQuote>

-     [java] 

-     [java] 

-     [java] Output quote from local join:

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <quote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:quo="http://www.example.org/quote" xsi:type="quo:Quote">

-     [java]   <name>Acme Inc</name>

-     [java]   <address>12 Springs Rd,Morris Plains,NJ,07960</address>

-     [java]   <quoteResponse>

-     [java]     <widgetId>12</widgetId>

-     [java]     <unitPrice>1.0</unitPrice>

-     [java]     <requestedQuantity>10</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-03-22</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>11.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>134</widgetId>

-     [java]     <unitPrice>34.1</unitPrice>

-     [java]     <requestedQuantity>345</requestedQuantity>

-     [java]     <fillOrder>false</fillOrder>

-     [java]     <shipDate>BackOrder</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>0.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>211</widgetId>

-     [java]     <unitPrice>10.0</unitPrice>

-     [java]     <requestedQuantity>100</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-04-21</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>1100.0</totalCost>

-     [java]   </quoteResponse>

-     [java] </quote>

-     [java] 

-     [java] 

-     [java] Output quote from local join (second invokation):

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <quote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:quo="http://www.example.org/quote" xsi:type="quo:Quote">

-     [java]   <name>Acme Inc</name>

-     [java]   <address>12 Springs Rd,Morris Plains,NJ,07960</address>

-     [java]   <quoteResponse>

-     [java]     <widgetId>12</widgetId>

-     [java]     <unitPrice>1.0</unitPrice>

-     [java]     <requestedQuantity>10</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-03-22</shipDate>

-     [java]     <taxRate>0.2</taxRate>

-     [java]     <totalCost>12.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>134</widgetId>

-     [java]     <unitPrice>34.1</unitPrice>

-     [java]     <requestedQuantity>345</requestedQuantity>

-     [java]     <fillOrder>false</fillOrder>

-     [java]     <shipDate>BackOrder</shipDate>

-     [java]     <taxRate>0.2</taxRate>

-     [java]     <totalCost>0.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>211</widgetId>

-     [java]     <unitPrice>10.0</unitPrice>

-     [java]     <requestedQuantity>100</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-04-21</shipDate>

-     [java]     <taxRate>0.2</taxRate>

-     [java]     <totalCost>1200.0</totalCost>

-     [java]   </quoteResponse>

-     [java] </quote>

-     [java] 

-     [java] 

-     [java] Output quote from web service join:

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <quote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:quo="http://www.example.org/quote" xsi:type="quo:Quote">

-     [java]   <name>Acme Inc</name>

-     [java]   <address>12 Springs Rd,Morris Plains,NJ,07960</address>

-     [java]   <quoteResponse>

-     [java]     <widgetId>12</widgetId>

-     [java]     <unitPrice>1.0</unitPrice>

-     [java]     <requestedQuantity>10</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-03-22</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>11.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>134</widgetId>

-     [java]     <unitPrice>34.1</unitPrice>

-     [java]     <requestedQuantity>345</requestedQuantity>

-     [java]     <fillOrder>false</fillOrder>

-     [java]     <shipDate>BackOrder</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>0.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>211</widgetId>

-     [java]     <unitPrice>10.0</unitPrice>

-     [java]     <requestedQuantity>100</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-04-21</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>1100.0</totalCost>

-     [java]   </quoteResponse>

-     [java] </quote>

-     [java] 

-     [java] 

-     [java] Output quote from properties join:

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <quote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:quo="http://www.example.org/quote" xsi:type="quo:Quote">

-     [java]   <name>Acme Inc</name>

-     [java]   <address>12 Springs Rd,Morris Plains,NJ,07960</address>

-     [java]   <quoteResponse>

-     [java]     <widgetId>12</widgetId>

-     [java]     <unitPrice>1.0</unitPrice>

-     [java]     <requestedQuantity>10</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-03-22</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>11.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>134</widgetId>

-     [java]     <unitPrice>34.1</unitPrice>

-     [java]     <requestedQuantity>345</requestedQuantity>

-     [java]     <fillOrder>false</fillOrder>

-     [java]     <shipDate>BackOrder</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>0.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>211</widgetId>

-     [java]     <unitPrice>10.0</unitPrice>

-     [java]     <requestedQuantity>100</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-04-21</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>1100.0</totalCost>

-     [java]   </quoteResponse>

-     [java] </quote>

-     [java] 

-     [java] 

-     [java] Output quote from external references join:

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <quote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:quo="http://www.example.org/quote" xsi:type="quo:Quote">

-     [java]   <name>Acme Inc</name>

-     [java]   <address>12 Springs Rd,Morris Plains,NJ,07960</address>

-     [java]   <quoteResponse>

-     [java]     <widgetId>12</widgetId>

-     [java]     <unitPrice>1.0</unitPrice>

-     [java]     <requestedQuantity>10</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-03-22</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>11.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>134</widgetId>

-     [java]     <unitPrice>34.1</unitPrice>

-     [java]     <requestedQuantity>345</requestedQuantity>

-     [java]     <fillOrder>false</fillOrder>

-     [java]     <shipDate>BackOrder</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>0.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>211</widgetId>

-     [java]     <unitPrice>10.0</unitPrice>

-     [java]     <requestedQuantity>100</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-04-21</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>1100.0</totalCost>

-     [java]   </quoteResponse>

-     [java] </quote>

-     [java] 

-

-BUILD SUCCESSFUL

-Total time: 16 seconds

-

-

-

-Sample Overview

----------------

-

- 1. There is a central component for invoking the different

-    scenarios: QuoteJoinLocalComponent

- 2. It provides the following cases:

-    - invoke XQuery component in the current assembly, by providing all needed

-      information as input parameters

-    - invoke XQuery component in external assembly, which is exposed as a web 

-      service

-    - invoke XQuery component in the current assembly, which retrieves the needed

-      information from the component properties

-    - invoke XQuery component in the current assembly, which retrieves the needed

-      information from its references to other components:

-         - one of the components is in the current assembly

-         - the other component is in anther assembly and it is exposed (and accessed)

-           as web service

-    

-  3. All of the XQuery components have reference to a component for calculation of the

-    total price 

-  4. SDO is used for data interchange

-

-src/main/resources

-    wsdl

-        AvailQuote.xsd 

-        PriceQuote.xsd

-        Quote.xsd

-        quotejoin.wsdl

-    META-INF

-        sca

-            quote_join_external_references.xq --- the external references xquery script

-            quote_join_properties.xq --- the property-based join xquery script

-            quote_join.xq --- the join xquery script

-    xqueryquotews.composite --- composite file for the client side

-    xqueryquotewsclient.composite --- composite file for the service side

-    

-    build.xml                            - the Ant build file

-    pom.xml                              - the Maven build file   

-

-

-Building And Running The Sample Using Ant

------------------------------------------

-cd quote-xquery

-ant compile 

-ant run-server

-

-you should see: 

-Buildfile: build.xml

-

-run:

- 

-

-

-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 quote-xquery

-mvn

-

-

-This shows that the Junit test cases have run successfully. 

diff --git a/branches/sca-android/samples/quote-xquery/build.xml b/branches/sca-android/samples/quote-xquery/build.xml
deleted file mode 100644
index a3a5acf102..0000000000
--- a/branches/sca-android/samples/quote-xquery/build.xml
+++ /dev/null
@@ -1,120 +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.    

--->

-<project name="sample-quote-xquery" default="compile">

-    <property name="test.class" value="xquery.quote.XQueryQuoteClient" />

-    <property name="test.server.class" value="xquery.quote.XQueryQuoteServer" />

-    <property name="test.jar" value="sample-quote-xquery.jar" />

-

-    <target name="init">

-        <mkdir dir="target/classes" />

-    </target>

-

-    <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar" />

-

-    <path id="project.classpath">

-        <pathelement path="target/classes" />

-        <pathelement path="target/sdo-source" />

-        <pathelement location="${tuscany.sca.manifest.location}" />

-    </path>

-

-    <target name="generate-sdo" depends="init">

-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">

-            <arg value="-targetDirectory" />

-            <arg value="target/sdo-source" />

-            <arg value="-noNotification" />

-            <!-- Make sure the -noUnsettable is not used, otherwise, the SDO cannot be

-            properly transformed to Node as some properties are treated as unset -->

-            <arg value="src/main/resources/wsdl/Quote.xsd" />

-

-            <classpath refid="project.classpath" />

-        </java>

-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">

-            <arg value="-targetDirectory" />

-            <arg value="target/sdo-source" />

-            <arg value="-noNotification" />

-            <!-- Make sure the -noUnsettable is not used, otherwise, the SDO cannot be

-            properly transformed to Node as some properties are treated as unset -->

-            <arg value="src/main/resources/wsdl/AvailQuote.xsd" />

-

-            <classpath refid="project.classpath" />

-        </java>

-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">

-            <arg value="-targetDirectory" />

-            <arg value="target/sdo-source" />

-            <arg value="-noNotification" />

-            <!-- Make sure the -noUnsettable is not used, otherwise, the SDO cannot be

-            properly transformed to Node as some properties are treated as unset -->

-            <arg value="src/main/resources/wsdl/PriceQuote.xsd" />

-

-            <classpath refid="project.classpath" />

-        </java>

-

-    </target>

-

-

-    <target name="compile" depends="init, generate-sdo">

-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

-            <src path="target/sdo-source"/>

-            <src path="src/main/java"/>

-            <classpath refid="project.classpath" />

-        </javac>

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources" />

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" />

-            </manifest>

-        </jar>

-

-    </target>

-

-    <target name="run-classes">

-        <java classname="${test.class}" fork="true">

-            <classpath>

-                <pathelement path="target/classes" />

-            </classpath>

-            <classpath refid="project.classpath" />

-        </java>

-    </target>

-

-    <target name="run">

-        <java classname="${test.class}" fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}" />

-            </classpath>

-            <classpath refid="project.classpath" />

-        </java>

-    </target>

-

-    <target name="run-server">

-        <java classname="${test.server.class}" fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}" />

-            </classpath>

-            <classpath refid="project.classpath" />

-        </java>

-    </target>

-

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target" />

-        </delete>

-    </target>

-</project>

diff --git a/branches/sca-android/samples/quote-xquery/pom.xml b/branches/sca-android/samples/quote-xquery/pom.xml
deleted file mode 100644
index b8a294de08..0000000000
--- a/branches/sca-android/samples/quote-xquery/pom.xml
+++ /dev/null
@@ -1,184 +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.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-quote-xquery</artifactId>
-    <name>Apache Tuscany SCA XQuery Quote Implementation Sample</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-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-lib</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <!--dependency>
-            <groupId>net.sf.saxon</groupId>
-            <artifactId>saxon</artifactId>
-            <version>9.0.0.2</version>
-        </dependency-->
-
-        <dependency>
-            <groupId>net.sf.saxon</groupId>
-            <artifactId>saxon</artifactId>
-            <version>8.7</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-quotejoin-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/quotejoin.wsdl</schemaFile>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>generate-quote-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/Quote.xsd</schemaFile>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>generate-avail-quote-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/AvailQuote.xsd</schemaFile>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>generate-price-quote-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/PriceQuote.xsd</schemaFile>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
deleted file mode 100644
index 8a42136b5d..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
+++ /dev/null
@@ -1,30 +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 xquery.quote;
-
-import org.example.avail.AvailQuote;
-import org.osoa.sca.annotations.Service;
-
-@Service(AvailQuoteProviderService.class)
-public class AvailQuoteProviderImpl implements AvailQuoteProviderService {
-
-    public AvailQuote provideAvailQuote(String dummyString) {
-        return QuoteDataUtil.buildAvailQuoteData();
-    }
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
deleted file mode 100644
index 41d78683cc..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
+++ /dev/null
@@ -1,28 +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 xquery.quote;
-
-import net.sf.saxon.om.NodeInfo;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface AvailQuoteProviderNodeInfo {
-    NodeInfo provideAvailQuote(String dummyString);
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
deleted file mode 100644
index f744a59744..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
+++ /dev/null
@@ -1,27 +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 xquery.quote;
-
-import org.example.avail.AvailQuote;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface AvailQuoteProviderService {
-    AvailQuote provideAvailQuote(String dummyString);
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
deleted file mode 100644
index 374c0825e9..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
+++ /dev/null
@@ -1,27 +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 xquery.quote;
-
-import org.example.quote.Quote;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ExternalReferencesQuoteJoin {
-    public Quote joinPriceAndAvailQuotes(float taxRate);
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
deleted file mode 100644
index fbe38b8269..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
+++ /dev/null
@@ -1,28 +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 xquery.quote;
-
-import org.example.price.PriceQuote;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface PriceQuoteProvider {
-
-    public PriceQuote providePriceQuote();
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
deleted file mode 100644
index d2d175430b..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
+++ /dev/null
@@ -1,27 +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 xquery.quote;
-
-import org.example.price.PriceQuote;
-
-public class PriceQuoteProviderImpl implements PriceQuoteProvider {
-    public PriceQuote providePriceQuote() {
-        return QuoteDataUtil.buildPriceQuoteData();
-    }
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
deleted file mode 100644
index 06c3945a6e..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
+++ /dev/null
@@ -1,28 +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 xquery.quote;
-
-import net.sf.saxon.om.NodeInfo;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface PriceQuoteProviderNodeInfo {
-    public NodeInfo providePriceQuote();
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
deleted file mode 100644
index 1ecdf120c2..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
+++ /dev/null
@@ -1,32 +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 xquery.quote;
-
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-import org.example.quote.Quote;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface PropertiesQuoteJoin {
-    @RequestWrapper(className="xquery.quote.joinPriceAndAvailQuotes")
-    @ResponseWrapper(className="xquery.quote.joinPriceAndAvailQuotesResponse")
-    public Quote joinPriceAndAvailQuotes();
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
deleted file mode 100644
index 85508eaa46..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.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 xquery.quote;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface QuoteCalculator {
-    public float calculateTotalPrice(float taxRate, int quantity, float price, boolean fillOrder);
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
deleted file mode 100644
index 26331381a8..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
+++ /dev/null
@@ -1,38 +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 xquery.quote;
-
-public class QuoteCalculatorImpl implements QuoteCalculator {
-
-    public float calculateTotalPrice(float taxRate, int quantity, float price, boolean fillOrder) {
-        float totalTax, costNoTax, totalCost;
-        if (fillOrder) {
-            // Calculate the total tax
-            totalTax = taxRate * quantity * price;
-            // Calculate the total cost without tax
-            costNoTax = quantity * price;
-            // Add the tax and the cost to get the total cost
-            totalCost = totalTax + costNoTax;
-        } else {
-            totalCost = 0;
-        }
-        return totalCost;
-    }
-
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
deleted file mode 100644
index 8ed02dc1ef..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
+++ /dev/null
@@ -1,107 +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 xquery.quote;

-

-import java.io.IOException;

-import java.math.BigInteger;

-

-

-import org.example.avail.AvailFactory;

-import org.example.avail.AvailQuote;

-import org.example.avail.AvailRequest;

-import org.example.price.PriceFactory;

-import org.example.price.PriceQuote;

-import org.example.price.PriceRequest;

-import org.example.price.PriceRequests;

-import org.example.price.ShipAddress;

-

-import commonj.sdo.DataObject;

-import commonj.sdo.helper.XMLHelper;

-

-public class QuoteDataUtil {

-

-    public static AvailQuote buildAvailQuoteData() {

-        AvailQuote availQuote = AvailFactory.INSTANCE.createAvailQuote();

-        AvailRequest availRequest = AvailFactory.INSTANCE.createAvailRequest();

-        availRequest.setWidgetId(BigInteger.valueOf(12));

-        availRequest.setRequestedQuantity(10);

-        availRequest.setQuantityAvail(true);

-        availRequest.setShipDate("2003-03-22");

-        availQuote.getAvailRequest().add(availRequest);

-

-        availRequest = AvailFactory.INSTANCE.createAvailRequest();

-        availRequest.setWidgetId(BigInteger.valueOf(134));

-        availRequest.setRequestedQuantity(345);

-        availRequest.setQuantityAvail(false);

-        availRequest.setShipDate("BackOrder");

-        availQuote.getAvailRequest().add(availRequest);

-

-        availRequest = AvailFactory.INSTANCE.createAvailRequest();

-        availRequest.setWidgetId(BigInteger.valueOf(211));

-        availRequest.setRequestedQuantity(100);

-        availRequest.setQuantityAvail(true);

-        availRequest.setShipDate("2003-04-21");

-        availQuote.getAvailRequest().add(availRequest);

-

-        return availQuote;

-    }

-

-    public static PriceQuote buildPriceQuoteData() {

-        PriceQuote priceQuote = PriceFactory.INSTANCE.createPriceQuote();

-        priceQuote.setCustomerName("Acme Inc");

-

-        ShipAddress shipAddress = PriceFactory.INSTANCE.createShipAddress();

-        shipAddress.setStreet("12 Springs Rd");

-        shipAddress.setCity("Morris Plains");

-        shipAddress.setState("nj");

-        shipAddress.setZip("07960");

-        priceQuote.setShipAddress(shipAddress);

-

-        PriceRequests priceRequests = PriceFactory.INSTANCE.createPriceRequests();

-        PriceRequest priceRequest = PriceFactory.INSTANCE.createPriceRequest();

-        priceRequest.setWidgetId(BigInteger.valueOf(12));

-        priceRequest.setPrice(1.00f);

-        priceRequests.getPriceRequest().add(priceRequest);

-

-        priceRequest = PriceFactory.INSTANCE.createPriceRequest();

-        priceRequest.setWidgetId(BigInteger.valueOf(134));

-        priceRequest.setPrice(34.10f);

-        priceRequests.getPriceRequest().add(priceRequest);

-

-        priceRequest = PriceFactory.INSTANCE.createPriceRequest();

-        priceRequest.setWidgetId(BigInteger.valueOf(211));

-        priceRequest.setPrice(10.00f);

-        priceRequests.getPriceRequest().add(priceRequest);

-

-        priceQuote.setPriceRequests(priceRequests);

-

-        return priceQuote;

-    }

-

-    public static void serializeToSystemOut(DataObject object, String name) {

-        XMLHelper helper = XMLHelper.INSTANCE;

-

-        try {

-            helper.save(object, null, name, System.out);

-            System.out.println();

-        } catch (IOException e) {

-            e.printStackTrace();

-        }

-    }

-}

diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
deleted file mode 100644
index 425867055b..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.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 xquery.quote;
-
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-import org.example.avail.AvailQuote;
-import org.example.price.PriceQuote;
-import org.example.quote.Quote;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface QuoteJoin {
-    @RequestWrapper(className="xquery.quote.joinPriceAndAvailQuotes")
-    @ResponseWrapper(className="xquery.quote.joinPriceAndAvailQuotesResponse")
-    public Quote joinPriceAndAvailQuotes(PriceQuote priceQuote, AvailQuote availQuote, float taxRate);
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
deleted file mode 100644
index cfd201f883..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.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 xquery.quote;
-
-import org.example.avail.AvailQuote;
-import org.example.price.PriceQuote;
-import org.example.quote.Quote;
-
-public interface QuoteJoinLocal {
-    public Quote joinPriceAndAvailQuotes(PriceQuote priceQuote, AvailQuote availQuote, float taxRate);
-
-    public Quote joinPriceAndAvailQuotesWs(PriceQuote priceQuote, AvailQuote availQuote, float taxRate);
-
-    public Quote joinPriceAndAvailQuotes();
-
-    public Quote joinPriceAndAvailQuotes(float taxRate);
-
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
deleted file mode 100644
index 20fe73fd92..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
+++ /dev/null
@@ -1,67 +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 xquery.quote;
-
-import org.example.avail.AvailQuote;
-import org.example.price.PriceQuote;
-import org.example.quote.Quote;
-import org.osoa.sca.annotations.Reference;
-
-public class QuoteJoinLocalImpl implements QuoteJoinLocal {
-    private QuoteJoin quoteJoin;
-    private QuoteJoin quoteJoinWs;
-    private PropertiesQuoteJoin propertiesQuoteJoin;
-    private ExternalReferencesQuoteJoin externalServicesQuoteJoin;
-
-    @Reference
-    public void setQuoteJoin(QuoteJoin quoteJoin) {
-        this.quoteJoin = quoteJoin;
-    }
-
-    @Reference
-    public void setQuoteJoinWs(QuoteJoin quoteJoinWs) {
-        this.quoteJoinWs = quoteJoinWs;
-    }
-
-    @Reference
-    public void setPropertiesQuoteJoin(PropertiesQuoteJoin propertiesQuoteJoin) {
-        this.propertiesQuoteJoin = propertiesQuoteJoin;
-    }
-
-    @Reference
-    public void setExternalServicesQuoteJoin(ExternalReferencesQuoteJoin externalServicesQuoteJoin) {
-        this.externalServicesQuoteJoin = externalServicesQuoteJoin;
-    }
-
-    public Quote joinPriceAndAvailQuotes(PriceQuote priceQuote, AvailQuote availQuote, float taxRate) {
-        return quoteJoin.joinPriceAndAvailQuotes(priceQuote, availQuote, taxRate);
-    }
-
-    public Quote joinPriceAndAvailQuotesWs(PriceQuote priceQuote, AvailQuote availQuote, float taxRate) {
-        return quoteJoinWs.joinPriceAndAvailQuotes(priceQuote, availQuote, taxRate);
-    }
-
-    public Quote joinPriceAndAvailQuotes(float taxRate) {
-        return externalServicesQuoteJoin.joinPriceAndAvailQuotes(taxRate);
-    }
-
-    public Quote joinPriceAndAvailQuotes() {
-        return propertiesQuoteJoin.joinPriceAndAvailQuotes();
-    }
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
deleted file mode 100644
index adc852acd4..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
+++ /dev/null
@@ -1,145 +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 xquery.quote;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.example.avail.AvailQuote;

-import org.example.price.PriceQuote;

-import org.example.quote.Quote;

-

-import commonj.sdo.DataObject;

-

-/**

- * Integration test for the XQuery implementation type

- * @version $Rev: 577067 $ $Date: 2007-09-18 22:10:03 +0100 (Tue, 18 Sep 2007) $

- * This test covers the most important integration scenarios for the xquery

- * implementation type and its corresponding saxon data bindings:

- * 

- * 1. There is a central component for invoking the different

- *    scenarios: QuoteJoinLocalComponent

- * 2. It provides the following tests:

- *    - invoke XQuery component in the current assembly, by providing all needed

- *      information as input parameters

- *    - invoke XQuery component in external assembly, which is exposed as a web 

- *      service

- *    - invoke XQuery component in the current assembly, which retrieves the needed

- *      information from the component properties

- *    - invoke XQuery component in the current assembly, which retrieves the needed

- *      information from its references to other components:

- *         - one of the components is in the current assembly

- *         - the other component is in anther assembly and it is exposed (and accessed)

- *           as web service

- *    

- *  3. All of the XQuery components have reference to a component for calculation of the

- *    total price 

- *  4. SDO is used for data interchange

- */

-public class XQueryQuoteClient {

-

-    public static boolean SHOW_DEBUG_MSG = false;

-

-    private SCADomain scaDomain;

-

-    private QuoteJoinLocal quoteJoinLocal;

-

-    public void startClient() throws Exception {

-        try {

-            scaDomain = SCADomain.newInstance("xqueryquotewsclient.composite");

-            quoteJoinLocal = scaDomain.getService(QuoteJoinLocal.class, "QuoteJoinLocalComponent");

-        } catch (Throwable t) {

-            t.printStackTrace();

-        }

-    }

-

-    public void testQuoteJoin() {

-        AvailQuote availQuote = QuoteDataUtil.buildAvailQuoteData();

-        PriceQuote priceQuote = QuoteDataUtil.buildPriceQuoteData();

-

-        if (SHOW_DEBUG_MSG) {

-            System.out.println("Input quote for the price list:");

-            QuoteDataUtil.serializeToSystemOut((DataObject)priceQuote, "priceQuote");

-            System.out.println();

-            System.out.println("Input quote for the availability:");

-            QuoteDataUtil.serializeToSystemOut((DataObject)availQuote, "availQuote");

-            System.out.println();

-        }

-

-        Quote quote = quoteJoinLocal.joinPriceAndAvailQuotes(priceQuote, availQuote, 0.1f);

-        if (SHOW_DEBUG_MSG) {

-            System.out.println();

-            System.out.println("Output quote from local join:");

-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");

-            System.out.println();

-        }

-        //        TestHelper.assertQuote(availQuote, priceQuote, quote, 0.1f);

-

-        quote = quoteJoinLocal.joinPriceAndAvailQuotes(priceQuote, availQuote, 0.2f);

-        if (SHOW_DEBUG_MSG) {

-            System.out.println();

-            System.out.println("Output quote from local join (second invokation):");

-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");

-            System.out.println();

-        }

-        //        TestHelper.assertQuote(availQuote, priceQuote, quote, 0.2f);

-

-        quote = quoteJoinLocal.joinPriceAndAvailQuotesWs(priceQuote, availQuote, 0.1f);

-        if (SHOW_DEBUG_MSG) {

-            System.out.println();

-            System.out.println("Output quote from web service join:");

-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");

-            System.out.println();

-        }

-        //        TestHelper.assertQuote(availQuote, priceQuote, quote, 0.1f);

-

-        quote = quoteJoinLocal.joinPriceAndAvailQuotes();

-        if (SHOW_DEBUG_MSG) {

-            System.out.println();

-            System.out.println("Output quote from properties join:");

-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");

-            System.out.println();

-        }

-        // TestHelper.assertQuote(availQuote, priceQuote, quote, 0.1f);

-

-        quote = quoteJoinLocal.joinPriceAndAvailQuotes(0.1f);

-        if (SHOW_DEBUG_MSG) {

-            System.out.println();

-            System.out.println("Output quote from external references join:");

-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");

-            System.out.println();

-        }

-        // TestHelper.assertQuote(availQuote, priceQuote, quote, 0.1f);

-    }

-

-    public void stopClient() throws Exception {

-        if (scaDomain != null) {

-            scaDomain.close();

-        }

-    }

-

-    public static void main(String[] args) throws Exception {

-        SHOW_DEBUG_MSG = true;

-        XQueryQuoteClient client = new XQueryQuoteClient();

-        client.startClient();

-        try {

-            client.testQuoteJoin();

-        } finally {

-            client.stopClient();

-        }

-    }

-}

diff --git a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java b/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
deleted file mode 100644
index 3fa3cdb637..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package xquery.quote;

-

-import java.io.IOException;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-public class XQueryQuoteServer {

-

-    public static void main(String[] args) {

-        SCADomain scaDomain = SCADomain.newInstance("xqueryquotews.composite");

-        try {

-            System.out.println("XQuery Quote server is started (press enter to shutdown).");

-            System.in.read();

-            System.out.println("XQuery Quote server is stopping...");

-        } catch (IOException e) {

-            e.printStackTrace();

-        }

-        scaDomain.close();

-        System.out.println("XQuery Quote server is now stopped.");

-    }

-}

diff --git a/branches/sca-android/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq b/branches/sca-android/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
deleted file mode 100644
index d504f40f04..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
+++ /dev/null
@@ -1,61 +0,0 @@
-(:

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

-:)

-

-declare namespace quoteJoin="scaservice:java/xquery.quote.QuoteJoin";

-

-declare namespace quoteCalculator="scareference:java/xquery.quote.QuoteCalculator";

-

-declare namespace quo="http://www.example.org/quote";

-

-declare variable $quoteCalculator external;

-

-declare function quoteJoin:joinPriceAndAvailQuotes($priceQuoteDoc, $availQuoteDoc, $taxRate) {

-<quo:quote>

-    <quo:name>{ data($priceQuoteDoc/*/customerName) }</quo:name>

-    <quo:address>{ concat($priceQuoteDoc/*/shipAddress/@street , ",", $priceQuoteDoc/*/shipAddress/@city ,",", fn:upper-case($priceQuoteDoc/*/shipAddress/@state) , ",", $priceQuoteDoc/*/shipAddress/@zip) }</quo:address>

-    {

-        for $priceRequest in $priceQuoteDoc/*/priceRequests/priceRequest,

-            $availRequest in $availQuoteDoc/*/availRequest

-        where data($priceRequest/widgetId) = data($availRequest/widgetId)

-        return

-            <quo:quoteResponse>

-                <quo:widgetId>{ data($priceRequest/widgetId) }</quo:widgetId>

-                <quo:unitPrice>{ data($priceRequest/price) }</quo:unitPrice>

-                <quo:requestedQuantity>{ data($availRequest/requestedQuantity) }</quo:requestedQuantity>

-                <quo:fillOrder>{ data($availRequest/quantityAvail) }</quo:fillOrder>

-                {

-                    for $shipDate in $availRequest/shipDate

-                    return

-                        <quo:shipDate>{ data($shipDate) }</quo:shipDate>

-                }

-                <quo:taxRate>{ $taxRate }</quo:taxRate>

-                <quo:totalCost>{ quoteCalculator:calculateTotalPrice(

-                				  $quoteCalculator,

-                				  

-                				  xs:float($taxRate),

-

-                                  $availRequest/requestedQuantity,

-

-                                  $priceRequest/price,

-

-                                  $availRequest/quantityAvail) }</quo:totalCost>

-            </quo:quoteResponse>

-    }

-    </quo:quote>

-};

diff --git a/branches/sca-android/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq b/branches/sca-android/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
deleted file mode 100644
index cc50da164a..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
+++ /dev/null
@@ -1,69 +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.    
-:)
-declare namespace quoteJoin="scaservice:java/xquery.quote.ExternalReferencesQuoteJoin";
-
-declare namespace quoteCalculator="scareference:java/xquery.quote.QuoteCalculator";
-
-declare namespace priceQuoteProvider="scareference:java/xquery.quote.PriceQuoteProviderNodeInfo";
-declare namespace availQuoteProvider="scareference:java/xquery.quote.AvailQuoteProviderNodeInfo";
-
-declare namespace quo="http://www.example.org/quote";
-
-declare variable $quoteCalculator external;
-
-declare variable $priceQuoteProvider external;
-declare variable $availQuoteProvider external;
-
-declare function quoteJoin:joinPriceAndAvailQuotes($taxRate) {
-let $priceQuoteDoc := priceQuoteProvider:providePriceQuote($priceQuoteProvider)
-let $availQuoteDoc := availQuoteProvider:provideAvailQuote($availQuoteProvider, 'dummy')
-return
-<quo:quote>
-    <quo:name>{ data($priceQuoteDoc/priceQuote/customerName) }</quo:name>
-    <quo:address>{ concat($priceQuoteDoc/priceQuote/shipAddress/@street , ",", $priceQuoteDoc/priceQuote/shipAddress/@city ,",", fn:upper-case($priceQuoteDoc/priceQuote/shipAddress/@state) , ",", $priceQuoteDoc/priceQuote/shipAddress/@zip) }</quo:address>
-    {
-        for $priceRequest in $priceQuoteDoc/priceQuote/priceRequests/priceRequest,
-            $availRequest in $availQuoteDoc/availQuote/availRequest
-        where data($priceRequest/widgetId) = data($availRequest/widgetId)
-        return
-            <quo:quoteResponse>
-                <quo:widgetId>{ data($priceRequest/widgetId) }</quo:widgetId>
-                <quo:unitPrice>{ data($priceRequest/price) }</quo:unitPrice>
-                <quo:requestedQuantity>{ data($availRequest/requestedQuantity) }</quo:requestedQuantity>
-                <quo:fillOrder>{ data($availRequest/quantityAvail) }</quo:fillOrder>
-                {
-                    for $shipDate in $availRequest/shipDate
-                    return
-                        <quo:shipDate>{ data($shipDate) }</quo:shipDate>
-                }
-                <quo:taxRate>{ $taxRate }</quo:taxRate>
-                <quo:totalCost>{ quoteCalculator:calculateTotalPrice(
-                				  $quoteCalculator,
-                				  
-                				  $taxRate,
-
-                                  $availRequest/requestedQuantity,
-
-                                  $priceRequest/price,
-
-                                  $availRequest/quantityAvail) }</quo:totalCost>
-            </quo:quoteResponse>
-    }
-    </quo:quote>
-};
diff --git a/branches/sca-android/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq b/branches/sca-android/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
deleted file mode 100644
index cf41ab528d..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
+++ /dev/null
@@ -1,74 +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.    
-:)
-
-declare namespace quoteJoin="scaservice:java/xquery.quote.PropertiesQuoteJoin";
-
-declare namespace quoteCalculator="scareference:java/xquery.quote.QuoteCalculator";
-
-declare namespace priceQuoteDoc="scaproperty:xml/http://www.example.org/price:priceQuote";
-declare namespace availQuoteDoc="scaproperty:xml/http://www.example.org/avail:availQuote";
-declare namespace taxRate="scaproperty:java/java.lang.Float";
-
-declare namespace pri="http://www.example.org/price";
-declare namespace ava="http://www.example.org/avail";
-declare namespace quo="http://www.example.org/quote";
-
-declare variable $quoteCalculator external;
-
-declare variable $priceQuoteDoc external;
-declare variable $availQuoteDoc external;
-declare variable $taxRate external;
-
-declare function quoteJoin:joinPriceAndAvailQuotes() {
-<quo:quote>
-    <quo:name>{ data($priceQuoteDoc/pri:priceQuote/customerName) }</quo:name>
-    <quo:address>{ concat($priceQuoteDoc/pri:priceQuote/shipAddress/@street , ",", 
-    $priceQuoteDoc/pri:priceQuote/shipAddress/@city ,",", 
-    fn:upper-case($priceQuoteDoc/pri:priceQuote/shipAddress/@state) , ",", 
-    $priceQuoteDoc/pri:priceQuote/shipAddress/@zip) }</quo:address>
-    {
-        for $priceRequest in $priceQuoteDoc/pri:priceQuote/priceRequests/priceRequest,
-            $availRequest in $availQuoteDoc/ava:availQuote/availRequest
-        where data($priceRequest/widgetId) = data($availRequest/widgetId)
-        return
-            <quo:quoteResponse>
-                <quo:widgetId>{ data($priceRequest/widgetId) }</quo:widgetId>
-                <quo:unitPrice>{ data($priceRequest/price) }</quo:unitPrice>
-                <quo:requestedQuantity>{ data($availRequest/requestedQuantity) }</quo:requestedQuantity>
-                <quo:fillOrder>{ data($availRequest/quantityAvail) }</quo:fillOrder>
-                {
-                    for $shipDate in $availRequest/shipDate
-                    return
-                        <quo:shipDate>{ data($shipDate) }</quo:shipDate>
-                }
-                <quo:taxRate>{ $taxRate }</quo:taxRate>
-                <quo:totalCost>{ quoteCalculator:calculateTotalPrice(
-                				  $quoteCalculator,
-                				  
-                				  $taxRate,
-
-                                  $availRequest/requestedQuantity,
-
-                                  $priceRequest/price,
-
-                                  $availRequest/quantityAvail) }</quo:totalCost>
-            </quo:quoteResponse>
-    }
-    </quo:quote>
-};
diff --git a/branches/sca-android/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd b/branches/sca-android/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
deleted file mode 100644
index e7f3e67068..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.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.    

--->

-<xsd:schema targetNamespace="http://www.example.org/avail" xmlns:ava="http://www.example.org/avail" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
-	<xsd:element name="availQuote" type="ava:AvailQuote"/>

-	<xsd:complexType name="AvailRequest">

-		<xsd:sequence>

-			<xsd:element name="widgetId" type="xsd:integer"/>

-			<xsd:element name="requestedQuantity" type="xsd:int"/>

-			<xsd:element name="quantityAvail" type="xsd:boolean"/>

-			<xsd:element name="shipDate" type="xsd:string" minOccurs="0" maxOccurs="1"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="AvailQuote">

-		<xsd:sequence>

-			<xsd:element name="availRequest" type="ava:AvailRequest" minOccurs="1" maxOccurs="10">

-			</xsd:element>

-		</xsd:sequence>

-	</xsd:complexType>

-</xsd:schema>

-

-

-

diff --git a/branches/sca-android/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd b/branches/sca-android/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
deleted file mode 100644
index 4c437586ef..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.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.    
--->
-<xsd:schema targetNamespace="http://www.example.org/price" xmlns:pri="http://www.example.org/price" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
-	<xsd:element name="priceQuote" type="pri:PriceQuote"/>
-	<xsd:complexType name="PriceRequest">
-		<xsd:sequence>
-			<xsd:element name="widgetId" type="xsd:integer"/>
-			<xsd:element name="price" type="xsd:float"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="PriceRequests">
-		<xsd:sequence>
-			<xsd:element name="priceRequest" type="pri:PriceRequest" minOccurs="1" maxOccurs="10"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="ShipAddress">
-        <xsd:attribute name="street" type="xsd:string"/>
-        <xsd:attribute name="city" type="xsd:string"/>
-        <xsd:attribute name="state" type="xsd:string"/>
-        <xsd:attribute name="zip" type="xsd:string"/>
-	</xsd:complexType>		
-	<xsd:complexType name="PriceQuote">
-		<xsd:sequence>
-			<xsd:element name="customerName" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-			<xsd:element name="shipAddress" type="pri:ShipAddress" minOccurs="1" maxOccurs="1"/>
-			<xsd:element name="priceRequests" type="pri:PriceRequests"/>
-		</xsd:sequence>
-	</xsd:complexType>
-</xsd:schema>
-
-
-
diff --git a/branches/sca-android/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd b/branches/sca-android/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
deleted file mode 100644
index 4f64850056..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.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.    

--->

-<xsd:schema targetNamespace="http://www.example.org/quote" xmlns:quo="http://www.example.org/quote" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="unqualified">

-	<xsd:element name="quote" type="quo:Quote"/>

-	<xsd:complexType name="Quote">

-		<xsd:sequence>

-			<xsd:element name="name" type="xsd:string"/>

-			<xsd:element name="address" type="xsd:string"/>

-			<xsd:element name="quoteResponse" type="quo:QuoteResponse" minOccurs="1" maxOccurs="10"/>

-		</xsd:sequence>

-	</xsd:complexType>
-	<xsd:complexType name="QuoteResponse">
-		<xsd:sequence>
-			<xsd:element name="widgetId" type="xsd:integer"/>
-			<xsd:element name="unitPrice" type="xsd:float" minOccurs="0" maxOccurs="1"/>
-			<xsd:element name="requestedQuantity" type="xsd:int"/>
-			<xsd:element name="fillOrder" type="xsd:boolean"/>
-			<xsd:element name="shipDate" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-			<xsd:element name="taxRate" type="xsd:float" minOccurs="0" maxOccurs="1"/>
-			<xsd:element name="totalCost" type="xsd:float" minOccurs="0" maxOccurs="1"/>
-		</xsd:sequence>
-	</xsd:complexType>

-</xsd:schema>

diff --git a/branches/sca-android/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl b/branches/sca-android/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
deleted file mode 100644
index 96c2af138a..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
+++ /dev/null
@@ -1,137 +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.    

--->

-<wsdl:definitions targetNamespace="http://quote.xquery" xmlns:tns="http://quote.xquery"

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ava="http://www.example.org/avail"

-    xmlns:pri="http://www.example.org/price" xmlns:quo="http://www.example.org/quote" name="quotejoin">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://quote.xquery"

-            xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ava="http://www.example.org/avail"

-            xmlns:pri="http://www.example.org/price" xmlns:quo="http://www.example.org/quote">

-

-            <import namespace="http://www.example.org/avail" schemaLocation="AvailQuote.xsd" />

-            <import namespace="http://www.example.org/price" schemaLocation="PriceQuote.xsd" />

-            <import namespace="http://www.example.org/quote" schemaLocation="Quote.xsd" />

-

-            <element name="joinPriceAndAvailQuotes">

-                <complexType>

-                    <sequence>

-                        <element name="priceQuote" type="pri:PriceQuote" />

-                        <element name="availQuote" type="ava:AvailQuote" />

-                        <element name="taxRate" type="xsd:float" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="joinPriceAndAvailQuotesResponse">

-                <complexType>

-                    <sequence>

-                        <element name="joinPriceAndAvailQuotesReturn" type="quo:Quote" />

-                    </sequence>

-                </complexType>

-            </element>

-            <element name="provideAvailQuote">

-                <complexType>

-                    <sequence>

-                        <element name="provideAvailQuote" type="xsd:string" />

-                    </sequence>

-                </complexType>

-            </element>

-            <element name="provideAvailQuoteResponse">

-                <complexType>

-                    <sequence>

-                        <element name="provideAvailQuoteReturn" type="ava:AvailQuote" />

-                    </sequence>

-                </complexType>

-            </element>

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="joinPriceAndAvailQuotesRequest">

-        <wsdl:part element="tns:joinPriceAndAvailQuotes" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="joinPriceAndAvailQuotesResponse">

-        <wsdl:part element="tns:joinPriceAndAvailQuotesResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:portType name="QuoteJoin">

-        <wsdl:operation name="joinPriceAndAvailQuotes">

-            <wsdl:input message="tns:joinPriceAndAvailQuotesRequest" name="joinPriceAndAvailQuotesRequest" />

-            <wsdl:output message="tns:joinPriceAndAvailQuotesResponse" name="joinPriceAndAvailQuotesResponse" />

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="QuoteJoinSoapBinding" type="tns:QuoteJoin">

-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-        <wsdl:operation name="joinPriceAndAvailQuotes">

-            <wsdlsoap:operation soapAction="" />

-            <wsdl:input name="joinPriceAndAvailQuotesRequest">

-                <wsdlsoap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output name="joinPriceAndAvailQuotesResponse">

-                <wsdlsoap:body use="literal" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="QuoteJoinService">

-        <wsdl:port binding="tns:QuoteJoinSoapBinding" name="QuoteJoinSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/QuoteJoinService" />

-        </wsdl:port>

-    </wsdl:service>

-

-

-

-    <wsdl:message name="provideAvailQuoteRequest">

-        <wsdl:part element="tns:provideAvailQuote" name="parameters" />

-    </wsdl:message>

-    <wsdl:message name="provideAvailQuoteResponse">

-        <wsdl:part element="tns:provideAvailQuoteResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:portType name="AvailQuoteProvider">

-        <wsdl:operation name="provideAvailQuote">

-            <wsdl:input message="tns:provideAvailQuoteRequest" name="provideAvailQuoteRequest" />

-            <wsdl:output message="tns:provideAvailQuoteResponse" name="provideAvailQuoteResponse" />

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="AvailQuoteProviderSoapBinding" type="tns:AvailQuoteProvider">

-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-        <wsdl:operation name="provideAvailQuote">

-            <wsdlsoap:operation soapAction="" />

-            <wsdl:input name="provideAvailQuoteRequest">

-                <wsdlsoap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output name="provideAvailQuoteResponse">

-                <wsdlsoap:body use="literal" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="AvailQuoteProviderService">

-        <wsdl:port binding="tns:AvailQuoteProviderSoapBinding" name="AvailQuoteProviderSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/AvailQuoteProviderService" />

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/branches/sca-android/samples/quote-xquery/src/main/resources/xqueryquotews.composite b/branches/sca-android/samples/quote-xquery/src/main/resources/xqueryquotews.composite
deleted file mode 100644
index 9e35e2ecb2..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/resources/xqueryquotews.composite
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://quote.xquery"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:xq="http://quote.xquery"
-    name="xqueryquotews">
-
-<!-- 
-    <dbsdo:import.sdo factory="org.example.avail.AvailFactory" />
-    <dbsdo:import.sdo factory="org.example.price.PriceFactory" />
-    <dbsdo:import.sdo factory="org.example.quote.QuoteFactory" />
-    <dbsdo:import.sdo location="wsdl/quotejoin.wsdl" />
-     -->
-     <dbsdo:import.sdo factory="xquery.quote.QuoteFactory"/>
-    
-    <component name="QuoteJoinServerComponent">
-        <tuscany:implementation.xquery location="META-INF/sca/quote_join.xq" />
-        <service name="quoteJoin">
-            <interface.java interface="xquery.quote.QuoteJoin" />
-            <binding.ws wsdlElement="http://quote.xquery#wsdl.port(QuoteJoinService/QuoteJoinSoapPort)" />
-        </service>
-        <reference name="quoteCalculator" target="QuoteCalculatorServerComponent" />
-    </component>
-
-    <component name="QuoteCalculatorServerComponent">
-        <implementation.java class="xquery.quote.QuoteCalculatorImpl" />
-    </component>
-
-    <component name="AvailQuoteProviderComponent">
-        <implementation.java class="xquery.quote.AvailQuoteProviderImpl" />
-        <service name="AvailQuoteProviderService">
-            <interface.java interface="xquery.quote.AvailQuoteProviderService" />
-            <binding.ws
-                wsdlElement="http://quote.xquery#wsdl.port(AvailQuoteProviderService/AvailQuoteProviderSoapPort)" />
-        </service>
-    </component>
-
-</composite>
diff --git a/branches/sca-android/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite b/branches/sca-android/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
deleted file mode 100644
index 35306b9f89..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://quote.xquery/client"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:xq="http://quote.xquery/client"
-    name="xqueryquotewsclient">
-
-    <component name="QuoteJoinLocalComponent">
-        <implementation.java class="xquery.quote.QuoteJoinLocalImpl" />
-        <reference name="quoteJoin" target="QuoteJoinComponent" />
-        <reference name="propertiesQuoteJoin" target="QuoteJoinPropertiesComponent" />
-        <reference name="externalServicesQuoteJoin" target="QuoteJoinExternalReferencesComponent" />
-    </component>
-
-    <component name="QuoteJoinComponent">
-        <tuscany:implementation.xquery location="META-INF/sca/quote_join.xq" />
-        <reference name="quoteCalculator" target="QuoteCalculatorComponent" />
-    </component>
-
-    <component name="QuoteJoinPropertiesComponent">
-        <tuscany:implementation.xquery location="META-INF/sca/quote_join_properties.xq" />
-        <!-- Reset the default namespace as the sub-elements under pri:priceQuote are
-            unqualified -->
-        <property name="priceQuoteDoc">
-            <pri:priceQuote xmlns:pri="http://www.example.org/price" xmlns="">
-                <customerName>Acme Inc</customerName>
-                <shipAddress street="12 Springs Rd" city="Morris Plains" state="nj" zip="07960" />
-                <priceRequests>
-                    <priceRequest>
-                        <widgetId>12</widgetId>
-                        <price>1.0</price>
-                    </priceRequest>
-                    <priceRequest>
-                        <widgetId>134</widgetId>
-                        <price>34.1</price>
-                    </priceRequest>
-                    <priceRequest>
-                        <widgetId>211</widgetId>
-                        <price>10.0</price>
-                    </priceRequest>
-                </priceRequests>
-            </pri:priceQuote>
-        </property>
-        <!-- Reset the default namespace as the sub-elements under ava:availQuote are
-            unqualified -->
-
-        <property name="availQuoteDoc">
-            <ava:availQuote xmlns:ava="http://www.example.org/avail" xmlns="">
-                <availRequest>
-                    <widgetId>12</widgetId>
-                    <requestedQuantity>10</requestedQuantity>
-                    <quantityAvail>true</quantityAvail>
-                    <shipDate>2003-03-22</shipDate>
-                </availRequest>
-                <availRequest>
-                    <widgetId>134</widgetId>
-                    <requestedQuantity>345</requestedQuantity>
-                    <quantityAvail>false</quantityAvail>
-                    <shipDate>BackOrder</shipDate>
-                </availRequest>
-                <availRequest>
-                    <widgetId>211</widgetId>
-                    <requestedQuantity>100</requestedQuantity>
-                    <quantityAvail>true</quantityAvail>
-                    <shipDate>2003-04-21</shipDate>
-                </availRequest>
-            </ava:availQuote>
-        </property>
-        <property name="taxRate">0.1</property>
-        <reference name="quoteCalculator" target="QuoteCalculatorComponent" />
-    </component>
-
-    <component name="QuoteJoinExternalReferencesComponent">
-        <tuscany:implementation.xquery location="META-INF/sca/quote_join_external_references.xq" />
-        <reference name="quoteCalculator" target="QuoteCalculatorComponent" />
-        <reference name="priceQuoteProvider" target="PriceQuoteProviderComponent" />
-    </component>
-
-    <component name="QuoteCalculatorComponent">
-        <implementation.java class="xquery.quote.QuoteCalculatorImpl" />
-    </component>
-
-    <component name="PriceQuoteProviderComponent">
-        <implementation.java class="xquery.quote.PriceQuoteProviderImpl" />
-    </component>
-
-    <reference name="availQuoteProvider" promote="QuoteJoinExternalReferencesComponent/availQuoteProvider">
-        <!-- removed because it doesn't work with TUSCANY-2324 fix
-        <interface.java interface="xquery.quote.AvailQuoteProviderService" />
-        -->
-        <binding.ws wsdlElement="http://quote.xquery#wsdl.port(AvailQuoteProviderService/AvailQuoteProviderSoapPort)" />
-    </reference>
-    <reference name="quoteJoinWs" promote="QuoteJoinLocalComponent/quoteJoinWs">
-        <interface.java interface="xquery.quote.QuoteJoin" />
-        <binding.ws wsdlElement="http://quote.xquery#wsdl.port(QuoteJoinService/QuoteJoinSoapPort)" />
-    </reference>
-</composite>
diff --git a/branches/sca-android/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java b/branches/sca-android/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
deleted file mode 100644
index 9555532b3e..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
+++ /dev/null
@@ -1,192 +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 xquery.quote;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
-import org.example.avail.AvailQuote;
-import org.example.avail.AvailRequest;
-import org.example.price.PriceQuote;
-import org.example.price.PriceRequest;
-import org.example.price.ShipAddress;
-import org.example.quote.Quote;
-import org.example.quote.QuoteResponse;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import commonj.sdo.DataObject;
-
-/**
- * Integration test for the XQuery implementation type
- * @version $Rev$ $Date$
- * This test covers the most important integration scenarios for the xquery
- * implementation type and its corresponding saxon data bindings:
- * 
- * 1. There is a central component for invoking the different
- *    scenarios: QuoteJoinLocalComponent
- * 2. It provides the following tests:
- *    - invoke XQuery component in the current assembly, by providing all needed
- *      information as input parameters
- *    - invoke XQuery component in external assembly, which is exposed as a web 
- *      service
- *    - invoke XQuery component in the current assembly, which retrieves the needed
- *      information from the component properties
- *    - invoke XQuery component in the current assembly, which retrieves the needed
- *      information from its references to other components:
- *         - one of the components is in the current assembly
- *         - the other component is in anther assembly and it is exposed (and accessed)
- *           as web service
- *    
- *  3. All of the XQuery components have reference to a component for calculation of the
- *    total price 
- *  4. SDO is used for data interchange
- */
-public class XQueryQuoteClientTestCase {
-
-    public static boolean SHOW_DEBUG_MSG = false;
-
-    private SCADomain scaDomain;
-    private SCATestCaseRunner server;
-
-    private QuoteJoinLocal quoteJoinLocal;
-
-    @Before
-    public void startClient() throws Exception {
-        try {
-            scaDomain = SCADomain.newInstance("xqueryquotewsclient.composite");
-
-            quoteJoinLocal = scaDomain.getService(QuoteJoinLocal.class, "QuoteJoinLocalComponent");
-
-            server = new SCATestCaseRunner(XQueryQuoteTestServer.class);
-            server.before();
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-
-    @Test
-    public void testQuoteJoin() {
-        AvailQuote availQuote = QuoteDataUtil.buildAvailQuoteData();
-        PriceQuote priceQuote = QuoteDataUtil.buildPriceQuoteData();
-
-        if (SHOW_DEBUG_MSG) {
-            System.out.println("Input quote for the price list:");
-            QuoteDataUtil.serializeToSystemOut((DataObject)priceQuote, "priceQuote");
-            System.out.println();
-            System.out.println("Input quote for the availability:");
-            QuoteDataUtil.serializeToSystemOut((DataObject)availQuote, "availQuote");
-            System.out.println();
-        }
-
-        Quote quote = quoteJoinLocal.joinPriceAndAvailQuotes(priceQuote, availQuote, 0.1f);
-        if (SHOW_DEBUG_MSG) {
-            System.out.println();
-            System.out.println("Output quote from local join:");
-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");
-            System.out.println();
-        }
-        XQueryQuoteClientTestCase.assertQuote(availQuote, priceQuote, quote, 0.1f);
-
-        quote = quoteJoinLocal.joinPriceAndAvailQuotes(priceQuote, availQuote, 0.2f);
-        if (SHOW_DEBUG_MSG) {
-            System.out.println();
-            System.out.println("Output quote from local join (second invokation):");
-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");
-            System.out.println();
-        }
-        XQueryQuoteClientTestCase.assertQuote(availQuote, priceQuote, quote, 0.2f);
-
-        quote = quoteJoinLocal.joinPriceAndAvailQuotesWs(priceQuote, availQuote, 0.1f);
-        if (SHOW_DEBUG_MSG) {
-            System.out.println();
-            System.out.println("Output quote from web service join:");
-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");
-            System.out.println();
-        }
-        XQueryQuoteClientTestCase.assertQuote(availQuote, priceQuote, quote, 0.1f);
-
-        quote = quoteJoinLocal.joinPriceAndAvailQuotes();
-        if (SHOW_DEBUG_MSG) {
-            System.out.println();
-            System.out.println("Output quote from properties join:");
-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");
-            System.out.println();
-        }
-        XQueryQuoteClientTestCase.assertQuote(availQuote, priceQuote, quote, 0.1f);
-
-        quote = quoteJoinLocal.joinPriceAndAvailQuotes(0.1f);
-        if (SHOW_DEBUG_MSG) {
-            System.out.println();
-            System.out.println("Output quote from external references join:");
-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");
-            System.out.println();
-        }
-        XQueryQuoteClientTestCase.assertQuote(availQuote, priceQuote, quote, 0.1f);
-    }
-
-    @After
-    public void stopClient() throws Exception {
-        server.after();
-        scaDomain.close();
-    }
-
-    public static void assertQuote(AvailQuote availQuote, PriceQuote priceQuote, Quote quote, float taxRate) {
-        QuoteCalculatorImpl quoteCalculatorImpl = new QuoteCalculatorImpl();
-    
-        TestCase.assertEquals(priceQuote.getCustomerName(), quote.getName());
-        ShipAddress shipAddress = priceQuote.getShipAddress();
-        TestCase.assertEquals(shipAddress.getStreet() + ","
-            + shipAddress.getCity()
-            + ","
-            + shipAddress.getState().toUpperCase()
-            + ","
-            + shipAddress.getZip(), quote.getAddress());
-        List availRequests = availQuote.getAvailRequest();
-        List priceRequests = priceQuote.getPriceRequests().getPriceRequest();
-        List quoteResponses = quote.getQuoteResponse();
-        TestCase.assertEquals(availRequests.size(), priceRequests.size());
-        TestCase.assertEquals(availRequests.size(), quoteResponses.size());
-    
-        for (int i = 0; i < availRequests.size(); i++) {
-            AvailRequest availRequest = (AvailRequest)availRequests.get(i);
-            PriceRequest priceRequest = (PriceRequest)priceRequests.get(i);
-            QuoteResponse quoteResponse = (QuoteResponse)quoteResponses.get(i);
-            TestCase.assertEquals(availRequest.getWidgetId(), quoteResponse.getWidgetId());
-            TestCase.assertEquals(priceRequest.getPrice(), quoteResponse.getUnitPrice());
-            TestCase.assertEquals(availRequest.getRequestedQuantity(), quoteResponse.getRequestedQuantity());
-            TestCase.assertEquals(availRequest.isQuantityAvail(), quoteResponse.isFillOrder());
-            if (availRequest.getShipDate() == null) {
-                TestCase.assertNull(quoteResponse.getShipDate());
-            } else {
-                TestCase.assertEquals(availRequest.getShipDate(), quoteResponse.getShipDate());
-            }
-            TestCase.assertEquals(taxRate, quoteResponse.getTaxRate());
-            TestCase.assertEquals(quoteCalculatorImpl.calculateTotalPrice(taxRate,
-                                                                          availRequest.getRequestedQuantity(),
-                                                                          priceRequest.getPrice(),
-                                                                          availRequest.isQuantityAvail()),
-                                                                          quoteResponse.getTotalCost());
-        }
-    }
-}
diff --git a/branches/sca-android/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java b/branches/sca-android/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
deleted file mode 100644
index 9a4be5bda6..0000000000
--- a/branches/sca-android/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
+++ /dev/null
@@ -1,50 +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 xquery.quote;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class XQueryQuoteTestServer {
-    private SCADomain scaDomain;
-
-    @Before
-    public void startServer() throws Exception {
-        try {
-            scaDomain = SCADomain.newInstance("xqueryquotews.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void testPing() throws IOException {
-        new Socket("127.0.0.1", 8085);
-    }
-
-    @After
-    public void stopServer() throws Exception {
-        scaDomain.close();
-    }
-}