1 files changed, 21 insertions, 113 deletions
diff --git a/sca-java-1.x/trunk/samples/quote-xquery/README b/sca-java-1.x/trunk/samples/quote-xquery/README
index cf8a4609a6..b92e8671e6 100644
--- a/sca-java-1.x/trunk/samples/quote-xquery/README
+++ b/sca-java-1.x/trunk/samples/quote-xquery/README
@@ -1,14 +1,13 @@
 Quote Xquery Sample
 ===================
 
- This sample covers the most important integration scenarios for the xquery
- implementation type and its corresponding saxon data bindings.
+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:
@@ -16,115 +15,25 @@ 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 
+Command Prompt 1:
+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-quote-xquery.jar xquery.quote.XQueryQuoteServer
+Command Prompt 2:
+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-quote-xquery.jar xquery.quote.XQueryQuoteClient
+
+and on *nix do
 
-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
+Command Prompt 1:
+java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-quote-xquery.jar xquery.quote.XQueryQuoteServer
+Command Prompt 2:
+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:
+Buildfile: build.xml
 
 run-server:
      [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.core.StandardEngine start
@@ -384,7 +293,6 @@ BUILD SUCCESSFUL
 Total time: 16 seconds
 
 
-
 Sample Overview
 ---------------
 
@@ -427,24 +335,24 @@ src/main/resources
 
 Building And Running The Sample Using Ant
 -----------------------------------------
+With the binary distribution the sample can be built and run using Maven
+as follows: 
+
 cd quote-xquery
 ant compile 
 ant run-server
 
-you should see: 
-Buildfile: build.xml
-
-run:
- 
+(then from another command prompt)
+cd quote-xquery
+ant 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. 
+With either the binary or source distribution 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.