TUSCANY-3756 - from the JIRA this is the "leave them but remove most of the detail and refer to the web page " option.

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

34 files changed, 169 insertions, 1335 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/README b/sca-java-2.x/branches/2.0-Beta1/samples/README
index e7b8af8c55..15736845da 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/README
@@ -4,12 +4,12 @@ The Apache Tuscany SCA Samples
 Welcome to the Apache Tuscany SCA Java runtime. You can find more general 
 documentation about the runtime at:
 
-http://tuscany.apache.org/documentation-2x/. 
+http://tuscany.apache.org/documentation-2x/ 
 
 Here we give a short overview of what you can find in the samples directory. 
 More detail on the individual sample contributions can be found at:
 
-http://tuscany.apache.org/documentation-2x/2.0-beta-Samples+documentation
+http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
 
 There are several samples subdirectories in the distribution; 
   
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/extending-tuscany/binding-sample/README b/sca-java-2.x/branches/2.0-Beta1/samples/extending-tuscany/binding-sample/README
index 18066b6504..359c42f012 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/extending-tuscany/binding-sample/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/extending-tuscany/binding-sample/README
@@ -3,7 +3,6 @@ Sample Binding Extension
 This sample demonstrates how to develop a new binding type for Apache 
 Tuscany SCA. 
 
-The README in the samples directory (the directory two directories above 
-this one) provides instructions about building and running the samples. Take
-a look there.
+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
+for more information
 
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/extending-tuscany/implementation-sample/README b/sca-java-2.x/branches/2.0-Beta1/samples/extending-tuscany/implementation-sample/README
index 82a04eb6e0..c0e6c0f575 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/extending-tuscany/implementation-sample/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/extending-tuscany/implementation-sample/README
@@ -3,7 +3,6 @@ Sample Implementation Extension
 This sample demonstrates how to develop a new component implementation type
 for Apache Tuscany SCA. 
 
-The README in the samples directory (the directory two directories above 
-this one) provides instructions about building and running the samples. Take
-a look there.
+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
+for more information
 
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/async/calculator-contribution/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/async/calculator-contribution/README
new file mode 100644
index 0000000000..7f1192d44a
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/async/calculator-contribution/README
@@ -0,0 +1,7 @@
+Sample async implemenation.java
+===============================
+This sample demonstrates the SCA Java asynchronous programming model 
+
+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
+for more information
+
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-jsonrpc/calculator-contribution/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-jsonrpc/calculator-contribution/README
index 1e5bc9c584..fe9aac7f3c 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-jsonrpc/calculator-contribution/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-jsonrpc/calculator-contribution/README
@@ -3,24 +3,6 @@ Calculator Sample Contribution
 

 This sample contribution implements a simple calculator using SCA components.

 

-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. ( where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive) Take a look there for instructions on how to launch

-this sample contribution. 

-

-Sample Overview

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

-The sample provides a single calculator service with a default SCA (java) 

-binding. The CalculatorClient exercises this interface by calling add, 

-subtract, multiply and divide operations. This results in messages passing to 

-the appropriate components in the composite across the local wires.

-

-Amongst the other output created by the launcher/contribution combination,  you should see the following output ...

-

-run:

-     [java] 3 + 2=5.0

-     [java] 3 - 2=1.0

-     [java] 3 * 2=6.0

-     [java] 3 / 2=1.5

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information

 

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-jsonrpc/calculator-webapp/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-jsonrpc/calculator-webapp/README
new file mode 100644
index 0000000000..fe9aac7f3c
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-jsonrpc/calculator-webapp/README
@@ -0,0 +1,8 @@
+Calculator Sample Contribution

+==============================

+

+This sample contribution implements a simple calculator using SCA components.

+

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information

+

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-rmi/calculator-reference-contribution/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-rmi/calculator-reference-contribution/README
index 2f169419ba..f647ef1c50 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-rmi/calculator-reference-contribution/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-rmi/calculator-reference-contribution/README
@@ -4,31 +4,8 @@ Calculator RMI Reference Sample Contribution
 This sample illustrates the use of Tuscany RMI Binding to call reference 
 services that are hosted as Java RMI services.  
 
-The README in the <distribution-unpack-dir>/samples directory provides 
-general instructions about building and running samples. ( where
-distribution-unpack-dir is the directory in which you unpacked the tuscany
-binary distribution archive) Take a look there for instructions on how to launch
-this sample contribution. 
-
-Sample Overview
----------------
-This sample extends the calculator sample by replacing the local wired 
-connections with RMI bindings. Instead of local add, subtract, multiply and 
-divide components, an RMI service implementation now provides the
-add, subtract, multiply and divide interfaces and is hosted as an RMI server. 
-References specified in the .composite file include an RMI binding which targets
-this RMI server.
-Note. As this test creates and uses local network connections you may need to 
-configure your firewall, if you are running one, to allow the test to run
-successfully.         
-
-Amongst the other output created by the launcher/contribution combination,  you should see the following output ...
-
-
-     [java] 3 + 2=5.0
-     [java] 3 - 2=1.0
-     [java] 3 * 2=6.0
-     [java] 3 / 2=1.5
+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
+for more information
      
 
 
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-sca/calculator-contribution/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-sca/calculator-contribution/README
index 4777c5ad88..4102b81e28 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-sca/calculator-contribution/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-sca/calculator-contribution/README
@@ -3,24 +3,6 @@ Calculator Sample Contribution
 
 This sample contribution implements a simple calculator using SCA components.
 
-The README in the <distribution-unpack-dir>/samples directory provides 
-general instructions about building and running samples. ( where
-distribution-unpack-dir is the directory in which you unpacked the tuscany
-binary distribution archive) Take a look there for instructions on how to launch
-this sample contribution. 
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java) 
-binding. The CalculatorClient exercises this interface by calling add, 
-subtract, multiply and divide operations. This results in messages passing to 
-the appropriate components in the composite across the local wires.
-
-Amongst the other output created by the launcher/contribution combination,  you should see the following output ...
-
-run:
-     [java] 3 + 2=5.0
-     [java] 3 - 2=1.0
-     [java] 3 * 2=6.0
-     [java] 3 / 2=1.5
+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
+for more information
 
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-ws/calculator-contribution/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-ws/calculator-contribution/README
index a1f34e0e8a..73246be305 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-ws/calculator-contribution/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/binding-ws/calculator-contribution/README
@@ -3,23 +3,7 @@ Calculator Contribution Sample
 

 This directory contains code which implements a simple calculator SCA contribution.

 

-The contribution can be run as a tuscany application using one of the tuscany launchers

-as described in the README in the root directory of the samples. 

-

-Sample Overview

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

-The sample provides a single calculator service with a default SCA (java) 

-binding. The launcher exercises this interface by calling add, 

-subtract, multiply and divide operations. This results in messages passing to 

-the appropriate components in the composite across the local wires.

-

-You should see the following output (depending on the launcher you use, this output

-may be surrounded by other output).

-

-run:

-     [java] 3 + 2=5.0

-     [java] 3 - 2=1.0

-     [java] 3 * 2=6.0

-     [java] 3 / 2=1.5

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information

 

 

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/README
index 9cd41b0fe5..d9d627244d 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/README
@@ -2,195 +2,5 @@ Distributed OSGi Calculator Sample
 ==================================

 This sample implements a distributed calculator using Distributed OSGi (RFC 119) over SCA.

 

-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. (where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive). Take a look there first (noting at you read it that this sample

-is not a new style sample). 

-

-On Windows, run

-java -jar ..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\features\configuration -clean -console -Dorg.osgi.sca.domain.registry=tribes:default

-

-On *Unix, run

-java -jar ../../modules/osgi-3.5.0-v20090520.jar -configuration ../../features/configuration -clean -console -Dorg.osgi.sca.domain.registry=tribes:default

-

-You should see the osgi console:

-

-osgi>

-

-You can run "ss" command under the osgi> to see the status of the bundles.

-osgi> ss

-

-Then you can install and start the calculator.dosgi bundle:

-

-osgi> install file:./target/sample-dosgi-dynamic-calculator-operations.jar

-Bundle id is 198

-

-osgi> start 198

-Nov 4, 2009 5:16:51 PM calculator.dosgi.operations.impl.OperationsActivator star

-t

-INFO: Starting calculator.dosgi.dynamic.operations_1.0.0 [198]

-Nov 4, 2009 5:16:51 PM calculator.dosgi.operations.impl.OperationsActivator star

-t

-INFO: Registering calculator.dosgi.operations.AddService

-Nov 4, 2009 5:16:51 PM org.apache.tuscany.sca.node.impl.NodeImpl start

-INFO: Starting node: urn:osgi.service.d3cadb93-e9b9-4486-87eb-07ece11888f6 domai

-n: tuscany.apache.org

-Nov 4, 2009 5:16:51 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerSe

-rvice

-INFO: RMI service registered: rmi://localhost:8085/AddService

-Nov 4, 2009 5:16:51 PM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl addEndpoint

-INFO: Add endpoint - (@8144744)Endpoint:  URI = osgi.service.d3cadb93-e9b9-4486-

-87eb-07ece11888f6#service-binding(AddService/Add)

-Nov 4, 2009 5:16:51 PM calculator.dosgi.operations.impl.OperationsActivator star

-t

-INFO: Registering calculator.dosgi.operations.SubtractService

-Nov 4, 2009 5:16:51 PM org.apache.tuscany.sca.node.impl.NodeImpl start

-INFO: Starting node: urn:osgi.service.b6259ccc-6ae4-41f0-b61b-c5a8c7f42b35 domai

-n: tuscany.apache.org

-Nov 4, 2009 5:16:51 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerSe

-rvice

-INFO: RMI service registered: rmi://localhost:8085/SubtractService

-Nov 4, 2009 5:16:51 PM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl addEndpoint

-INFO: Add endpoint - (@30229114)Endpoint:  URI = osgi.service.b6259ccc-6ae4-41f0

--b61b-c5a8c7f42b35#service-binding(SubtractService/Subtract)

-Nov 4, 2009 5:16:51 PM calculator.dosgi.operations.impl.OperationsActivator star

-t

-INFO: Registering calculator.dosgi.operations.MultiplyService

-Nov 4, 2009 5:16:51 PM org.apache.tuscany.sca.node.impl.NodeImpl start

-INFO: Starting node: urn:osgi.service.8469c64c-9a28-47b3-bc4a-c5fa8d471057 domai

-n: tuscany.apache.org

-Nov 4, 2009 5:16:51 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerSe

-rvice

-INFO: RMI service registered: rmi://localhost:8085/MultiplyService

-Nov 4, 2009 5:16:51 PM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl addEndpoint

-INFO: Add endpoint - (@3312704)Endpoint:  URI = osgi.service.8469c64c-9a28-47b3-

-bc4a-c5fa8d471057#service-binding(MultiplyService/Multiply)

-Nov 4, 2009 5:16:51 PM calculator.dosgi.operations.impl.OperationsActivator star

-t

-INFO: Registering calculator.dosgi.operations.DivideService

-Nov 4, 2009 5:16:51 PM org.apache.tuscany.sca.node.impl.NodeImpl start

-INFO: Starting node: urn:osgi.service.b43555f0-9509-444e-b22a-06d347ab7e98 domai

-n: tuscany.apache.org

-Nov 4, 2009 5:16:51 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerSe

-rvice

-INFO: RMI service registered: rmi://localhost:8085/DivideService

-Nov 4, 2009 5:16:51 PM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl addEndpoint

-INFO: Add endpoint - (@8010288)Endpoint:  URI = osgi.service.b43555f0-9509-444e-

-b22a-06d347ab7e98#service-binding(DivideService/Divide)

-Nov 4, 2009 5:16:51 PM calculator.dosgi.operations.impl.OperationsActivator getB

-undle

-INFO: calculator.dosgi.operations.AddService is loaded by bundle: calculator.dos

-gi.dynamic.operations

-

-osgi>

-

-To stop the bundle:

-

-osgi> stop 198

-Nov 4, 2009 5:18:43 PM org.apache.tuscany.sca.node.impl.NodeImpl stop

-INFO: Stopping node: urn:osgi.service.b43555f0-9509-444e-b22a-06d347ab7e98

-Nov 4, 2009 5:18:43 PM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl endpointRemoved

-INFO: Remove endpoint - (@8010288)Endpoint:  URI = osgi.service.b43555f0-9509-44

-4e-b22a-06d347ab7e98#service-binding(DivideService/Divide)

-Nov 4, 2009 5:18:43 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregister

-Service

-INFO: RMI service unregistered: rmi://localhost:8085/DivideService

-Nov 4, 2009 5:18:43 PM calculator.dosgi.operations.impl.OperationsActivator stop

-

-INFO: Stopping calculator.dosgi.dynamic.operations_1.0.0 [198]

-Nov 4, 2009 5:18:43 PM org.apache.tuscany.sca.node.impl.NodeImpl stop

-INFO: Stopping node: urn:osgi.service.d3cadb93-e9b9-4486-87eb-07ece11888f6

-Nov 4, 2009 5:18:43 PM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl endpointRemoved

-INFO: Remove endpoint - (@8144744)Endpoint:  URI = osgi.service.d3cadb93-e9b9-44

-86-87eb-07ece11888f6#service-binding(AddService/Add)

-Nov 4, 2009 5:18:43 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregister

-Service

-INFO: RMI service unregistered: rmi://localhost:8085/AddService

-Nov 4, 2009 5:18:43 PM org.apache.tuscany.sca.node.impl.NodeImpl stop

-INFO: Stopping node: urn:osgi.service.b6259ccc-6ae4-41f0-b61b-c5a8c7f42b35

-Nov 4, 2009 5:18:43 PM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl endpointRemoved

-INFO: Remove endpoint - (@30229114)Endpoint:  URI = osgi.service.b6259ccc-6ae4-4

-1f0-b61b-c5a8c7f42b35#service-binding(SubtractService/Subtract)

-Nov 4, 2009 5:18:43 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregister

-Service

-INFO: RMI service unregistered: rmi://localhost:8085/SubtractService

-Nov 4, 2009 5:18:43 PM org.apache.tuscany.sca.node.impl.NodeImpl stop

-INFO: Stopping node: urn:osgi.service.8469c64c-9a28-47b3-bc4a-c5fa8d471057

-Nov 4, 2009 5:18:43 PM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl endpointRemoved

-INFO: Remove endpoint - (@3312704)Endpoint:  URI = osgi.service.8469c64c-9a28-47

-b3-bc4a-c5fa8d471057#service-binding(MultiplyService/Multiply)

-Nov 4, 2009 5:18:43 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregister

-Service

-INFO: RMI service unregistered: rmi://localhost:8085/MultiplyService

-Nov 4, 2009 5:18:43 PM org.apache.tuscany.sca.node.impl.NodeImpl stop

-INFO: Stopping node: urn:osgi.service.b43555f0-9509-444e-b22a-06d347ab7e98

-

-osgi>

-

-To exit the console, run:

-osgi> exit

-

-Sample Overview

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

-The application consists of two OSGi bundles:

- * The calculator bundle: It provides the calculator service. The service is implemented by a java class that

-   consumes other services to perform the “add”, “subtract”, “multiply” and “divide” operations.

- * The operations bundle: It provides the add/subtract/multiply/divide services.

-   (See ../samples/dosgi-dynamic-calculator-operations)

-

-

-dosgi-dynamic-calculator-operations/

-  src/

-    main/

-      java/

-        calculator/

-            dosgi/

-                operations/

-                    AddService.java - Interface for Add

-                    SubtractService.java - Interface for Subtract

-                    MultiplyService.java - Interface for Multiply

-                    DivideService.java - Interface for Divide

-                    impl/

-                        OperationsActivator.java - OSGi bundle activator

-                        AddServiceImpl.java - Implementation for Add

-                        SubtractServiceImpl.java - Implementation for Subtract

-                        MultiplyServiceImpl.java - Implementation for Multiply

-                        DivideServiceImpl.java - Implementation for Divide

-      resources/

-            META-INF/

-                sca-contribution.xml

-           OSGI-INF/

-                sca-config/

-                    operations-config.xml - The SCA configuration file for OSGi remote services

-  test/

-    java/

-        src/

-            calculator/

-                dosgi/

-                    operations/

-                        test/

-                            OperationsOSGiNodeTestCase.java - The JUNIT test case that tests this bundle using a RMI client

-

-  META-INF/

-    MANIFEST.MF - The OSGi manifest for this bundle

-  pom.xml                         - the Maven build file

-

-

-

-Building And Running The Test Case Using Maven

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

-With either the binary or source distributions the sample can be built and run

-using Maven as follows.

-

-cd dosgi-dynamic-calculator-operations

-mvn

-

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/README
index be0ead782e..d9d627244d 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/README
@@ -2,147 +2,5 @@ Distributed OSGi Calculator Sample
 ==================================

 This sample implements a distributed calculator using Distributed OSGi (RFC 119) over SCA.

 

-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. (where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive). Take a look there first (noting at you read it that this sample

-is not a new style sample). 

-

-NOTE: if you want this sample to exploit the dynamic distribution behaviour there is some unit test

-      configuration that should be disabled. See the comments in OSGI-INF/remote-service/calculator-service-descriptions.xml

-

-On Windows, run

-java -jar ..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\features\configuration -clean -console -Dorg.osgi.sca.domain.registry=tribes:default

-

-On *Unix, run

-java -jar ../../modules/osgi-3.5.0-v20090520.jar -configuration ../../features/configuration -clean -console -Dorg.osgi.sca.domain.registry=tribes:default

-

-You should see the osgi console:

-

-osgi>

-

-osgi> Jun 22, 2009 1:32:27 PM org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoveryActivator start

-INFO: Equinox-based service discoverer is now configured.

-

-You can run "ss" command under the osgi> to see the status of the bundles.

-osgi> ss

-

-Then you can install and start the calculator.dosgi bundle:

-

-osgi> install file:./target/sample-dosgi-dynamic-calculator.jar

-Bundle id is 198

-

-osgi> start 198

-Nov 4, 2009 5:20:21 PM calculator.dosgi.impl.CalculatorActivator start

-INFO: Starting calculator.dosgi.dynamic_1.0.0 [198]

-Nov 4, 2009 5:20:21 PM calculator.dosgi.impl.CalculatorActivator start

-INFO: Registering calculator.dosgi.CalculatorService

-Nov 4, 2009 5:20:21 PM org.apache.tuscany.sca.node.impl.NodeImpl start

-INFO: Starting node: urn:osgi.service.d5a06834-ae15-42b3-9287-71fe6537c869 domai

-n: tuscany.apache.org

-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX

-Utils).

-log4j:WARN Please initialize the log4j system properly.

-Nov 4, 2009 5:20:24 PM org.mortbay.log.Slf4jLog info

-INFO: Logging to org.slf4j.impl.JDK14LoggerAdapter(org.mortbay.log) via org.mort

-bay.log.Slf4jLog

-Nov 4, 2009 5:20:25 PM org.apache.tuscany.sca.http.jetty.JettyLogger info

-INFO: jetty-6.1.x

-Nov 4, 2009 5:20:25 PM org.apache.tuscany.sca.http.jetty.JettyLogger info

-INFO: Started SelectChannelConnector@0.0.0.0:8086

-Nov 4, 2009 5:20:25 PM org.apache.tuscany.sca.http.jetty.JettyServer addServletM

-apping

-INFO: Added Servlet mapping: http://rfengt61p:8086/CalculatorService

-Nov 4, 2009 5:20:25 PM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl addEndpoint

-INFO: Add endpoint - (@23394516)Endpoint:  URI = osgi.service.d5a06834-ae15-42b3

--9287-71fe6537c869#service-binding(CalculatorService/Calculator)

-Nov 4, 2009 5:20:25 PM calculator.dosgi.impl.CalculatorActivator getBundle

-INFO: calculator.dosgi.operations.AddService is loaded by bundle: calculator.dos

-gi.dynamic

-

-You can point your browser to http://localhost:8086/CalculatorService?wsdl to see

-the WSDL.

-

-You can also use the WebService Explorer from Eclipse WTP to test the Web Service.

-

-To stop the bundle:

-

-osgi> stop 198

-Nov 4, 2009 5:21:16 PM org.apache.tuscany.sca.node.impl.NodeImpl stop

-INFO: Stopping node: urn:osgi.service.d5a06834-ae15-42b3-9287-71fe6537c869

-Nov 4, 2009 5:21:16 PM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl endpointRemoved

-INFO: Remove endpoint - (@23394516)Endpoint:  URI = osgi.service.d5a06834-ae15-4

-2b3-9287-71fe6537c869#service-binding(CalculatorService/Calculator)

-Nov 4, 2009 5:21:16 PM org.apache.tuscany.sca.http.jetty.JettyServer removeServl

-etMapping

-INFO: Removed Servlet mapping: /CalculatorService

-Nov 4, 2009 5:21:16 PM calculator.dosgi.impl.CalculatorActivator stop

-INFO: Stopping calculator.dosgi.dynamic_1.0.0 [198]

-Nov 4, 2009 5:21:16 PM org.apache.tuscany.sca.node.impl.NodeImpl stop

-INFO: Stopping node: urn:osgi.service.d5a06834-ae15-42b3-9287-71fe6537c869

-

-To exit the console, run:

-osgi> exit

-

-Sample Overview

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

-The application consists of two OSGi bundles:

- * The calculator bundle: It provides the calculator service. The service is implemented by a java class that

-   consumes other services to perform the “add”, “subtract”, “multiply” and “divide” operations.

- * The operations bundle: It provides the add/subtract/multiply/divide services.

-   (See ../samples/dosgi-dynamic-calculator-operations)

-

-

-dosgi-dynamic-calculator/

-  src/

-    main/

-      java/

-        calculator/

-            dosgi/

-                CalculatorService.java  - The interface for Calculator service

-                impl/

-                    CalculatorActivator.java - OSGi bundle activator for Calculator bundle

-                    CalculatorServiceDSImpl.java - OSGi declarative service based implementation

-                    CalculatorServiceImpl.java - Basic OSGi implementation

-                operations/

-                    AddService.java - Interface for Add

-                    SubtractService.java - Interface for Subtract

-                    MultiplyService.java - Interface for Multiply

-                    DivideService.java - Interface for Divide

-                rmi/

-                    OperationsRemote.java - RMI remote interface for operations

-                    OperationsRMIServer_Stub.java - RMI stub

-                    OperationsRMIServer.java - RMI server implementation of the operations

-      resources/

-            META-INF/

-                sca-contribution.xml

-            OSGI-INF/

-                sca-config/

-                    calculator-config.xml - The SCA configuration file for OSGi remote services

-                remote-service/

-                    calculator-service-descriptions.xml - The OSGi remote service endpoint descriptions    

-  test/

-    java/

-        src/

-            calculator/

-                dosgi/

-                    test/

-                        CalculatorOSGiNodeTestCase.java - The JUNIT test case that tests this bundle against a RMI service

-

-  META-INF/

-    MANIFEST.MF - The OSGi manifest for this bundle

-  dosig-calculator.png - a pictorial representation of the sample

-  pom.xml                         - the Maven build file

-

-

-

-Building And Running The Test Case Using Maven

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

-With either the binary or source distributions the sample can be built and run

-using Maven as follows.

-

-cd dosgi-calculator

-mvn

-

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/README
index 533743ebf6..c84dba22f4 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/README
@@ -2,18 +2,10 @@ Hello World BPEL Sample
 ======================================
 This sample demonstrates an SCA service implemented by a BPEL process. 
 
-The README in the <distribution-unpack-dir>/samples directory provides 
-general instructions about building and running samples. (where
-distribution-unpack-dir is the directory in which you unpacked the tuscany
-binary distribution archive). Take a look there first (noting at you read it that this sample
-is not a new style sample). 
+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
+for more information
 
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory, and do 
-
-ant compile run
-
-OR if you don't have ant, on Windows do
+=============== OLD INFO ======================
 
 mkdir target\classes
 mkdir target\wsdl2java-source
@@ -37,117 +29,3 @@ java -cp ../../lib/tuscany-sca-manifest.jar:target/classes:target/database hello
 
 The sample will start an embedded BPEL engine, deploy a process and invoke it.
 
-Sample Overview
----------------
-The sample provides a single component that is wired to a service with a 
-web service binding.
-
-helloworld-bpel/
-  src/
-    main/
-      java/
-        helloworld/
-          BPELClient.java          	  - client application for  
-                                            BEPELHelloWorldComponent
-
-      resources/
-          deploy.xml			  - ODE deployment descriptor
-          helloworld.bpel		  - helloworld bpel process
-          helloworld.componentType	  - helloworld bpel service description
-          helloworld.composite            - the SCA assembly for this sample
-          helloworld.wsdl                 - the service description that describes
-                                            the bpel process
-          log4j.properties                - logging configuration
-          
-    test/
-      java/
-        helloworld/
-          BPELHelloWorldTestCase.java     - JUnit test case 
-  helloworld-bpel.png                     - a pictorial representation of the 
-                                            sample .composite file
-  build.xml                               - the Ant build file
-  pom.xml                                 - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd helloworld-bpel
-ant compile
-ant run
-
-     
-You should see the following output from the run target.     
-
-run:
-     [java] Starting BPELHelloWorldComponent
-     [java] >>> Deploying : D:\temp\SCA1.1-RC1\tuscany-sca-1.1-incubating\samples\helloworld-bpel\target\classes
-     [java] ::arg:::::: <?xml version="1.0" encoding="UTF-8"?>
-     [java] <hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/implementation/bpel/exampl
-e/helloworld.wsdl">Hello</message></hello>
-     [java] ::message:: <?xml version="1.0" encoding="UTF-8"?>
-     [java] <message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/impleme
-ntation/bpel/example/helloworld.wsdl">Hello</message></hello></TestPart></message>
-     [java] Status: RESPONSE
-     [java] Response: <?xml version="1.0" encoding="UTF-8"?>
-     [java] <message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">Hello World</hello></TestPart></message>
-     [java] Hello World
-     [java] Stopping BPELHelloWorldComponent
-     [java] Stopped !!!
-
-BUILD SUCCESSFUL
-Total time: 36 seconds     
-
-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. When using Maven, a simple test is present that exercise
-the same logic as the client to invoke the BPEl process.
-
-cd helloworld-bpel
-mvn
-
-You should see the following output from the test phase.
-
--
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running helloworld.BPELHelloWorldTestCase
-Starting BPELHelloWorldComponent
->>> Deploying : D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\classes
-::arg:::::: <?xml version="1.0" encoding="UTF-8"?>
-<hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld
-.wsdl">Hello</message></hello>
-::message:: <?xml version="1.0" encoding="UTF-8"?>
-<message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/implementation/bpel
-/example/helloworld.wsdl">Hello</message></hello></TestPart></message>
-Status: RESPONSE
-Response: <?xml version="1.0" encoding="UTF-8"?>
-<message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">Hello World</hello></TestPart></message>
-Stopping BPELHelloWorldComponent
-Stopped !!!
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.656 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-[INFO] [jar:jar]
-[INFO] Building jar: D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\sample-helloworld-bpel.jar
-[INFO] [install:install]
-[INFO] Installing D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\sample-helloworld-bpel.jar to C:\Documents and Settings\lresend
-e\.m2\repository\org\apache\tuscany\sca\sample-helloworld-bpel\1.1-incubating-SNAPSHOT\sample-helloworld-bpel-1.1-incubating-SNAPSHOT.jar
-[INFO] ------------------------------------------------------------------------
-[INFO] BUILD SUCCESSFUL
-[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 53 seconds
-[INFO] Finished at: Sun Jan 13 09:54:39 PST 2008
-[INFO] Final Memory: 24M/43M
-[INFO] ------------------------------------------------------------------------
-
-
-This shows that the Junit test cases have run successfully. 
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/README
index 828aadb0f1..2576b0ff13 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/README
@@ -1,7 +1,6 @@
-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. (where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive). Take a look there first (noting at you read it that this sample

-is not a new style sample). 

+Hello World BPEL WebApp Sample

+======================================

+This sample demonstrates an SCA service implemented by a BPEL process. 

 

-TODO - finish
\ No newline at end of file
+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-composite/helloworld-recursive-ws/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-composite/helloworld-recursive-ws/README
index a21077ba58..38367b1d3d 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-composite/helloworld-recursive-ws/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-composite/helloworld-recursive-ws/README
@@ -1,153 +1,7 @@
-Hello World BPEL Sample

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

-This sample demonstrates an SCA service implemented by a BPEL process. 

+Hello implementation.composite helloworld-ws-contribution Sample

+=============================================================

+This sample demonstrates nested composition using implementation.composite and 

+binding.ws

 

-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. (where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive). Take a look there first (noting at you read it that this sample

-is not a new style sample). 

-

-If you just want to run it to see what happens open a command prompt, navigate

-to this sample directory, and do 

-

-ant compile run

-

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

-

-mkdir target\classes

-mkdir target\wsdl2java-source

-java -cp ..\..\lib\tuscany-sca-manifest.jar org.apache.tuscany.sdo.generate.XSD2JavaGenerator -targetDirectory target/wsdl2java-source -prefix HelloWorld -noContainment -noUnsettable src/main/resources/helloworld.wsdl

-java -cp ..\..\lib\tuscany-sca-manifest.jar org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator -targetDirectory target/wsdl2java-source src/main/resources/helloworld.wsdl

-unzip ..\..\lib\ode-dao-jpa-ojpa-derby-1.1.zip -d target\database

-javac -d target\classes -cp target\classes;..\..\lib\tuscany-sca-manifest.jar -sourcepath src\main\java;target\wsdl2java-source -target 1.5 -g -source 1.5 src\main\java\helloworld\BPELClient.java

-copy src\main\resources\* target\classes

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\classes;target\database helloworld.BPELClient

-

-and on *nix do

-

-mkdir target/classes

-mkdir target/wsdl2java-source

-java -cp ../../lib/tuscany-sca-manifest.jar org.apache.tuscany.sdo.generate.XSD2JavaGenerator -targetDirectory target/wsdl2java-source -prefix HelloWorld -noContainment -noUnsettable src/main/resources/helloworld.wsdl

-java -cp ../../lib/tuscany-sca-manifest.jar org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator -targetDirectory target/wsdl2java-source src/main/resources/helloworld.wsdl

-unzip ../../lib/ode-dao-jpa-ojpa-derby-1.1.zip -d target/database

-javac -d target/classes -cp target/classes;../../lib/tuscany-sca-manifest.jar -sourcepath src/main/java;target/wsdl2java-source -target 1.5 -g -source 1.5 src/main/java/helloworld/BPELClient.java

-cp src/main/resources/* target/classes

-java -cp ../../lib/tuscany-sca-manifest.jar:target/classes:target/database helloworld.BPELClient

-

-The sample will start an embedded BPEL engine, deploy a process and invoke it.

-

-Sample Overview

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

-The sample provides a single component that is wired to a service with a 

-web service binding.

-

-helloworld-bpel/

-  src/

-    main/

-      java/

-        helloworld/

-          BPELClient.java          	  - client application for  

-                                            BEPELHelloWorldComponent

-

-      resources/

-          deploy.xml			  - ODE deployment descriptor

-          helloworld.bpel		  - helloworld bpel process

-          helloworld.componentType	  - helloworld bpel service description

-          helloworld.composite            - the SCA assembly for this sample

-          helloworld.wsdl                 - the service description that describes

-                                            the bpel process

-          log4j.properties                - logging configuration

-          

-    test/

-      java/

-        helloworld/

-          BPELHelloWorldTestCase.java     - JUnit test case 

-  helloworld-bpel.png                     - a pictorial representation of the 

-                                            sample .composite file

-  build.xml                               - the Ant build file

-  pom.xml                                 - the Maven build file        

-

-Building And Running The Sample Using Ant

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

-

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd helloworld-bpel

-ant compile

-ant run

-

-     

-You should see the following output from the run target.     

-

-run:

-     [java] Starting BPELHelloWorldComponent

-     [java] >>> Deploying : D:\temp\SCA1.1-RC1\tuscany-sca-1.1-incubating\samples\helloworld-bpel\target\classes

-     [java] ::arg:::::: <?xml version="1.0" encoding="UTF-8"?>

-     [java] <hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/implementation/bpel/exampl

-e/helloworld.wsdl">Hello</message></hello>

-     [java] ::message:: <?xml version="1.0" encoding="UTF-8"?>

-     [java] <message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/impleme

-ntation/bpel/example/helloworld.wsdl">Hello</message></hello></TestPart></message>

-     [java] Status: RESPONSE

-     [java] Response: <?xml version="1.0" encoding="UTF-8"?>

-     [java] <message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">Hello World</hello></TestPart></message>

-     [java] Hello World

-     [java] Stopping BPELHelloWorldComponent

-     [java] Stopped !!!

-

-BUILD SUCCESSFUL

-Total time: 36 seconds     

-

-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. When using Maven, a simple test is present that exercise

-the same logic as the client to invoke the BPEl process.

-

-cd helloworld-bpel

-mvn

-

-You should see the following output from the test phase.

-

--

-

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

- T E S T S

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

-Running helloworld.BPELHelloWorldTestCase

-Starting BPELHelloWorldComponent

->>> Deploying : D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\classes

-::arg:::::: <?xml version="1.0" encoding="UTF-8"?>

-<hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld

-.wsdl">Hello</message></hello>

-::message:: <?xml version="1.0" encoding="UTF-8"?>

-<message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/implementation/bpel

-/example/helloworld.wsdl">Hello</message></hello></TestPart></message>

-Status: RESPONSE

-Response: <?xml version="1.0" encoding="UTF-8"?>

-<message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">Hello World</hello></TestPart></message>

-Stopping BPELHelloWorldComponent

-Stopped !!!

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.656 sec

-

-Results :

-

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

-

-[INFO] [jar:jar]

-[INFO] Building jar: D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\sample-helloworld-bpel.jar

-[INFO] [install:install]

-[INFO] Installing D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\sample-helloworld-bpel.jar to C:\Documents and Settings\lresend

-e\.m2\repository\org\apache\tuscany\sca\sample-helloworld-bpel\1.1-incubating-SNAPSHOT\sample-helloworld-bpel-1.1-incubating-SNAPSHOT.jar

-[INFO] ------------------------------------------------------------------------

-[INFO] BUILD SUCCESSFUL

-[INFO] ------------------------------------------------------------------------

-[INFO] Total time: 53 seconds

-[INFO] Finished at: Sun Jan 13 09:54:39 PST 2008

-[INFO] Final Memory: 24M/43M

-[INFO] ------------------------------------------------------------------------

-

-

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

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-composite/helloworld-recursive/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-composite/helloworld-recursive/README
index ed0f1d0ce4..1ad09620f3 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-composite/helloworld-recursive/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-composite/helloworld-recursive/README
@@ -1,7 +1,6 @@
-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. (where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive). Take a look there first (noting at you read it that this sample

-is not a new style sample). 

+Hello implementation.composite helloworld-contribution Sample

+=============================================================

+This sample demonstrates nested composition using implementation.composite

 

-TODO - finish this
\ No newline at end of file
+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-java/calculator-contribution/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-java/calculator-contribution/README
index 9e1ff828ee..45c339d370 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-java/calculator-contribution/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-java/calculator-contribution/README
@@ -3,23 +3,6 @@ Calculator Sample Contribution
 

 This sample implements a simple calculator using SCA components. 

 

-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. ( where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive) Take a look there for instructions on how to launch

-this sample contribution. 

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information

 

-Sample Overview

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

-The sample provides a single calculator service with a default SCA (java) 

-binding. The CalculatorClient exercises this interface by calling add, 

-subtract, multiply and divide operations. This results in messages passing to 

-the appropriate components in the composite across the local wires.

-

-You should see the following output from the run target.

-

-run:

-     [java] 3 + 2=5.0

-     [java] 3 - 2=1.0

-     [java] 3 * 2=6.0

-     [java] 3 / 2=1.5

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-osgi/dosgi-calculator-operations/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-osgi/dosgi-calculator-operations/README
index 57126842a4..d9d627244d 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-osgi/dosgi-calculator-operations/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-osgi/dosgi-calculator-operations/README
@@ -2,184 +2,5 @@ Distributed OSGi Calculator Sample
 ==================================

 This sample implements a distributed calculator using Distributed OSGi (RFC 119) over SCA.

 

-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. (where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive). Take a look there first (noting at you read it that this sample

-is not a new style sample). 

-

-On Windows, run

-java -jar ..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\features\configuration -clean -console

-

-On *Unix, run

-java -jar ../../modules/osgi-3.5.0-v20090520.jar -configuration ../../features/configuration -clean -console

-

-You should see the osgi console:

-

-osgi>

-

-osgi> Jun 22, 2009 1:32:27 PM org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoveryActivator start

-INFO: Equinox-based service discoverer is now configured.

-

-You can run "ss" command under the osgi> to see the status of the bundles.

-osgi> ss

-

-Then you can install and start the calculator.dosgi bundle:

-

-osgi> install file:./target/sample-dosgi-calculator-operations.jar

-Bundle id is 198

-

-osgi> start 198

-Nov 4, 2009 9:51:56 AM calculator.dosgi.operations.impl.OperationsActivator star

-t

-INFO: Starting calculator.dosgi.operations_1.0.0 [198]

-Nov 4, 2009 9:51:56 AM calculator.dosgi.operations.impl.OperationsActivator star

-t

-INFO: Registering calculator.dosgi.operations.AddService

-Nov 4, 2009 9:51:56 AM calculator.dosgi.operations.impl.OperationsActivator star

-t

-INFO: Registering calculator.dosgi.operations.SubtractService

-Nov 4, 2009 9:51:56 AM calculator.dosgi.operations.impl.OperationsActivator star

-t

-INFO: Registering calculator.dosgi.operations.MultiplyService

-Nov 4, 2009 9:51:56 AM calculator.dosgi.operations.impl.OperationsActivator star

-t

-INFO: Registering calculator.dosgi.operations.DivideService

-Nov 4, 2009 9:51:56 AM calculator.dosgi.operations.impl.OperationsActivator getB

-undle

-INFO: calculator.dosgi.operations.AddService is loaded by bundle: calculator.dos

-gi.operations

-Nov 4, 2009 9:51:56 AM org.apache.tuscany.sca.node.impl.NodeImpl start

-INFO: Starting node: calculator.dosgi.operations domain: tuscany.apache.org

-Nov 4, 2009 9:51:56 AM org.apache.tuscany.sca.node.impl.NodeFactoryImpl loadCont

-ributions

-INFO: Loading contribution: bundleentry://198.fwk8152936/

-Nov 4, 2009 9:52:00 AM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerSe

-rvice

-INFO: RMI service registered: rmi://localhost:8085/AddService

-Nov 4, 2009 9:52:00 AM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl addEndpoint

-INFO: Add endpoint - (@27845948)Endpoint:  URI = OperationsComponent#service-bin

-ding(AddService/AddService)

-Nov 4, 2009 9:52:00 AM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerSe

-rvice

-INFO: RMI service registered: rmi://localhost:8085/SubtractService

-Nov 4, 2009 9:52:00 AM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl addEndpoint

-INFO: Add endpoint - (@10576215)Endpoint:  URI = OperationsComponent#service-bin

-ding(SubtractService/SubtractService)

-Nov 4, 2009 9:52:00 AM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerSe

-rvice

-INFO: RMI service registered: rmi://localhost:8085/MultiplyService

-Nov 4, 2009 9:52:00 AM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl addEndpoint

-INFO: Add endpoint - (@31713234)Endpoint:  URI = OperationsComponent#service-bin

-ding(MultiplyService/MultiplyService)

-Nov 4, 2009 9:52:00 AM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerSe

-rvice

-INFO: RMI service registered: rmi://localhost:8085/DivideService

-Nov 4, 2009 9:52:00 AM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl addEndpoint

-INFO: Add endpoint - (@10202447)Endpoint:  URI = OperationsComponent#service-bin

-ding(DivideService/DivideService)

-

-osgi>

-

-To stop the bundle:

-

-osgi> stop 198

-Nov 4, 2009 9:53:19 AM org.apache.tuscany.sca.node.impl.NodeImpl stop

-INFO: Stopping node: calculator.dosgi.operations

-Nov 4, 2009 9:53:19 AM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl endpointRemoved

-INFO: Remove endpoint - (@27845948)Endpoint:  URI = OperationsComponent#service-

-binding(AddService/AddService)

-Nov 4, 2009 9:53:19 AM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregister

-Service

-INFO: RMI service unregistered: rmi://localhost:8085/AddService

-Nov 4, 2009 9:53:19 AM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl endpointRemoved

-INFO: Remove endpoint - (@10576215)Endpoint:  URI = OperationsComponent#service-

-binding(SubtractService/SubtractService)

-Nov 4, 2009 9:53:19 AM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregister

-Service

-INFO: RMI service unregistered: rmi://localhost:8085/SubtractService

-Nov 4, 2009 9:53:19 AM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl endpointRemoved

-INFO: Remove endpoint - (@31713234)Endpoint:  URI = OperationsComponent#service-

-binding(MultiplyService/MultiplyService)

-Nov 4, 2009 9:53:19 AM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregister

-Service

-INFO: RMI service unregistered: rmi://localhost:8085/MultiplyService

-Nov 4, 2009 9:53:19 AM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl endpointRemoved

-INFO: Remove endpoint - (@10202447)Endpoint:  URI = OperationsComponent#service-

-binding(DivideService/DivideService)

-Nov 4, 2009 9:53:19 AM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregister

-Service

-INFO: RMI service unregistered: rmi://localhost:8085/DivideService

-Nov 4, 2009 9:53:19 AM calculator.dosgi.operations.impl.OperationsActivator stop

-

-INFO: Stopping calculator.dosgi.operations_1.0.0 [198]

-

-osgi>

-

-To exit the console, run:

-osgi> exit

-

-Sample Overview

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

-The application consists of two OSGi bundles:

- * The calculator bundle: It provides the calculator service. The service is implemented by a java class that

-   consumes other services to perform the “add”, “subtract”, “multiply” and “divide” operations.

- * The operations bundle: It provides the add/subtract/multiply/divide services.

-   (See ../samples/dosgi-calculator-operations)

-

-

-dosgi-calculator-operations/

-  src/

-    main/

-      java/

-        calculator/

-            dosgi/

-                operations/

-                    AddService.java - Interface for Add

-                    SubtractService.java - Interface for Subtract

-                    MultiplyService.java - Interface for Multiply

-                    DivideService.java - Interface for Divide

-                    impl/

-                        OperationsActivator.java - OSGi bundle activator

-                        AddServiceImpl.java - Implementation for Add

-                        SubtractServiceImpl.java - Implementation for Subtract

-                        MultiplyServiceImpl.java - Implementation for Multiply

-                        DivideServiceImpl.java - Implementation for Divide

-      resources/

-            META-INF/

-                sca-contribution.xml

-            OSGI-INF/

-                sca/

-                    bundle.componentType - The component type for implementation.osgi of this bundle

-                    bundle.composite - The composite file

-  test/

-    java/

-        src/

-            calculator/

-                dosgi/

-                    operations/

-                        test/

-                            OperationsOSGiNodeTestCase.java - The JUNIT test case that tests this bundle using a RMI client

-

-  META-INF/

-    MANIFEST.MF - The OSGi manifest for this bundle

-  pom.xml                         - the Maven build file

-

-

-

-Building And Running The Test Case Using Maven

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

-With either the binary or source distributions the sample can be built and run

-using Maven as follows.

-

-cd dosgi-calculator-operations

-mvn

-

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-osgi/dosgi-calculator/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-osgi/dosgi-calculator/README
index e2cf7cd522..d9d627244d 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-osgi/dosgi-calculator/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-osgi/dosgi-calculator/README
@@ -2,142 +2,5 @@ Distributed OSGi Calculator Sample
 ==================================

 This sample implements a distributed calculator using Distributed OSGi (RFC 119) over SCA.

 

-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. (where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive). Take a look there first (noting at you read it that this sample

-is not a new style sample). 

-

-

-On Windows, run

-java -jar ..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\features\configuration -clean -console

-

-On *Unix, run

-java -jar ../../modules/osgi-3.5.0-v20090520.jar -configuration ../../features/configuration -clean -console

-

-You should see the osgi console:

-

-osgi>

-

-You can run "ss" command under the osgi> to see the status of the bundles.

-osgi> ss

-

-Then you can install and start the calculator.dosgi bundle:

-

-osgi> install file:./target/sample-dosgi-calculator.jar

-Bundle id is 198

-

-osgi> start 198

-Nov 4, 2009 9:40:00 AM calculator.dosgi.impl.CalculatorActivator start

-INFO: Starting calculator.dosgi_1.0.0 [198]

-Nov 4, 2009 9:40:01 AM calculator.dosgi.impl.CalculatorActivator start

-INFO: Registering calculator.dosgi.CalculatorService

-Nov 4, 2009 9:40:01 AM calculator.dosgi.impl.CalculatorActivator getBundle

-INFO: calculator.dosgi.operations.AddService is loaded by bundle: calculator.dos

-gi

-Nov 4, 2009 9:40:01 AM org.apache.tuscany.sca.node.impl.NodeImpl start

-INFO: Starting node: calculator.dosgi domain: tuscany.apache.org

-Nov 4, 2009 9:40:01 AM org.apache.tuscany.sca.node.impl.NodeFactoryImpl loadCont

-ributions

-INFO: Loading contribution: bundleentry://198.fwk15020296/

-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX

-Utils).

-log4j:WARN Please initialize the log4j system properly.

-Nov 4, 2009 9:40:47 AM org.mortbay.log.Slf4jLog info

-INFO: Logging to org.slf4j.impl.JDK14LoggerAdapter(org.mortbay.log) via org.mort

-bay.log.Slf4jLog

-Nov 4, 2009 9:40:48 AM org.apache.tuscany.sca.http.jetty.JettyLogger info

-INFO: jetty-6.1.x

-Nov 4, 2009 9:40:48 AM org.apache.tuscany.sca.http.jetty.JettyLogger info

-INFO: Started SelectChannelConnector@0.0.0.0:8086

-Nov 4, 2009 9:40:48 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletM

-apping

-INFO: Added Servlet mapping: http://rfengt61p:8086/CalculatorService

-Nov 4, 2009 9:40:48 AM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl addEndpoint

-INFO: Add endpoint - (@1277930)Endpoint:  URI = CalculatorComponent#service-bind

-ing(CalculatorService/CalculatorService)

-osgi>

-

-You can point your browser to http://localhost:8086/CalculatorService?wsdl to see

-the WSDL.

-

-You can also use the WebService Explorer from Eclipse WTP to test the Web Service.

-

-To stop the bundle:

-

-osgi> stop 198

-Nov 4, 2009 9:41:22 AM org.apache.tuscany.sca.node.impl.NodeImpl stop

-INFO: Stopping node: calculator.dosgi

-Nov 4, 2009 9:41:22 AM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr

-yImpl endpointRemoved

-INFO: Remove endpoint - (@1277930)Endpoint:  URI = CalculatorComponent#service-b

-inding(CalculatorService/CalculatorService)

-Nov 4, 2009 9:41:22 AM org.apache.tuscany.sca.http.jetty.JettyServer removeServl

-etMapping

-INFO: Removed Servlet mapping: /CalculatorService

-Nov 4, 2009 9:41:22 AM calculator.dosgi.impl.CalculatorActivator stop

-INFO: Stopping calculator.dosgi_1.0.0 [198]

-

-To exit the console, run:

-osgi> exit

-

-Sample Overview

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

-The application consists of two OSGi bundles:

- * The calculator bundle: It provides the calculator service. The service is implemented by a java class that

-   consumes other services to perform the “add”, “subtract”, “multiply” and “divide” operations.

- * The operations bundle: It provides the add/subtract/multiply/divide services.

-   (See ../samples/dosgi-calculator-operations)

-

-

-dosgi-calculator/

-  src/

-    main/

-      java/

-        calculator/

-            dosgi/

-                CalculatorService.java  - The interface for Calculator service

-                impl/

-                    CalculatorActivator.java - OSGi bundle activator for Calculator bundle

-                    CalculatorServiceDSImpl.java - OSGi declarative service based implementation

-                    CalculatorServiceImpl.java - Basic OSGi implementation

-                operations/

-                    AddService.java - Interface for Add

-                    SubtractService.java - Interface for Subtract

-                    MultiplyService.java - Interface for Multiply

-                    DivideService.java - Interface for Divide

-                rmi/

-                    OperationsRemote.java - RMI remote interface for operations

-                    OperationsRMIServer_Stub.java - RMI stub

-                    OperationsRMIServer.java - RMI server implementation of the operations

-      resources/

-            META-INF/

-                sca-contribution.xml

-            OSGI-INF/

-                sca/

-                    bundle.componentType - The component type for implementation.osgi of this bundle

-                    bundle.composite - The composite file

-  test/

-    java/

-        src/

-            calculator/

-                dosgi/

-                    test/

-                        CalculatorOSGiNodeTestCase.java - The JUNIT test case that tests this bundle against a RMI service

-

-  META-INF/

-    MANIFEST.MF - The OSGi manifest for this bundle

-  dosig-calculator.png - a pictorial representation of the sample

-  pom.xml                         - the Maven build file

-

-

-

-Building And Running The Test Case Using Maven

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

-With either the binary or source distributions the sample can be built and run

-using Maven as follows.

-

-cd dosgi-calculator

-mvn

-

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-script/calculator-contribution/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-script/calculator-contribution/README
index 1e5bc9c584..fe9aac7f3c 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-script/calculator-contribution/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-script/calculator-contribution/README
@@ -3,24 +3,6 @@ Calculator Sample Contribution
 

 This sample contribution implements a simple calculator using SCA components.

 

-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. ( where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive) Take a look there for instructions on how to launch

-this sample contribution. 

-

-Sample Overview

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

-The sample provides a single calculator service with a default SCA (java) 

-binding. The CalculatorClient exercises this interface by calling add, 

-subtract, multiply and divide operations. This results in messages passing to 

-the appropriate components in the composite across the local wires.

-

-Amongst the other output created by the launcher/contribution combination,  you should see the following output ...

-

-run:

-     [java] 3 + 2=5.0

-     [java] 3 - 2=1.0

-     [java] 3 * 2=6.0

-     [java] 3 / 2=1.5

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information

 

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-spring/helloworld-spring-contribution/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-spring/helloworld-spring-contribution/README
new file mode 100644
index 0000000000..50e3b874ba
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-spring/helloworld-spring-contribution/README
@@ -0,0 +1,8 @@
+Sample implementation.spring Contribution

+==========================================

+

+This sample contribution shows SCA components implemented using Spring.

+

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information

+

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-spring/helloworld-spring-webapp/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-spring/helloworld-spring-webapp/README
new file mode 100644
index 0000000000..c3e2ceed03
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-spring/helloworld-spring-webapp/README
@@ -0,0 +1,9 @@
+Sample implementation.spring WebApp

+==========================================

+

+This sample contribution shows SCA components implemented using Spring and 

+wrapped in a webapp

+

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information

+

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-jaxrs/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-jaxrs/README
index 828aadb0f1..82c3349c85 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-jaxrs/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-jaxrs/README
@@ -1,7 +1,8 @@
-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. (where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive). Take a look there first (noting at you read it that this sample

-is not a new style sample). 

+Sample implementation.web JAXRS WebApp

+==========================================

 

-TODO - finish
\ No newline at end of file
+This sample contribution shows SCA components implemented in a webapp and 

+accessed using JAXRS.

+

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-js-client/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-js-client/README
index 828aadb0f1..455a56b815 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-js-client/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-js-client/README
@@ -1,7 +1,8 @@
-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. (where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive). Take a look there first (noting at you read it that this sample

-is not a new style sample). 

+Sample implementation.web JS WebApp

+==========================================

 

-TODO - finish
\ No newline at end of file
+This sample contribution shows SCA components implemented in a webapp and 

+accessed using Javascript.

+

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-jsf/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-jsf/README
new file mode 100644
index 0000000000..c845341743
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-jsf/README
@@ -0,0 +1,8 @@
+Sample implementation.web JSF WebApp

+==========================================

+

+This sample contribution shows SCA components implemented in a webapp and 

+accessed using Java Server Faces.

+

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-servlet/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-servlet/README
index 828aadb0f1..6874bcaddc 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-servlet/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-servlet/README
@@ -1,7 +1,8 @@
-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. (where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive). Take a look there first (noting at you read it that this sample

-is not a new style sample). 

+Sample implementation.web Servlet WebApp

+==========================================

 

-TODO - finish
\ No newline at end of file
+This sample contribution shows SCA components implemented in a webapp and 

+accessed using a Servlet.

+

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-stripes/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-stripes/README
new file mode 100644
index 0000000000..f331fb036c
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/implementation-web/helloworld-stripes/README
@@ -0,0 +1,8 @@
+Sample implementation.web Stripes WebApp

+==========================================

+

+This sample contribution shows SCA components implemented in a webapp and 

+accessed using a Stripes.

+

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/sca-client/calculator-scaclient/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/sca-client/calculator-scaclient/README
index 97058ca4c9..59dd5f1759 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/sca-client/calculator-scaclient/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/sca-client/calculator-scaclient/README
@@ -1,13 +1,19 @@
+Calculator SCA Client 

+=====================

+

 To run an application that uses the SCA client API to send messages to the 

 Calculator service running in the domain do the following

 

 First start one of the Calculator based contributions. For example,

 

-cd samples/binding-sca/contribution-calculator

+cd samples/learning-more/binding-sca/contribution-calculator

 follow the instructions in the README there

 

 Then run the the SCA client by doing the following:

 

-cd samples/calculator-scaclient

+cd samples/learning-more/scaclient-calculator

 mvn exec:java

 

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information

+

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/sca-client/helloworld-scaclient/README b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/sca-client/helloworld-scaclient/README
new file mode 100644
index 0000000000..895716cd98
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/learning-more/sca-client/helloworld-scaclient/README
@@ -0,0 +1,19 @@
+Helloworld SCA Client 

+=====================

+

+To run an application that uses the SCA client API to send messages to the 

+Helloworld service running in the domain do the following

+

+First start one of the Helloworld based contributions. For example,

+

+cd samples/getting-started/helloworld-contribution

+follow the instructions in the README there

+

+Then run the the SCA client by doing the following:

+

+cd samples/learning-more/scaclient-helloworld

+mvn exec:java

+

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information

+

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/embedded-jse/README b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/embedded-jse/README
index b10f588d0d..467791b069 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/embedded-jse/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/embedded-jse/README
@@ -2,14 +2,9 @@ JSE Sample Launchers
 ====================

 

 This directory contains sample java launchers for the

-tuscany sample contributions.   

+Tuscany sample contributions. The launchers use the Tuscany Node API

+to embed the Tuscany runtime. 

 

-To use this sample JSE launcher with ant execute the command

-

-ant run-<contributionname>

-

-where run-<contributionname> is one of the targets in the build.xml file

-

-To use this sample launcher to run all of the contributions as junit test cases,

-execute the command "mvn" in the launcher directory.

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information

 

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/embedded-osgi/README b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/embedded-osgi/README
index e0352faf24..e7961a6eee 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/embedded-osgi/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/embedded-osgi/README
@@ -1,20 +1,8 @@
 OSGI Sample Launcher

 ===================

 

-This directory contains a sample launcher for the running the

-tuscany sample contributions in an OSGI environment.

+This directory contains sample launchers for the running some of the

+Tuscany sample contributions in an OSGI environment.

 

-The README file in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running sample contributions using the

-tuscany sample launchers. ( where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive)

-

-To use this sample OSGI launcher with ant excute the command

-

-ant <contributionname>

-

-where <contributionname> is one of the targets in the provided build.xml file

-

-To use this sample launcher to run all of the contributions as junit test cases,

-execute the command "mvn" in the launcher directory.

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-junit/calculator-contribution/README b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-junit/calculator-contribution/README
index 1e5bc9c584..3f8a9fe0aa 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-junit/calculator-contribution/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-junit/calculator-contribution/README
@@ -1,26 +1,9 @@
 Calculator Sample Contribution

 ==============================

 

-This sample contribution implements a simple calculator using SCA components.

+This sample contribution implements a simple calculator using SCA components. The

+contribution is tested automatically using the maven-tuscany-plugin

 

-The README in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running samples. ( where

-distribution-unpack-dir is the directory in which you unpacked the tuscany

-binary distribution archive) Take a look there for instructions on how to launch

-this sample contribution. 

-

-Sample Overview

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

-The sample provides a single calculator service with a default SCA (java) 

-binding. The CalculatorClient exercises this interface by calling add, 

-subtract, multiply and divide operations. This results in messages passing to 

-the appropriate components in the composite across the local wires.

-

-Amongst the other output created by the launcher/contribution combination,  you should see the following output ...

-

-run:

-     [java] 3 + 2=5.0

-     [java] 3 - 2=1.0

-     [java] 3 * 2=6.0

-     [java] 3 / 2=1.5

+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html

+for more information

 

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-osgi/README b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-osgi/README
index c416ad96a0..d597c6e881 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-osgi/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-osgi/README
@@ -1,99 +1,8 @@
-Calculator Sample
-=================
-This sample implements a simple calculator using SCA components and run it in a OSGi environment. 
+Calculator Sample Contribution
+==============================
 
-The README in the <distribution-unpack-dir>/samples directory provides 
-general instructions about building and running samples. (where
-distribution-unpack-dir is the directory in which you unpacked the tuscany
-binary distribution archive). Take a look there first (noting at you read it that this sample
-is not a new style sample). 
+This sample contribution implements a simple calculator using SCA components. The
+contribution is tested automatically under OSGi using the maven-osgi-junit-plugin
 
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -jar ..\..\features\tuscany-sca-equinox-manifest.jar -composite Calculator.composite -config ..\..\features\configuration\ -ttl 0 target\sample-calculator-osgi.jar
-
-and on *nix do
-
-java -jar ../../features/tuscany-sca-equinox-manifest.jar -composite Calculator.composite -config ../../features/configuration/ -ttl 0 target/sample-calculator-osgi.jar
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java) 
-binding. The CalculatorClient exercises this interface by calling add, 
-subtract, multiply and divide operations. This results in messages passing to 
-the appropriate components in the composite across the local wires.
-
-calculator/
-  src/
-    main/
-      java/
-        calculator/
-          CalculatorService.java  - the first component, calls +-/* as 
-                                    appropriate
-          CalculatorServiceImpl.java
-          AddService.java         - adds two numbers
-          AddServiceImpl.java
-          SubtractService.java    - subtracts one number from another
-          SubtractServiceImpl.java
-          MultiplyService.java    - multiplies two numbers
-          MultiplyServiceImpl.java
-          DivideService.java      - divides one number by another
-          DivideServiceImpl.java
-          CalculatorClient.java   - starts the SCA Runtime and 
-                                    deploys the Calculator.composite. 
-                                    It then calls the deployed Calculator 
-                                    Components services
-      resources/
-        Calculator.composite      - the SCA assembly for this sample
-    test/
-      java/
-        calculator/
-          CalculatorTestCase.java - JUnit test case 
-  calculator.png                  - a pictorial representation of the sample 
-                                    .composite file
-  build.xml                       - the Ant build file
-  pom.xml                         - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd calculator
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] 3 + 2=5.0
-     [java] 3 - 2=1.0
-     [java] 3 * 2=6.0
-     [java] 3 / 2=1.5
-
-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 calculator
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.272 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/README b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/README
index 4c67296bd4..f602dd35ab 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/README
@@ -1,99 +1,9 @@
-Calculator Sample
-=================
-This sample implements a simple calculator using SCA components and run it in a OSGi environment using the REST binding. 
+Calculator REST Sample Contribution
+===================================
 
-The README in the <distribution-unpack-dir>/samples directory provides 
-general instructions about building and running samples. (where
-distribution-unpack-dir is the directory in which you unpacked the tuscany
-binary distribution archive). Take a look there first (noting at you read it that this sample
-is not a new style sample). 
+This sample contribution implements a simple calculator using SCA components. The
+Calculator component is made avaible over a REST style interface using JAXRS. The
+contribution is tested automatically under OSGi using the maven-osgi-junit-plugin
 
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -jar ..\..\features\tuscany-sca-equinox-manifest.jar -composite Calculator.composite -config ..\..\features\configuration\ -ttl 0 target\sample-calculator-osgi.jar
-
-and on *nix do
-
-java -jar ../../features/tuscany-sca-equinox-manifest.jar -composite Calculator.composite -config ../../features/configuration/ -ttl 0 target/sample-calculator-osgi.jar
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java) 
-binding. The CalculatorClient exercises this interface by calling add, 
-subtract, multiply and divide operations. This results in messages passing to 
-the appropriate components in the composite across the local wires.
-
-calculator/
-  src/
-    main/
-      java/
-        calculator/
-          CalculatorService.java  - the first component, calls +-/* as 
-                                    appropriate
-          CalculatorServiceImpl.java
-          AddService.java         - adds two numbers
-          AddServiceImpl.java
-          SubtractService.java    - subtracts one number from another
-          SubtractServiceImpl.java
-          MultiplyService.java    - multiplies two numbers
-          MultiplyServiceImpl.java
-          DivideService.java      - divides one number by another
-          DivideServiceImpl.java
-          CalculatorClient.java   - starts the SCA Runtime and 
-                                    deploys the Calculator.composite. 
-                                    It then calls the deployed Calculator 
-                                    Components services
-      resources/
-        Calculator.composite      - the SCA assembly for this sample
-    test/
-      java/
-        calculator/
-          CalculatorTestCase.java - JUnit test case 
-  calculator.png                  - a pictorial representation of the sample 
-                                    .composite file
-  build.xml                       - the Ant build file
-  pom.xml                         - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd calculator
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] 3 + 2=5.0
-     [java] 3 - 2=1.0
-     [java] 3 * 2=6.0
-     [java] 3 / 2=1.5
-
-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 calculator
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.272 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
+for more information
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/shell/README b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/shell/README
index 9745f57ad9..5c6b14cd87 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/shell/README
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/shell/README
@@ -4,6 +4,9 @@ Sample Tuscany Shell
 This directory contains a sample shell program supporting simple commands to
 start and stop SCA composites.
 
+See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
+for more information
+
 To build the sample shell do this:
 mvn install