Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/pom.xml?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/pom.xml 
(original)
+++ incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/pom.xml 
Sun Sep 16 16:37:32 2007
@@ -90,7 +90,7 @@
                         <configuration>
                             <tasks>
                                 <ant antfile="./build-bundles.xml" 
target="create-bundles">
-                                    <property name="jar.dir" value="target" />
+                                    <property name="jar.dir" 
value="target/classes" />
                                     <property name="files.dir" 
value="target/classes" />
                                     <property name="jar.file.name" 
value="Customer.jar" />
                                     <property name="manifest.file.name" 
value="osgi/Customer.mf" />
@@ -101,7 +101,7 @@
 
                                 </ant>
                                 <ant antfile="./build-bundles.xml" 
target="create-bundles">
-                                    <property name="jar.dir" value="target" />
+                                    <property name="jar.dir" 
value="target/classes" />
                                     <property name="files.dir" 
value="target/classes" />
                                     <property name="jar.file.name" 
value="Retailer.jar" />
                                     <property name="manifest.file.name" 
value="osgi/Retailer.mf" />
@@ -112,7 +112,7 @@
 
                                 </ant>
                                 <ant antfile="./build-bundles.xml" 
target="create-bundles">
-                                    <property name="jar.dir" value="target" />
+                                    <property name="jar.dir" 
value="target/classes" />
                                     <property name="files.dir" 
value="target/classes" />
                                     <property name="jar.file.name" 
value="Shipper.jar" />
                                     <property name="manifest.file.name" 
value="osgi/Shipper.mf" />
@@ -123,7 +123,7 @@
 
                                 </ant>
                                 <ant antfile="./build-bundles.xml" 
target="create-bundles">
-                                    <property name="jar.dir" value="target" />
+                                    <property name="jar.dir" 
value="target/classes" />
                                     <property name="files.dir" 
value="target/classes" />
                                     <property name="jar.file.name" 
value="Warehouse.jar" />
                                     <property name="manifest.file.name" 
value="osgi/Warehouse.mf" />
@@ -134,7 +134,7 @@
 
                                 </ant>
                                 <ant antfile="./build-bundles.xml" 
target="create-bundles">
-                                    <property name="jar.dir" value="target" />
+                                    <property name="jar.dir" 
value="target/classes" />
                                     <property name="files.dir" 
value="target/classes" />
                                     <property name="jar.file.name" 
value="DSCustomer.jar" />
                                     <property name="manifest.file.name" 
value="osgi/ds/Customer.mf" />
@@ -145,7 +145,7 @@
 
                                 </ant>
                                 <ant antfile="./build-bundles.xml" 
target="create-bundles">
-                                    <property name="jar.dir" value="target" />
+                                    <property name="jar.dir" 
value="target/classes" />
                                     <property name="files.dir" 
value="target/classes" />
                                     <property name="jar.file.name" 
value="DSRetailer.jar" />
                                     <property name="manifest.file.name" 
value="osgi/ds/Retailer.mf" />
@@ -156,7 +156,7 @@
 
                                 </ant>
                                 <ant antfile="./build-bundles.xml" 
target="create-bundles">
-                                    <property name="jar.dir" value="target" />
+                                    <property name="jar.dir" 
value="target/classes" />
                                     <property name="files.dir" 
value="target/classes" />
                                     <property name="jar.file.name" 
value="DSShipper.jar" />
                                     <property name="manifest.file.name" 
value="osgi/ds/Shipper.mf" />
@@ -167,7 +167,7 @@
 
                                 </ant>
                                 <ant antfile="./build-bundles.xml" 
target="create-bundles">
-                                    <property name="jar.dir" value="target" />
+                                    <property name="jar.dir" 
value="target/classes" />
                                     <property name="files.dir" 
value="target/classes" />
                                     <property name="jar.file.name" 
value="DSWarehouse.jar" />
                                     <property name="manifest.file.name" 
value="osgi/ds/Warehouse.mf" />

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
 Sun Sep 16 16:37:32 2007
@@ -48,8 +48,6 @@
     
     public OSGiBundleImpl(String serviceName, String... references) {
         
-        System.out.println("Created " + this.getClass().getSimpleName());
-        
         myClass = this.getClass();
         this.name = this.getClass().getSimpleName();
         this.serviceName = serviceName;
@@ -72,7 +70,7 @@
     
     public void start(BundleContext bc) {
        
-       System.out.println("Started bundle " + name);
+       System.out.println("Started OSGi bundle with activator " + name);
        
        this.bundleContext = bc;
        
@@ -97,7 +95,7 @@
     }
     
     public void stop(BundleContext bc)  {
-        System.out.println("Stop bundle " + name);
+        System.out.println("Stop OSGi bundle with activator " + name);
 
     }
     

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
 Sun Sep 16 16:37:32 2007
@@ -39,7 +39,6 @@
     }
     
     public void purchaseGoods() {
-        System.out.println("Customer.purchaseGoods, retailer is " + retailer);
         retailer.submitOrder("Order");
     }
     

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
 Sun Sep 16 16:37:32 2007
@@ -39,7 +39,6 @@
     }
    
     public void purchaseGoods() {
-       System.out.println("Customer.purchaseGoods, retailer is " + retailer);
         retailer.submitOrder("Order");
     }
     

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
 Sun Sep 16 16:37:32 2007
@@ -35,7 +35,6 @@
     }
    
     public void purchaseGoods() {
-        System.out.println("Customer.purchaseGoods, retailer is " + retailer);
         retailer.submitOrder("Order");
     }
     

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
 Sun Sep 16 16:37:32 2007
@@ -43,7 +43,6 @@
        
     public void submitOrder(String order) {
        
-       System.out.println("Retailer.submitOrder, warehouse is " + warehouse);
         warehouse.fulfillOrder(order + ", submitted");
         
     }

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
 Sun Sep 16 16:37:32 2007
@@ -38,7 +38,6 @@
     
     public void submitOrder(String order) {
        
-       System.out.println("Retailer.submitOrder, warehouse is" + warehouse);
         warehouse.fulfillOrder(order + ", submitted");
        
     }

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
 Sun Sep 16 16:37:32 2007
@@ -35,8 +35,6 @@
     }
     
     public void submitOrder(String order) {
-       
-       System.out.println("Retailer.submitOrder, warehouse is " + warehouse);
         warehouse.fulfillOrder(order + ", submitted");        
         
     }

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
 Sun Sep 16 16:37:32 2007
@@ -40,7 +40,6 @@
     }
     
     public void processShipment(String order) {
-       System.out.println("Shipper.processShipment, customer is " + customer);
         customer.notifyShipment(order + ", shipped");
     }
     

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
 Sun Sep 16 16:37:32 2007
@@ -38,7 +38,6 @@
     }
     
     public void processShipment(String order) {
-       System.out.println("Shipper.processShipment, customer is " + customer);
         customer.notifyShipment(order + ", shipped");
     }
     

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
 Sun Sep 16 16:37:32 2007
@@ -35,7 +35,6 @@
     
     
     public void processShipment(String order) {
-       System.out.println("Shipper.processShipment, customer is " + customer);
         customer.notifyShipment(order + ", shipped");
     }
     

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
 Sun Sep 16 16:37:32 2007
@@ -40,8 +40,6 @@
     }
     
     public void fulfillOrder(String order) {
-       System.out.println("Warehouse.fulfillOrder : shipper is " + shipper);
-        
         shipper.processShipment(order + ", fulfilled");
     }
     

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
 Sun Sep 16 16:37:32 2007
@@ -38,8 +38,6 @@
     }
     
     public void fulfillOrder(String order) {
-       System.out.println("Warehouse.fulfillOrder : shipper is " + shipper);
-               
         shipper.processShipment(order + ", fulfilled");
        
     }

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
 Sun Sep 16 16:37:32 2007
@@ -36,8 +36,6 @@
     
     
     public void fulfillOrder(String order) {
-       System.out.println("Warehouse.fulfillOrder : shipper is " + shipper);
-               
         shipper.processShipment(order + ", fulfilled");
        
     }

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
 Sun Sep 16 16:37:32 2007
@@ -27,7 +27,6 @@
         interface="supplychain.retailer.Retailer" 
         bind="setRetailer"
         unbind="unsetRetailer"
-        target="(component.name=RetailerComponent)"
         policy="dynamic"
     />
 </component>

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
 Sun Sep 16 16:37:32 2007
@@ -27,7 +27,6 @@
         interface="supplychain.warehouse.Warehouse" 
         bind="setWarehouse"
         unbind="unsetWarehouse"
-        target="(component.name=WarehouseComponent)"
         policy="dynamic"
     />
 </component>

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
 Sun Sep 16 16:37:32 2007
@@ -27,7 +27,6 @@
         interface="supplychain.customer.Customer" 
         bind="setCustomer"
         unbind="unsetCustomer"
-        target="(component.name=CustomerComponent)"
         cardinality="0..1"
         policy="dynamic"
     />

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
 Sun Sep 16 16:37:32 2007
@@ -27,7 +27,6 @@
         interface="supplychain.shipper.Shipper" 
         bind="setShipper"
         unbind="unsetShipper"
-        target="(component.name=ShipperComponent)"
         policy="dynamic"
     />
 </component>

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/supplychain.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/supplychain.composite?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/supplychain.composite
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/supplychain.composite
 Sun Sep 16 16:37:32 2007
@@ -27,8 +27,7 @@
     <component name="CustomerComponent">
         <tuscany:implementation.osgi 
             bundle="Customer" 
-            bundleLocation="file:target/Customer.jar" 
-            scope="COMPOSITE"
+            bundleSymbolicName="supplychain.customer.Customer"          
         />
             
         <!--implementation.java 
class="supplychain.customer.JavaCustomerComponentImpl" -->
@@ -39,7 +38,7 @@
         <implementation.java 
class="supplychain.retailer.JavaRetailerComponentImpl" />
         <!--implementation.osgi
             bundle="Retailer" 
-            bundleLocation="file:target/Retailer.jar" 
+            bundleSymbolicName="supplychain.retailer.Retailer" 
         /-->
         <reference name="warehouse" target="WarehouseComponent"/>
     </component>
@@ -48,15 +47,15 @@
         <implementation.java 
class="supplychain.warehouse.JavaWarehouseComponentImpl" />
         <!--implementation.osgi
             bundle="Warehouse" 
-            bundleLocation="file:target/Warehouse.jar" 
+            bundleSymbolicName="supplychain.warehouse.Warehouse" 
         /-->
         <reference name="shipper" target="ShipperComponent" />
     </component>
 
     <component name="ShipperComponent">
         <tuscany:implementation.osgi
-            bundle="Shipper" 
-            bundleLocation="file:target/Shipper.jar" 
+            bundle="Shipper"
+            bundleSymbolicName="supplychain.shipper.Shipper"   
         />
         <!--implementation.java 
class="supplychain.shipper.JavaShipperComponentImpl" /-->
         <reference name="customer" target="CustomerComponent" />

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
 Sun Sep 16 16:37:32 2007
@@ -27,8 +27,7 @@
     <component name="CustomerComponent">
         <tuscany:implementation.osgi 
             bundle="Customer" 
-            bundleLocation="file:target/DSCustomer.jar" 
-            scope="COMPOSITE"
+            bundleSymbolicName="ds.supplychain.customer.Customer" 
         />
             
         <!--implementation.java 
class="supplychain.customer.JavaCustomerComponentImpl" -->
@@ -37,9 +36,9 @@
 
     <component name="RetailerComponent">
         <implementation.java 
class="supplychain.retailer.JavaRetailerComponentImpl" />
-        <!--implementation.osgi
+        <!--tuscany:implementation.osgi
             bundle="Retailer" 
-            bundleLocation="file:target/DSRetailer.jar" 
+            bundleSymbolicName="ds.supplychain.retailer.Retailer" 
         /-->
         <reference name="warehouse" target="WarehouseComponent"/>
     </component>
@@ -48,7 +47,7 @@
         <implementation.java 
class="supplychain.warehouse.JavaWarehouseComponentImpl" />
         <!--implementation.osgi
             bundle="Warehouse" 
-            bundleLocation="file:target/DSWarehouse.jar" 
+            bundleSymbolicName="ds.supplychain.warehouse.Warehouse" 
         /-->
         <reference name="shipper" target="ShipperComponent" />
     </component>
@@ -56,7 +55,7 @@
     <component name="ShipperComponent">
         <tuscany:implementation.osgi
             bundle="Shipper" 
-            bundleLocation="file:target/DSShipper.jar" 
+            bundleSymbolicName="ds.supplychain.shipper.Shipper" 
         />
         <!--implementation.java 
class="supplychain.shipper.JavaShipperComponentImpl" /-->
         <reference name="customer" target="CustomerComponent" />

Modified: 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java?rev=576211&r1=576210&r2=576211&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.0/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
 Sun Sep 16 16:37:32 2007
@@ -47,10 +47,7 @@
 
 
     public void test() throws Exception {
-       
-       
-        System.out.println("In SupplyChainClientTestCase.test: Calling 
customer.purchaseGoods, customer is " + customer);
-        
+               
         customer.purchaseGoods();
         
         System.out.println("Sleeping ...");



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to