1 files changed, 39 insertions, 54 deletions
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