summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-11-04 17:55:11 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-11-04 17:55:11 +0000
commitd8637c5032fdf053422adf6e918c95f0b93d840a (patch)
tree9c8a6c0acde193c6006687cb099a9b86fba0c76d /java
parent329e14d3e79efbaaaef9d490bf735f2312473542 (diff)
Update README files
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@832820 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/sca/samples/dosgi-calculator-operations/README152
-rw-r--r--java/sca/samples/dosgi-calculator/README93
-rw-r--r--java/sca/samples/dosgi-dynamic-calculator-operations/README26
-rw-r--r--java/sca/samples/dosgi-dynamic-calculator/README21
4 files changed, 137 insertions, 155 deletions
diff --git a/java/sca/samples/dosgi-calculator-operations/README b/java/sca/samples/dosgi-calculator-operations/README
index 9e616c1f50..e533bfcdb6 100644
--- a/java/sca/samples/dosgi-calculator-operations/README
+++ b/java/sca/samples/dosgi-calculator-operations/README
@@ -7,10 +7,10 @@ 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
+java -jar ..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\features\configuration -clean -console
On *Unix, run
-java -jar ../../modules/osgi-3.4.0-v20080605-1900.jar -configuration ../../features/configuration -clean -console
+java -jar ../../modules/osgi-3.5.0-v20090520.jar -configuration ../../features/configuration -clean -console
You should see the osgi console:
@@ -25,100 +25,100 @@ 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
+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
-Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta
-rt
+Nov 4, 2009 9:51:56 AM calculator.dosgi.operations.impl.OperationsActivator star
+t
INFO: Registering calculator.dosgi.operations.SubtractService
-Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta
-rt
+Nov 4, 2009 9:51:56 AM calculator.dosgi.operations.impl.OperationsActivator star
+t
INFO: Registering calculator.dosgi.operations.MultiplyService
-Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta
-rt
+Nov 4, 2009 9:51:56 AM calculator.dosgi.operations.impl.OperationsActivator star
+t
INFO: Registering calculator.dosgi.operations.DivideService
-Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator get
-Bundle
+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
-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
+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
-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
+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
-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
+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
-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
+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 181
-Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.node.impl.NodeImpl stop
+osgi> stop 198
+Nov 4, 2009 9:53:19 AM 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
+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
-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
+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
-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
+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
-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
+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
-Jun 22, 2009 2:09:48 PM calculator.dosgi.operations.impl.OperationsActivator sto
-p
-INFO: Stopping file:./target/sample-dosgi-calculator-operations.jar [181]
+Nov 4, 2009 9:53:19 AM calculator.dosgi.operations.impl.OperationsActivator stop
+
+INFO: Stopping calculator.dosgi.operations_1.0.0 [198]
osgi>
diff --git a/java/sca/samples/dosgi-calculator/README b/java/sca/samples/dosgi-calculator/README
index 374c0f0a8b..d8aa13497a 100644
--- a/java/sca/samples/dosgi-calculator/README
+++ b/java/sca/samples/dosgi-calculator/README
@@ -7,68 +7,53 @@ 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
+java -jar ..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\features\configuration -clean -console
On *Unix, run
-java -jar ../../modules/osgi-3.4.0-v20080605-1900.jar -configuration ../../features/configuration -clean -console
+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.jar
-Bundle id is 181
+Bundle id is 198
-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
+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
-Jun 22, 2009 1:37:21 PM calculator.dosgi.impl.CalculatorActivator getBundle
+Nov 4, 2009 9:40:01 AM 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
+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
-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
-:
-
+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
@@ -78,18 +63,18 @@ You can also use the WebService Explorer from Eclipse WTP to test the Web Servic
To stop the bundle:
-osgi> stop 181
-Jun 22, 2009 1:39:09 PM org.apache.tuscany.sca.node.impl.NodeImpl stop
+osgi> stop 198
+Nov 4, 2009 9:41:22 AM 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
+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
-Jun 22, 2009 1:39:09 PM calculator.dosgi.impl.CalculatorActivator stop
-INFO: Stopping file:./target/sample-dosgi-calculator.jar [181]
+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
diff --git a/java/sca/samples/dosgi-dynamic-calculator-operations/README b/java/sca/samples/dosgi-dynamic-calculator-operations/README
index 9e616c1f50..bd52c7e782 100644
--- a/java/sca/samples/dosgi-dynamic-calculator-operations/README
+++ b/java/sca/samples/dosgi-dynamic-calculator-operations/README
@@ -7,30 +7,27 @@ 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
+java -jar ..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\features\configuration -clean -console
On *Unix, run
-java -jar ../../modules/osgi-3.4.0-v20080605-1900.jar -configuration ../../features/configuration -clean -console
+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
+osgi> install file:./target/sample-dosgi-dynamic-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]
+INFO: Starting file:./target/sample-dosgi-dynamic-calculator-operations.jar [181]
Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta
rt
INFO: Registering calculator.dosgi.operations.AddService
@@ -118,7 +115,7 @@ 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]
+INFO: Stopping file:./target/sample-dosgi-dynamic-calculator-operations.jar [181]
osgi>
@@ -131,10 +128,10 @@ 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)
+ (See ../samples/dosgi-dynamic-calculator-operations)
-dosgi-calculator-operations/
+dosgi-dynamic-calculator-operations/
src/
main/
java/
@@ -154,10 +151,9 @@ dosgi-calculator-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
+ OSGI-INF/
+ sca-config/
+ operations-config.xml - The SCA configuration file for OSGi remote services
test/
java/
src/
@@ -178,6 +174,6 @@ 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
+cd dosgi-dynamic-calculator-operations
mvn
diff --git a/java/sca/samples/dosgi-dynamic-calculator/README b/java/sca/samples/dosgi-dynamic-calculator/README
index 374c0f0a8b..c272c156b7 100644
--- a/java/sca/samples/dosgi-dynamic-calculator/README
+++ b/java/sca/samples/dosgi-dynamic-calculator/README
@@ -7,10 +7,10 @@ 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
+java -jar ..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\features\configuration -clean -console
On *Unix, run
-java -jar ../../modules/osgi-3.4.0-v20080605-1900.jar -configuration ../../features/configuration -clean -console
+java -jar ../../modules/osgi-3.5.0-v20090520.jar -configuration ../../features/configuration -clean -console
You should see the osgi console:
@@ -24,12 +24,12 @@ osgi> ss
Then you can install and start the calculator.dosgi bundle:
-osgi> install file:./target/sample-dosgi-calculator.jar
+osgi> install file:./target/sample-dosgi-dynamic-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]
+INFO: Starting file:./target/sample-dosgi-dynamic-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
@@ -89,7 +89,7 @@ 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]
+INFO: Stopping file:./target/sample-dosgi-dynamic-calculator.jar [181]
To exit the console, run:
osgi> exit
@@ -100,10 +100,10 @@ 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)
+ (See ../samples/dosgi-dynamic-calculator-operations)
-dosgi-calculator/
+dosgi-dynamic-calculator/
src/
main/
java/
@@ -127,9 +127,10 @@ dosgi-calculator/
META-INF/
sca-contribution.xml
OSGI-INF/
- sca/
- bundle.componentType - The component type for implementation.osgi of this bundle
- bundle.composite - The composite file
+ 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/