3 files changed, 19 insertions, 4 deletions
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README
index 77a4cbae9e..9cd41b0fe5 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README
@@ -9,10 +9,10 @@ binary distribution archive). Take a look there first (noting at you read it tha
 is not a new style sample). 
 
 On Windows, run
-java -jar ..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\features\configuration -clean -console
+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
+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:
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
index ded82797b5..195fa9e4e9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
@@ -27,35 +27,47 @@
         <property name="remote.configs.supported" value="org.osgi.sca"/>
         <property name="service.imported.configs" value="org.osgi.sca"/>
         <property name="sca.reference" value="addService"/>
+<!-- ##############################################################################################################-->
+<!-- Property org.osgi.sca.bindings can be removed when running with -Dorg.osgi.sca.domain.registry=tribes:default -->         
         <property name="org.osgi.sca.bindings">
             <list>
                 <value>{http://sample}Add</value>
             </list>
         </property>
+<!-- ##############################################################################################################-->
     </endpoint-description>
     <endpoint-description>
         <property name="objectClass" value="calculator.dosgi.operations.SubtractService" />
         <property name="service.imported.configs" value="org.osgi.sca"/>
         <property name="remote.configs.supported" value="org.osgi.sca"/>
         <property name="sca.reference" value="subtractService"/>
+<!-- ##############################################################################################################-->
+<!-- Property org.osgi.sca.bindings can be removed when running with -Dorg.osgi.sca.domain.registry=tribes:default -->         
         <property name="org.osgi.sca.bindings">
             <list>
                 <value>{http://sample}Subtract</value>
             </list>
         </property>
+<!-- ##############################################################################################################-->
     </endpoint-description>
     <endpoint-description>
         <property name="objectClass" value="calculator.dosgi.operations.MultiplyService" />
         <property name="service.imported.configs" value="org.osgi.sca"/>
         <property name="remote.configs.supported" value="org.osgi.sca"/>
         <property name="sca.reference" value="multiplyService"/>
+<!-- ##############################################################################################################-->
+<!-- Property org.osgi.sca.bindings can be removed when running with -Dorg.osgi.sca.domain.registry=tribes:default -->         
         <property name="org.osgi.sca.bindings" value="{http://sample}Multiply"/>
+<!-- ##############################################################################################################-->
     </endpoint-description>
     <endpoint-description>
         <property name="objectClass" value="calculator.dosgi.operations.DivideService" />
         <property name="service.imported.configs" value="org.osgi.sca"/>
         <property name="remote.configs.supported" value="org.osgi.sca"/>
         <property name="sca.reference" value="divideService"/>
+<!-- ##############################################################################################################-->
+<!-- Property org.osgi.sca.bindings can be removed when running with -Dorg.osgi.sca.domain.registry=tribes:default -->         
         <property name="org.osgi.sca.bindings" value="{http://sample}Divide"/>
+<!-- ##############################################################################################################-->
     </endpoint-description>
 </endpoint-descriptions>
 \ No newline at end of file
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/README b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/README
index e8d311298e..be0ead782e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/README
@@ -8,11 +8,14 @@ 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
+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
+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: