Merge changes from trunk to bring up the distributed osgi samples with Tuscany distribution

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

15 files changed, 338 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/add-component.xml b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
index bf4ccc3d28..bf4ccc3d28 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/add-component.xml
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/blueprint/operations-module.xml b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index e3b690f24a..e3b690f24a 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/blueprint/operations-module.xml
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/divide-component.xml b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
index b939a5de80..b939a5de80 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/divide-component.xml
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/multiply-component.xml b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
index 2bf897d72a..2bf897d72a 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/multiply-component.xml
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/sca/bundle.componentType b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
index 6f6f4bdce6..6f6f4bdce6 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/sca/bundle.componentType
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/sca/bundle.composite b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
index c9fb3818b8..c9fb3818b8 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/sca/bundle.composite
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/subtract-component.xml b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
index 4af00695da..4af00695da 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/OSGI-INF/subtract-component.xml
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/README b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/README
new file mode 100644
index 0000000000..9e616c1f50
--- /dev/null
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/README
@@ -0,0 +1,183 @@
+Distributed OSGi Calculator Sample

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

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

+

+The README in the samples directory (the directory above this) provides

+general instructions about building and running samples. Take a look there

+first.

+

+On Windows, run

+java -jar ..\..\modules\osgi-3.4.0-v20080605-1900.jar -configuration ..\..\features\configuration -clean -console

+

+On *Unix, run

+java -jar ../../modules/osgi-3.4.0-v20080605-1900.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 181

+

+osgi> start 181

+Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta

+rt

+INFO: Starting file:./target/sample-dosgi-calculator-operations.jar [181]

+Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta

+rt

+INFO: Registering calculator.dosgi.operations.AddService

+Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta

+rt

+INFO: Registering calculator.dosgi.operations.SubtractService

+Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta

+rt

+INFO: Registering calculator.dosgi.operations.MultiplyService

+Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta

+rt

+INFO: Registering calculator.dosgi.operations.DivideService

+Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator get

+Bundle

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

+gi.operations

+Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.node.impl.NodeImpl start

+INFO: Starting node: calculator.dosgi.operations

+Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.node.impl.NodeFactoryImpl configu

+reNode

+INFO: Loading contribution: bundleentry://181/

+Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry addEndpoint

+INFO: EndpointRegistry: Add endpoint - Endpoint:  URI = OperationsComponent#serv

+ice-binding(AddService/AddService)

+Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerS

+ervice

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

+Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry addEndpoint

+INFO: EndpointRegistry: Add endpoint - Endpoint:  URI = OperationsComponent#serv

+ice-binding(SubtractService/SubtractService)

+Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerS

+ervice

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

+Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry addEndpoint

+INFO: EndpointRegistry: Add endpoint - Endpoint:  URI = OperationsComponent#serv

+ice-binding(MultiplyService/MultiplyService)

+Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerS

+ervice

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

+Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry addEndpoint

+INFO: EndpointRegistry: Add endpoint - Endpoint:  URI = OperationsComponent#serv

+ice-binding(DivideService/DivideService)

+Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerS

+ervice

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

+

+osgi>

+

+To stop the bundle:

+

+osgi> stop 181

+Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.node.impl.NodeImpl stop

+INFO: Stopping node: calculator.dosgi.operations

+Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry removeEndpoint

+INFO: EndpointRegistry: Remove endpoint - Endpoint:  URI = OperationsComponent#s

+ervice-binding(AddService/AddService)

+Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregiste

+rService

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

+Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry removeEndpoint

+INFO: EndpointRegistry: Remove endpoint - Endpoint:  URI = OperationsComponent#s

+ervice-binding(SubtractService/SubtractService)

+Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregiste

+rService

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

+Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry removeEndpoint

+INFO: EndpointRegistry: Remove endpoint - Endpoint:  URI = OperationsComponent#s

+ervice-binding(MultiplyService/MultiplyService)

+Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregiste

+rService

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

+Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry removeEndpoint

+INFO: EndpointRegistry: Remove endpoint - Endpoint:  URI = OperationsComponent#s

+ervice-binding(DivideService/DivideService)

+Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregiste

+rService

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

+Jun 22, 2009 2:09:48 PM calculator.dosgi.operations.impl.OperationsActivator sto

+p

+INFO: Stopping file:./target/sample-dosgi-calculator-operations.jar [181]

+

+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

+

diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/OSGI-INF/blueprint/calculator-module.xml b/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
index fe0bbf21df..fe0bbf21df 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/OSGI-INF/blueprint/calculator-module.xml
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/OSGI-INF/calculator-component.xml b/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
index 457588bfb6..457588bfb6 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/OSGI-INF/calculator-component.xml
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/OSGI-INF/remote-service/calculator-service-descriptions.xml b/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
index 1a35665803..1a35665803 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/OSGI-INF/sca/bundle.componentType b/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
index 92b0ac7bf9..92b0ac7bf9 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/OSGI-INF/sca/bundle.componentType
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/OSGI-INF/sca/bundle.composite b/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
index 7109300293..7109300293 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/OSGI-INF/sca/bundle.composite
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/README b/branches/sca-java-2.0-M3/samples/dosgi-calculator/README
new file mode 100644
index 0000000000..374c0f0a8b
--- /dev/null
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator/README
@@ -0,0 +1,155 @@
+Distributed OSGi Calculator Sample

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

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

+

+The README in the samples directory (the directory above this) provides

+general instructions about building and running samples. Take a look there

+first.

+

+On Windows, run

+java -jar ..\..\modules\osgi-3.4.0-v20080605-1900.jar -configuration ..\..\features\configuration -clean -console

+

+On *Unix, run

+java -jar ../../modules/osgi-3.4.0-v20080605-1900.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.jar

+Bundle id is 181

+

+osgi> start 181

+Jun 22, 2009 1:37:21 PM calculator.dosgi.impl.CalculatorActivator start

+INFO: Starting file:./target/sample-dosgi-calculator.jar [181]

+Jun 22, 2009 1:37:21 PM calculator.dosgi.impl.CalculatorActivator start

+INFO: Registering calculator.dosgi.CalculatorService

+Jun 22, 2009 1:37:21 PM calculator.dosgi.impl.CalculatorActivator getBundle

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

+gi

+Jun 22, 2009 1:37:21 PM org.apache.tuscany.sca.node.impl.NodeImpl start

+INFO: Starting node: calculator.dosgi

+Jun 22, 2009 1:37:21 PM org.apache.tuscany.sca.node.impl.NodeFactoryImpl configu

+reNode

+INFO: Loading contribution: bundleentry://181/

+Jun 22, 2009 1:37:21 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry addEndpoint

+INFO: EndpointRegistry: Add endpoint - Endpoint:  URI = CalculatorComponent#serv

+ice-binding(CalculatorService/CalculatorService)

+2009-06-22 13:37:21.953::INFO:  jetty-6.1.x

+2009-06-22 13:37:21.953::INFO:  Started SelectChannelConnector@0.0.0.0:8086

+Jun 22, 2009 1:37:21 PM org.apache.tuscany.sca.http.jetty.JettyServer addServlet

+Mapping

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

+Jun 22, 2009 1:37:21 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry addEndpointReference

+INFO: EndpointRegistry: Add endpoint reference - Endpoint Reference:  URI = Calc

+ulatorComponent#reference-binding(addService/addService) Target = Endpoint:

+Jun 22, 2009 1:37:21 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry addEndpointReference

+INFO: EndpointRegistry: Add endpoint reference - Endpoint Reference:  URI = Calc

+ulatorComponent#reference-binding(subtractService/subtractService) Target = Endp

+oint:

+Jun 22, 2009 1:37:21 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry addEndpointReference

+INFO: EndpointRegistry: Add endpoint reference - Endpoint Reference:  URI = Calc

+ulatorComponent#reference-binding(multiplyService/multiplyService) Target = Endp

+oint:

+Jun 22, 2009 1:37:21 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry addEndpointReference

+INFO: EndpointRegistry: Add endpoint reference - Endpoint Reference:  URI = Calc

+ulatorComponent#reference-binding(divideService/divideService) Target = Endpoint

+:

+

+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 181

+Jun 22, 2009 1:39:09 PM org.apache.tuscany.sca.node.impl.NodeImpl stop

+INFO: Stopping node: calculator.dosgi

+Jun 22, 2009 1:39:09 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin

+tRegistry removeEndpoint

+INFO: EndpointRegistry: Remove endpoint - Endpoint:  URI = CalculatorComponent#s

+ervice-binding(CalculatorService/CalculatorService)

+Jun 22, 2009 1:39:09 PM org.apache.tuscany.sca.http.jetty.JettyServer removeServ

+letMapping

+INFO: Removed Servlet mapping: /CalculatorService

+Jun 22, 2009 1:39:09 PM calculator.dosgi.impl.CalculatorActivator stop

+INFO: Stopping file:./target/sample-dosgi-calculator.jar [181]

+

+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

+

diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/dosgi-calculator.png b/branches/sca-java-2.0-M3/samples/dosgi-calculator/dosgi-calculator.png
new file mode 100644
index 0000000000..805baa54d2
--- /dev/null
+++ b/branches/sca-java-2.0-M3/samples/dosgi-calculator/dosgi-calculator.png