From a40e527938d76ba71f211da7e327adb50384ba69 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 11 Nov 2009 23:26:33 +0000
Subject: Moving 1.x tags

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835157 13f79535-47bb-0310-9956-ffa450edef68
---
 .../callback/CallbackClient.componentType          |  31 ++++
 .../callback/CallbackService.componentType         |  27 +++
 .../resources/callback/callback-test1.composite    |  39 +++++
 .../resources/callback/callback-test2.composite    |  41 +++++
 .../resources/callback/callback-test3.composite    |  38 +++++
 .../ConversationalClient.componentType             |  37 +++++
 .../ConversationalReferenceClient.componentType    |  28 ++++
 .../ConversationalService.componentType            |  29 ++++
 .../conversation/conversation-test.composite       | 162 ++++++++++++++++++
 .../main/resources/factory/Customer.componentType  |  34 ++++
 .../main/resources/factory/Retailer.componentType  |  29 ++++
 .../main/resources/factory/Shipper.componentType   |  29 ++++
 .../main/resources/factory/Warehouse.componentType |  28 ++++
 .../resources/factory/ds/Customer.componentType    |  34 ++++
 .../resources/factory/ds/Retailer.componentType    |  29 ++++
 .../resources/factory/ds/Shipper.componentType     |  29 ++++
 .../resources/factory/ds/Warehouse.componentType   |  28 ++++
 .../resources/factory/ds/factory-ds-test.composite | 130 +++++++++++++++
 .../main/resources/factory/factory-test.composite  | 116 +++++++++++++
 .../resources/helloworld/Greetings.componentType   |  30 ++++
 .../resources/helloworld/HelloWorld.componentType  |  31 ++++
 .../resources/interfaces/Customer.componentType    |  31 ++++
 .../resources/interfaces/Retailer.componentType    |  35 ++++
 .../resources/interfaces/Shipper.componentType     |  29 ++++
 .../resources/interfaces/Warehouse.componentType   |  31 ++++
 .../resources/interfaces/ds/Customer.componentType |  31 ++++
 .../resources/interfaces/ds/Retailer.componentType |  35 ++++
 .../resources/interfaces/ds/Shipper.componentType  |  29 ++++
 .../interfaces/ds/Warehouse.componentType          |  31 ++++
 .../interfaces/ds/interfaces-ds-test.composite     |  57 +++++++
 .../resources/interfaces/interfaces-test.composite |  57 +++++++
 .../main/resources/osgi/callback/CallbackClient.mf |  10 ++
 .../resources/osgi/callback/CallbackService.mf     |  10 ++
 .../osgi/conversation/ConversationalClient.mf      |  11 ++
 .../conversation/ConversationalReferenceClient.mf  |  11 ++
 .../osgi/conversation/ConversationalService.mf     |  11 ++
 .../src/main/resources/osgi/factory/Customer.mf    |  11 ++
 .../src/main/resources/osgi/factory/Retailer.mf    |  10 ++
 .../src/main/resources/osgi/factory/Shipper.mf     |  10 ++
 .../src/main/resources/osgi/factory/ds/Customer.mf |  10 ++
 .../main/resources/osgi/factory/ds/Customer.xml    |  41 +++++
 .../src/main/resources/osgi/factory/ds/Retailer.mf |  11 ++
 .../main/resources/osgi/factory/ds/Retailer1.xml   |  32 ++++
 .../main/resources/osgi/factory/ds/Retailer2.xml   |  32 ++++
 .../src/main/resources/osgi/factory/ds/Shipper.mf  |  10 ++
 .../main/resources/osgi/factory/ds/Shipper1.xml    |  34 ++++
 .../main/resources/osgi/factory/ds/Shipper2.xml    |  34 ++++
 .../main/resources/osgi/factory/ds/Warehouse.mf    |  11 ++
 .../main/resources/osgi/factory/ds/Warehouse.xml   |  32 ++++
 .../src/main/resources/osgi/interfaces/Customer.mf |  11 ++
 .../src/main/resources/osgi/interfaces/Retailer.mf |  10 ++
 .../src/main/resources/osgi/interfaces/Shipper.mf  |  10 ++
 .../main/resources/osgi/interfaces/ds/Customer.mf  |  10 ++
 .../main/resources/osgi/interfaces/ds/Customer.xml |  43 +++++
 .../main/resources/osgi/interfaces/ds/Retailer.mf  |  11 ++
 .../main/resources/osgi/interfaces/ds/Retailer.xml |  39 +++++
 .../main/resources/osgi/interfaces/ds/Shipper.mf   |  10 ++
 .../main/resources/osgi/interfaces/ds/Shipper.xml  |  34 ++++
 .../src/main/resources/osgi/passbyref/Greetings.mf |  11 ++
 .../osgi/properties/ManagedStockQuoteFactory.mf    |  11 ++
 .../main/resources/osgi/properties/StockQuote.mf   |  10 ++
 .../resources/osgi/properties/StockQuoteFactory.mf |  11 ++
 .../resources/osgi/properties/ds/StockQuote.mf     |  12 ++
 .../resources/osgi/properties/ds/StockQuote.xml    |  27 +++
 .../osgi/properties/ds/StockQuoteFactory.mf        |  12 ++
 .../osgi/properties/ds/StockQuoteFactory.xml       |  27 +++
 .../main/resources/osgi/sdo/ds/HelloWorldClient.mf |  14 ++
 .../resources/osgi/sdo/ds/HelloWorldClient.xml     |  33 ++++
 .../resources/osgi/sdo/ds/HelloWorldService.mf     |  13 ++
 .../resources/osgi/sdo/ds/HelloWorldService.xml    |  25 +++
 .../src/main/resources/osgi/services/Customer.mf   |  11 ++
 .../src/main/resources/osgi/services/Retailer.mf   |  10 ++
 .../src/main/resources/osgi/services/Shipper.mf    |  10 ++
 .../src/main/resources/osgi/services/Warehouse.mf  |  10 ++
 .../main/resources/osgi/services/ds/Customer.mf    |  10 ++
 .../main/resources/osgi/services/ds/Customer.xml   |  41 +++++
 .../main/resources/osgi/services/ds/Retailer.mf    |  11 ++
 .../main/resources/osgi/services/ds/Retailer1.xml  |  32 ++++
 .../main/resources/osgi/services/ds/Retailer2.xml  |  32 ++++
 .../src/main/resources/osgi/services/ds/Shipper.mf |  10 ++
 .../main/resources/osgi/services/ds/Shipper1.xml   |  34 ++++
 .../main/resources/osgi/services/ds/Shipper2.xml   |  34 ++++
 .../main/resources/osgi/services/ds/Warehouse.mf   |  11 ++
 .../main/resources/osgi/services/ds/Warehouse1.xml |  32 ++++
 .../main/resources/osgi/services/ds/Warehouse2.xml |  32 ++++
 .../src/main/resources/osgi/version/Customer1.mf   |  11 ++
 .../src/main/resources/osgi/version/Customer2.mf   |  11 ++
 .../src/main/resources/osgi/version/Retailer1.mf   |  10 ++
 .../src/main/resources/osgi/version/Retailer2.mf   |  10 ++
 .../src/main/resources/osgi/version/Shipper1.mf    |  10 ++
 .../src/main/resources/osgi/version/Shipper2.mf    |  10 ++
 .../src/main/resources/osgi/version/Warehouse1.mf  |  10 ++
 .../src/main/resources/osgi/version/Warehouse2.mf  |  10 ++
 .../main/resources/osgi/version/ds/Customer1.mf    |  10 ++
 .../main/resources/osgi/version/ds/Customer2.mf    |  10 ++
 .../main/resources/osgi/version/ds/CustomerV1.xml  |  41 +++++
 .../main/resources/osgi/version/ds/CustomerV2.xml  |  41 +++++
 .../main/resources/osgi/version/ds/Retailer1.mf    |  11 ++
 .../main/resources/osgi/version/ds/Retailer1V1.xml |  34 ++++
 .../main/resources/osgi/version/ds/Retailer1V2.xml |  34 ++++
 .../main/resources/osgi/version/ds/Retailer2.mf    |  11 ++
 .../main/resources/osgi/version/ds/Retailer2V1.xml |  33 ++++
 .../main/resources/osgi/version/ds/Retailer2V2.xml |  33 ++++
 .../src/main/resources/osgi/version/ds/Shipper1.mf |  10 ++
 .../main/resources/osgi/version/ds/Shipper1V1.xml  |  35 ++++
 .../main/resources/osgi/version/ds/Shipper1V2.xml  |  35 ++++
 .../src/main/resources/osgi/version/ds/Shipper2.mf |  10 ++
 .../main/resources/osgi/version/ds/Shipper2V1.xml  |  35 ++++
 .../main/resources/osgi/version/ds/Shipper2V2.xml  |  35 ++++
 .../main/resources/osgi/version/ds/Warehouse1.mf   |  11 ++
 .../resources/osgi/version/ds/Warehouse1V1.xml     |  32 ++++
 .../resources/osgi/version/ds/Warehouse1V2.xml     |  32 ++++
 .../main/resources/osgi/version/ds/Warehouse2.mf   |  11 ++
 .../resources/osgi/version/ds/Warehouse2V1.xml     |  32 ++++
 .../resources/osgi/version/ds/Warehouse2V2.xml     |  32 ++++
 .../src/main/resources/osgi/wiring/Customer.mf     |  11 ++
 .../src/main/resources/osgi/wiring/Retailer.mf     |  10 ++
 .../src/main/resources/osgi/wiring/Shipper.mf      |  10 ++
 .../src/main/resources/osgi/wiring/Warehouse.mf    |  10 ++
 .../src/main/resources/osgi/wiring/ds/Customer.mf  |  10 ++
 .../src/main/resources/osgi/wiring/ds/Customer.xml |  41 +++++
 .../src/main/resources/osgi/wiring/ds/Retailer.mf  |  11 ++
 .../main/resources/osgi/wiring/ds/Retailer1.xml    |  33 ++++
 .../main/resources/osgi/wiring/ds/Retailer2.xml    |  33 ++++
 .../src/main/resources/osgi/wiring/ds/Shipper.mf   |  10 ++
 .../src/main/resources/osgi/wiring/ds/Shipper1.xml |  35 ++++
 .../src/main/resources/osgi/wiring/ds/Shipper2.xml |  34 ++++
 .../src/main/resources/osgi/wiring/ds/Warehouse.mf |  11 ++
 .../main/resources/osgi/wiring/ds/Warehouse1.xml   |  33 ++++
 .../main/resources/osgi/wiring/ds/Warehouse2.xml   |  33 ++++
 .../src/main/resources/osgi/ws/HelloWorld.mf       |  12 ++
 .../resources/passbyref/Greetings.componentType    |  30 ++++
 .../resources/passbyref/passbyref-test.composite   |  39 +++++
 .../resources/properties/StockQuote.componentType  |  28 ++++
 .../properties/StockQuoteFactory.componentType     |  28 ++++
 .../properties/ds/StockQuote.componentType         |  28 ++++
 .../properties/ds/StockQuoteFactory.componentType  |  28 ++++
 .../properties/ds/properties-ds-test.composite     |  39 +++++
 .../properties/ds/properties2-ds-test.composite    |  54 ++++++
 .../resources/properties/properties-test.composite |  39 +++++
 .../properties/properties2-test.composite          |  50 ++++++
 .../sdo/ds/HelloWorldClient.componentType          |  30 ++++
 .../sdo/ds/HelloWorldService.componentType         |  25 +++
 .../resources/sdo/ds/META-INF/sca-contribution.xml |  26 +++
 .../src/main/resources/sdo/ds/helloworld.wsdl      |  88 ++++++++++
 .../main/resources/sdo/ds/helloworldsdo.composite  |  47 ++++++
 .../main/resources/services/Customer.componentType |  34 ++++
 .../main/resources/services/Retailer.componentType |  33 ++++
 .../main/resources/services/Shipper.componentType  |  30 ++++
 .../resources/services/Warehouse.componentType     |  28 ++++
 .../resources/services/ds/Customer.componentType   |  34 ++++
 .../resources/services/ds/Retailer.componentType   |  33 ++++
 .../resources/services/ds/Shipper.componentType    |  30 ++++
 .../resources/services/ds/Warehouse.componentType  |  28 ++++
 .../services/ds/services-ds-test.composite         |  90 ++++++++++
 .../resources/services/services-test.composite     |  89 ++++++++++
 .../resources/stockquote/StockQuote.componentType  |  28 ++++
 .../main/resources/version/Customer1.componentType |  34 ++++
 .../main/resources/version/Customer2.componentType |  34 ++++
 .../main/resources/version/Retailer1.componentType |  33 ++++
 .../main/resources/version/Retailer2.componentType |  33 ++++
 .../main/resources/version/Shipper1.componentType  |  30 ++++
 .../main/resources/version/Shipper2.componentType  |  30 ++++
 .../resources/version/Warehouse1.componentType     |  28 ++++
 .../resources/version/Warehouse2.componentType     |  28 ++++
 .../resources/version/ds/Customer1.componentType   |  34 ++++
 .../resources/version/ds/Customer2.componentType   |  34 ++++
 .../resources/version/ds/Retailer1.componentType   |  33 ++++
 .../resources/version/ds/Retailer2.componentType   |  33 ++++
 .../resources/version/ds/Shipper1.componentType    |  30 ++++
 .../resources/version/ds/Shipper2.componentType    |  30 ++++
 .../resources/version/ds/Warehouse1.componentType  |  28 ++++
 .../resources/version/ds/Warehouse2.componentType  |  28 ++++
 .../resources/version/ds/version-ds-test.composite | 184 +++++++++++++++++++++
 .../main/resources/version/version-test.composite  | 170 +++++++++++++++++++
 .../main/resources/wiring/Customer.componentType   |  34 ++++
 .../main/resources/wiring/Retailer.componentType   |  29 ++++
 .../main/resources/wiring/Shipper.componentType    |  29 ++++
 .../main/resources/wiring/Warehouse.componentType  |  28 ++++
 .../resources/wiring/ds/Customer.componentType     |  34 ++++
 .../resources/wiring/ds/Retailer.componentType     |  29 ++++
 .../main/resources/wiring/ds/Shipper.componentType |  29 ++++
 .../resources/wiring/ds/Warehouse.componentType    |  28 ++++
 .../resources/wiring/ds/wiring-ds-test1.composite  | 136 +++++++++++++++
 .../resources/wiring/ds/wiring-ds-test2.composite  | 151 +++++++++++++++++
 .../main/resources/wiring/wiring-test1.composite   | 127 ++++++++++++++
 .../main/resources/wiring/wiring-test2.composite   | 151 +++++++++++++++++
 .../src/main/resources/ws/HelloWorld.componentType |  31 ++++
 .../src/main/resources/ws/helloworld.wsdl          |  80 +++++++++
 .../src/main/resources/ws/ws-helloworld.composite  |  51 ++++++
 190 files changed, 6224 insertions(+)
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Customer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/services-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/version-test.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
 create mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite

(limited to 'sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources')

diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
new file mode 100644
index 0000000000..71e248590b
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="CallbackClient">
+        <interface.java interface="callback.client.CallbackClient"/>
+    </service>
+    
+    
+    <reference name="callbackService" >
+        <interface.java interface="callback.service.CallbackService" 
+                        callbackInterface="callback.client.CallbackCallback" />
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
new file mode 100644
index 0000000000..7c1125bbb5
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="CallbackService">
+        <interface.java interface="callback.service.CallbackService" 
+                        callbackInterface="callback.client.CallbackCallback"/>
+    </service>
+    
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
new file mode 100644
index 0000000000..8456b878f2
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    targetNamespace="http://callback"
+    name="CallbackTest">
+           
+    <component name="CallbackClient">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0" 
+            bundleSymbolicName="callback.CallbackClient">
+            
+            <properties referenceCallback="callbackService">
+               <property name="component.name">CallbackClient</property>
+            </properties>
+        </implementation.osgi>
+        <reference name="callbackService" target="CallbackService"/>
+    </component> 
+    
+    <component name="CallbackService">
+      <implementation.java class="callback.service.JavaCallbackServiceImpl"/>
+    </component>  
+  
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
new file mode 100644
index 0000000000..d5a47c6403
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    targetNamespace="http://callback"
+    name="CallbackTest">
+           
+    <component name="CallbackClient">
+        <implementation.java class="callback.client.JavaCallbackClientImpl"/>
+        <reference name="callbackService" target="CallbackService"/>
+    </component> 
+    
+   
+    <component name="CallbackService">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="callback.CallbackService"
+        >
+        <properties serviceCallback="CallbackService">
+            <property name="component.name">CallbackClient</property>
+        </properties>
+        
+        </implementation.osgi >   
+    </component> 
+  
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
new file mode 100644
index 0000000000..e6391d2159
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    targetNamespace="http://callback"
+    name="CallbackTest">
+           
+    <component name="CallbackClient">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="callback.CallbackClient"
+        />
+        <reference name="callbackService" target="CallbackService"/>
+    </component> 
+    
+   
+    <component name="CallbackService">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="callback.CallbackService"
+        />
+    </component> 
+  
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
new file mode 100644
index 0000000000..c79ede815b
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+
+    <service name="ConversationalClient">
+        <interface.java interface="conversation.client.ConversationalClient"/>
+    </service>
+    
+    
+    <reference name="conversationalReferenceClient" >
+        <interface.java interface="conversation.referenceclient.ConversationalReferenceClient" />
+    </reference>
+    
+    <reference name="conversationalService" >
+        <interface.java interface="conversation.service.ConversationalService" 
+                        callbackInterface="conversation.client.ConversationalCallback" />
+    </reference>
+    
+   
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
new file mode 100644
index 0000000000..04cc73b85c
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+
+    
+    <service name="ConversationalReferenceClient">
+        <interface.java interface="conversation.referenceclient.ConversationalReferenceClient"/>
+    </service>
+    
+   
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
new file mode 100644
index 0000000000..9ece700efe
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+
+    <service name="ConversationalService">
+        <interface.java interface="conversation.service.ConversationalService"
+                        callbackInterface="conversation.client.ConversationalCallback" />
+    </service>
+    
+   
+    
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
new file mode 100644
index 0000000000..52bc43478d
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    targetNamespace="http://conversations"
+    name="ConversationalITest">
+           
+    <component name="ConversationalStatelessClientStatelessService">
+        <!-- <implementation.java class="conversation.ConversationalClientStatelessImpl"/> -->
+        
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="conversation.ConversationalClient"
+            classes="conversation.client.ConversationalClientStatelessImpl">
+            
+            <properties service="ConversationalClient">
+               <property name="component.name">ConversationalStatelessClientStatelessService</property>
+            </properties>
+            <properties reference="conversationalReferenceClient">
+               <property name="component.name">ConversationalReferenceClient</property>
+            </properties>
+            <properties reference="conversationalService">
+               <property name="component.name">ConversationalServiceStateless</property>
+            </properties>
+            <properties serviceCallback="$callback$.conversationalService">
+               <property name="component.name">ConversationalStatelessClientStatelessService</property>
+            </properties>
+            
+        </implementation.osgi>
+        
+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>        
+        <reference name="conversationalService" target="ConversationalServiceStateless/ConversationalService"/>
+    </component>   
+    
+    <component name="ConversationalStatelessClientStatefulService">
+        <!--<implementation.java class="conversation.ConversationalClientStatelessImpl"/>-->
+        
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="conversation.ConversationalClient"
+            classes="conversation.client.ConversationalClientStatelessImpl">
+            
+            <properties service="ConversationalClient">
+               <property name="component.name">ConversationalStatelessClientStatefulService</property>
+            </properties>
+            <properties reference="conversationalReferenceClient">
+               <property name="component.name">ConversationalReferenceClient</property>
+            </properties>
+            <properties reference="conversationalService">
+               <property name="component.name">ConversationalServiceStateful</property>
+            </properties>
+            <properties serviceCallback="$callback$.conversationalService">
+               <property name="component.name">ConversationalStatelessClientStatefulService</property>
+            </properties>
+        </implementation.osgi>
+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>       
+        <reference name="conversationalService" target="ConversationalServiceStateful/ConversationalService"/>
+    </component>     
+    
+    <component name="ConversationalStatefulClientStatelessService">
+        <!--<implementation.java class="conversation.ConversationalClientStatefulImpl"/>-->
+        
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="conversation.ConversationalClient"
+            classes="conversation.client.ConversationalClientStatefulImpl">
+            
+            <properties service="ConversationalClient">
+               <property name="component.name">ConversationalStatefulClientStatelessService</property>
+            </properties>
+            <properties reference="conversationalReferenceClient">
+               <property name="component.name">ConversationalReferenceClient</property>
+            </properties>
+            <properties reference="conversationalService">
+               <property name="component.name">ConversationalServiceStateless</property>
+            </properties>
+            <properties serviceCallback="$callback$.conversationalService">
+               <property name="component.name">ConversationalStatefulClientStatelessService</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>       
+        <reference name="conversationalService" target="ConversationalServiceStateless/ConversationalService"/>
+    </component>   
+    
+    <component name="ConversationalStatefulClientStatefulService">
+        <!--<implementation.java class="conversation.ConversationalClientStatefulImpl"/>-->
+        
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="conversation.ConversationalClient"
+            classes="conversation.client.ConversationalClientStatefulImpl">
+            
+            <properties service="ConversationalClient">
+               <property name="component.name">ConversationalStatefulClientStatefulService</property>
+            </properties>
+            <properties reference="conversationalReferenceClient">
+               <property name="component.name">ConversationalReferenceClient</property>
+            </properties>
+            <properties reference="conversationalService">
+               <property name="component.name">ConversationalServiceStateful</property>
+            </properties>
+            <properties serviceCallback="$callback$.conversationalService">
+               <property name="component.name">ConversationalStatefulClientStatefulService</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>       
+        <reference name="conversationalService" target="ConversationalServiceStateful/ConversationalService"/>
+    </component>   
+    
+    <component name="ConversationalReferenceClient">
+        <!--<implementation.java class="conversation.ConversationalReferenceClientImpl"/>-->
+        
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="conversation.ConversationalReferenceClient"
+            classes="conversation.referenceclient.ConversationalReferenceClientImpl"
+        />
+        
+    </component>    
+        
+    <component name="ConversationalServiceStateful">
+        <!--<implementation.java class="conversation.ConversationalServiceStatefulImpl"/>-->
+        
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="conversation.ConversationalService"
+            classes="conversation.service.ConversationalServiceStatefulImpl">
+            
+            <properties service="ConversationalService">
+               <property name="component.name">ConversationalServiceStateful</property>
+            </properties>
+        </implementation.osgi>
+        
+    </component>       
+   
+    <component name="ConversationalServiceStateless">
+        <!--<implementation.java class="conversation.ConversationalServiceStatelessImpl"/>-->
+        
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="conversation.ConversationalService"
+            classes="conversation.service.ConversationalServiceStatelessImpl">
+            
+            <properties service="ConversationalService">
+               <property name="component.name">ConversationalServiceStateless</property>
+            </properties>
+        </implementation.osgi>
+        
+    </component> 
+
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
new file mode 100644
index 0000000000..1fd551be3b
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Customer">
+        <interface.java interface="supplychain.customer.Customer"/>
+    </service>
+    <reference name="retailer1">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer2">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer3">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
new file mode 100644
index 0000000000..5599c44bc3
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="Retailer">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference name="warehouse">
+            <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </reference>
+    <property name="retailerName" type="xsd:string" >default</property> 
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
new file mode 100644
index 0000000000..8743f8c145
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="Shipper">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <reference name="customer">
+            <interface.java interface="supplychain.customer.Customer"/>
+    </reference>
+    <property name="shipperName" type="xsd:string" >default</property> 
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Warehouse">
+        <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    
+    <reference name="shipper">
+            <interface.java interface="supplychain.shipper.Shipper"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
new file mode 100644
index 0000000000..1fd551be3b
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Customer">
+        <interface.java interface="supplychain.customer.Customer"/>
+    </service>
+    <reference name="retailer1">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer2">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer3">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
new file mode 100644
index 0000000000..5599c44bc3
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="Retailer">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference name="warehouse">
+            <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </reference>
+    <property name="retailerName" type="xsd:string" >default</property> 
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
new file mode 100644
index 0000000000..8743f8c145
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="Shipper">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <reference name="customer">
+            <interface.java interface="supplychain.customer.Customer"/>
+    </reference>
+    <property name="shipperName" type="xsd:string" >default</property> 
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Warehouse">
+        <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    
+    <reference name="shipper">
+            <interface.java interface="supplychain.shipper.Shipper"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
new file mode 100644
index 0000000000..0b8d2e5851
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://supplychain"
+    xmlns:sp="http://supplychain"
+    name="supplychain">
+
+    <component name="CustomerComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.factory.supplychain.customer.Customer"
+                classes="supplychain.customer.OSGiStatelessCustomerComponentImpl" >
+            
+            <properties reference="retailer1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="retailer2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties reference="retailer3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="retailer1" target="RetailerComponent1"/>
+        
+        <reference name="retailer2" target="RetailerComponent2" />
+        
+        <reference name="retailer3" target="RetailerComponent3" />
+    </component>
+
+    <component name="RetailerComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.factory.supplychain.retailer.Retailer" >
+            <properties service="Retailer">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+        </implementation.osgi>
+        <service name="Retailer"/>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>        
+        <property name="retailerName" type="xsd:string" >amazon.com</property> 
+    </component>
+    
+    <component name="RetailerComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.factory.supplychain.retailer.Retailer" >
+            <properties service="Retailer">
+                <property name="retailerName">play.com</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>
+        <property name="retailerName" type="xsd:string" >play.com</property> 
+    </component>
+    
+    <component name="RetailerComponent3">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.factory.supplychain.retailer.Retailer" >
+            <properties service="Retailer">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>
+        <property name="retailerName" type="xsd:string" >ebay.com</property> 
+    </component>
+
+
+
+    <component name="WarehouseComponent1">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent2"  />
+    </component>
+    
+    <component name="WarehouseComponent2">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent1"  />
+    </component>
+
+    <component name="ShipperComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.factory.supplychain.shipper.Shipper"
+            classes="supplychain.shipper.OSGiStatelessShipperComponentImpl" >
+            
+            <properties service="Shipper">
+                <property name="shipperName">RoyalMail</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="customer" target="CustomerComponent" />
+        <property name="shipperName" type="xsd:string" >RoyalMail</property> 
+    </component>
+    
+     <component name="ShipperComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.factory.supplychain.shipper.Shipper"
+            classes="supplychain.shipper.OSGiStatelessShipperComponentImpl" >
+            
+            <properties service="Shipper">
+                <property name="shipperName">ParcelForce</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="customer" target="CustomerComponent" />
+        <property name="shipperName" type="xsd:string" >ParcelForce</property> 
+        
+    </component>
+    
+    
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
new file mode 100644
index 0000000000..87370a6df4
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://supplychain"
+    xmlns:sp="http://supplychain"
+    name="supplychain">
+
+    <component name="CustomerComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="factory.supplychain.customer.Customer"
+                classes="supplychain.customer.OSGiStatelessCustomerImpl" >
+            
+            <properties reference="retailer1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="retailer2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties reference="retailer3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="retailer1" target="RetailerComponent1"/>
+        
+        <reference name="retailer2" target="RetailerComponent2" />
+        
+        <reference name="retailer3" target="RetailerComponent3" />
+    </component>
+
+    <component name="RetailerComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="factory.supplychain.retailer.Retailer" >
+            <properties service="Retailer">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+        </implementation.osgi>
+        <service name="Retailer"/>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>        
+        <property name="retailerName" type="xsd:string" >amazon.com</property> 
+    </component>
+    
+    <component name="RetailerComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="factory.supplychain.retailer.Retailer">
+            <properties service="Retailer">
+                <property name="retailerName">play.com</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>
+        <property name="retailerName" type="xsd:string" >play.com</property> 
+    </component>
+    
+    <component name="RetailerComponent3">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="factory.supplychain.retailer.Retailer" >
+            <properties service="Retailer">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>
+        <property name="retailerName" type="xsd:string" >ebay.com</property> 
+    </component>
+
+
+
+    <component name="WarehouseComponent1">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent1"  />
+    </component>
+    
+    <component name="WarehouseComponent2">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent1"  />
+    </component>
+
+    <component name="ShipperComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="factory.supplychain.shipper.Shipper"
+            classes="supplychain.shipper.OSGiStatelessShipperServiceImpl" >
+            
+            <properties service="Shipper">
+                <property name="shipperName">ParcelForce</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="customer" target="CustomerComponent" />
+        <property name="shipperName" type="xsd:string" >ParcelForce</property> 
+    </component>
+    
+     
+    
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
new file mode 100644
index 0000000000..127349eacf
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Greetings">
+        <interface.java interface="helloworld.Greetings"/>
+    </service>
+    
+    
+    <reference name="greetingsService" >
+        <interface.java interface="helloworld.Greetings" />
+    </reference>
+      
+</componentType>
\ No newline at end of file
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
new file mode 100644
index 0000000000..7e3810c458
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="OSGiHelloWorld">
+        <interface.java interface="helloworld.HelloWorld"/>
+    </service>
+    
+    
+    <reference name="helloWorldWS" >
+        <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" / -->
+        <interface.java interface="helloworld.ws.HelloWorld" />
+    </reference>
+      
+</componentType>
\ No newline at end of file
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
new file mode 100644
index 0000000000..fb9a112d18
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Customer">
+        <interface.java interface="supplychain.customer.Customer"/>
+    </service>
+    <reference name="retailer">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailerQuery">
+            <interface.java interface="supplychain.retailer.RetailerQuery"/>
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
new file mode 100644
index 0000000000..ee732b5efc
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="Retailer">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerQuery">
+        <interface.java interface="supplychain.retailer.RetailerQuery"/>
+    </service>
+    <reference name="warehouse">
+            <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </reference>
+    <reference name="warehouseQuery">
+            <interface.java interface="supplychain.warehouse.WarehouseQuery"/>
+    </reference>
+    <property name="retailerName" type="xsd:string" >default</property> 
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
new file mode 100644
index 0000000000..8743f8c145
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="Shipper">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <reference name="customer">
+            <interface.java interface="supplychain.customer.Customer"/>
+    </reference>
+    <property name="shipperName" type="xsd:string" >default</property> 
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
new file mode 100644
index 0000000000..b1723660d7
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Warehouse">
+        <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    <service name="WarehouseQuery">
+        <interface.java interface="supplychain.warehouse.WarehouseQuery"/>
+    </service>
+    
+    <reference name="shipper">
+            <interface.java interface="supplychain.shipper.Shipper"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
new file mode 100644
index 0000000000..fb9a112d18
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Customer">
+        <interface.java interface="supplychain.customer.Customer"/>
+    </service>
+    <reference name="retailer">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailerQuery">
+            <interface.java interface="supplychain.retailer.RetailerQuery"/>
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
new file mode 100644
index 0000000000..ee732b5efc
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="Retailer">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerQuery">
+        <interface.java interface="supplychain.retailer.RetailerQuery"/>
+    </service>
+    <reference name="warehouse">
+            <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </reference>
+    <reference name="warehouseQuery">
+            <interface.java interface="supplychain.warehouse.WarehouseQuery"/>
+    </reference>
+    <property name="retailerName" type="xsd:string" >default</property> 
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
new file mode 100644
index 0000000000..8743f8c145
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="Shipper">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <reference name="customer">
+            <interface.java interface="supplychain.customer.Customer"/>
+    </reference>
+    <property name="shipperName" type="xsd:string" >default</property> 
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
new file mode 100644
index 0000000000..b1723660d7
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Warehouse">
+        <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    <service name="WarehouseQuery">
+        <interface.java interface="supplychain.warehouse.WarehouseQuery"/>
+    </service>
+    
+    <reference name="shipper">
+            <interface.java interface="supplychain.shipper.Shipper"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
new file mode 100644
index 0000000000..5172cbe21e
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://supplychain"
+    xmlns:sp="http://supplychain"
+    name="supplychain">
+    
+    <component name="CustomerComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.interfaces.supplychain.customer.Customer"
+        />
+        <reference name="retailer" target="RetailerComponent/Retailer"/>
+        <reference name="retailerQuery" target="RetailerComponent/RetailerQuery"/>
+        
+    </component>
+
+    <component name="RetailerComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.interfaces.supplychain.retailer.Retailer"
+        />
+        <reference name="warehouse" target="WarehouseComponent/Warehouse"/>
+        <reference name="warehouseQuery" target="WarehouseComponent/WarehouseQuery"/>
+    </component>
+
+    <component name="WarehouseComponent">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseWithQueryComponentImpl" />
+       
+        <reference name="shipper" target="ShipperComponent" />
+    </component>
+
+    <component name="ShipperComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.interfaces.supplychain.shipper.Shipper"
+        />
+        <reference name="customer" target="CustomerComponent" />
+    </component>
+    
+   
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
new file mode 100644
index 0000000000..b7591e732d
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://supplychain"
+    xmlns:sp="http://supplychain"
+    name="supplychain">
+    
+    <component name="CustomerComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="interfaces.supplychain.customer.Customer"
+        />
+        <reference name="retailer" target="RetailerComponent/Retailer"/>
+        <reference name="retailerQuery" target="RetailerComponent/RetailerQuery"/>
+        
+    </component>
+
+    <component name="RetailerComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="interfaces.supplychain.retailer.Retailer"
+        />
+        <reference name="warehouse" target="WarehouseComponent/Warehouse"/>
+        <reference name="warehouseQuery" target="WarehouseComponent/WarehouseQuery"/>
+    </component>
+
+    <component name="WarehouseComponent">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseWithQueryComponentImpl" />
+       
+        <reference name="shipper" target="ShipperComponent" />
+    </component>
+
+    <component name="ShipperComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="interfaces.supplychain.shipper.Shipper"
+        />
+        <reference name="customer" target="CustomerComponent" />
+    </component>
+    
+   
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
new file mode 100644
index 0000000000..cf8717fcf5
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: CallbackClient
+Bundle-SymbolicName: callback.CallbackClient
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework, callback.service
+Export-Package: callback.client
+Bundle-Activator: callback.client.OSGiCallbackClientImpl
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
new file mode 100644
index 0000000000..785212fa6d
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: CallbackService
+Bundle-SymbolicName: callback.CallbackService
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework, callback.client
+Export-Package: callback.service
+Bundle-Activator: callback.service.OSGiCallbackServiceImpl
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
new file mode 100644
index 0000000000..7a06030e32
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ConversationTest
+Bundle-SymbolicName: conversation.ConversationalClient
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework, org.osoa.sca, org.osoa.sca.annotations,
+                conversation.service, conversation.referenceclient
+Export-Package: conversation.client
+Bundle-Activator: conversation.client.ConversationalClientActivator
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
new file mode 100644
index 0000000000..5c39b53b0a
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ConversationTest
+Bundle-SymbolicName: conversation.ConversationalReferenceClient
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework, org.osoa.sca, org.osoa.sca.annotations,
+                conversation.service
+Export-Package: conversation.referenceclient
+Bundle-Activator: conversation.referenceclient.ConversationalReferenceClientActivator
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
new file mode 100644
index 0000000000..b8bb809319
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ConversationTest
+Bundle-SymbolicName: conversation.ConversationalService
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework, org.osoa.sca, org.osoa.sca.annotations,
+                conversation.client
+Export-Package: conversation.service
+Bundle-Activator: conversation.service.ConversationalServiceActivator
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
new file mode 100644
index 0000000000..26f32fe617
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Customer
+Bundle-SymbolicName: factory.supplychain.customer.Customer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.retailer
+Export-Package: supplychain.customer
+Bundle-Activator: supplychain.customer.OSGiCustomerFactoryImpl
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
new file mode 100644
index 0000000000..1b9e0e847e
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Retailer
+Bundle-SymbolicName: factory.supplychain.retailer.Retailer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.warehouse
+Export-Package: supplychain.retailer
+Bundle-Activator: supplychain.retailer.OSGiRetailerImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
new file mode 100644
index 0000000000..6066a38f29
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shipper
+Bundle-SymbolicName: factory.supplychain.shipper.Shipper
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.customer
+Export-Package: supplychain.shipper
+Bundle-Activator: supplychain.shipper.OSGiShipperFactoryImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
new file mode 100644
index 0000000000..777edd3f7d
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Customer
+Bundle-SymbolicName: ds.factory.supplychain.customer.Customer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component, supplychain.retailer
+Export-Package: supplychain.customer
+Service-Component: osgi/factory/ds/Customer.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
new file mode 100644
index 0000000000..d8adaa2ba3
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="CustomerComponent" >
+    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
+    <service servicefactory="true" >
+         <provide interface="supplychain.customer.Customer" />
+    </service>
+    <reference 
+        name="retailer1"
+        interface="supplychain.retailer.Retailer" 
+        bind="setRetailer1"
+        unbind="unsetRetailer1"
+        target="(retailerName=amazon.com)"
+        policy="dynamic"
+    />
+    <reference 
+        name="retailer2"
+        interface="supplychain.retailer.Retailer" 
+        bind="setRetailer2"
+        unbind="unsetRetailer2"
+        target="(retailerName=play.com)"
+        policy="dynamic"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
new file mode 100644
index 0000000000..e0bd9d8c10
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Retailer
+Bundle-SymbolicName: ds.factory.supplychain.retailer.Retailer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component,
+ supplychain.warehouse
+Export-Package: supplychain.retailer
+Service-Component: osgi/factory/ds/Retailer1.xml, osgi/factory/ds/Retailer2.xml 
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
new file mode 100644
index 0000000000..6005ae785c
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="RetailerComponent1"  >
+    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
+    <service servicefactory="true">
+         <provide interface="supplychain.retailer.Retailer" />
+    </service>
+    <reference 
+        name="supplychain.warehouse.Warehouse" 
+        interface="supplychain.warehouse.Warehouse" 
+        bind="setWarehouse"
+        unbind="unsetWarehouse"
+    />
+    <property name="retailerName">amazon.com</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
new file mode 100644
index 0000000000..6f0b79ebc2
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="RetailerComponent2" >
+    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
+    <service servicefactory="true">
+         <provide interface="supplychain.retailer.Retailer" />
+    </service>
+    <reference 
+        name="supplychain.warehouse.Warehouse" 
+        interface="supplychain.warehouse.Warehouse" 
+        bind="setWarehouse"
+        unbind="unsetWarehouse"
+    />
+    <property name="retailerName">play.com</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
new file mode 100644
index 0000000000..d4b461460e
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shipper
+Bundle-SymbolicName: ds.factory.supplychain.shipper.Shipper
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component, supplychain.customer
+Export-Package: supplychain.shipper
+Service-Component: osgi/factory/ds/Shipper1.xml, osgi/factory/ds/Shipper2.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
new file mode 100644
index 0000000000..bb15e6e3aa
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="ShipperComponent1"  >
+    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
+    <service servicefactory="true">
+         <provide interface="supplychain.shipper.Shipper" />
+    </service>
+    <reference 
+        name="customer" 
+        interface="supplychain.customer.Customer" 
+        bind="setCustomer"
+        unbind="unsetCustomer"
+        cardinality="0..1"
+        policy="dynamic"
+    />
+    <property name="shipperName">RoyalMail</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
new file mode 100644
index 0000000000..7591201b8c
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="ShipperComponent2">
+    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
+    <service servicefactory="true">
+         <provide interface="supplychain.shipper.Shipper" />
+    </service>
+    <reference 
+        name="customer" 
+        interface="supplychain.customer.Customer" 
+        bind="setCustomer"
+        unbind="unsetCustomer"
+        cardinality="0..1"
+        policy="dynamic"
+    />
+    <property name="shipperName">ParcelForce</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
new file mode 100644
index 0000000000..0e844fab99
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Warehouse
+Bundle-SymbolicName: ds.factory.supplychain.warehouse.Warehouse
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component,
+ supplychain.shipper
+Export-Package: supplychain.warehouse
+Service-Component: osgi/factory/ds/Warehouse.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
new file mode 100644
index 0000000000..fc86a76784
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="WarehouseComponent"  immediate="true">
+    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
+    <service>
+         <provide interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    <reference 
+        name="shipper" 
+        interface="supplychain.shipper.Shipper" 
+        bind="setShipper"
+        unbind="unsetShipper"
+        policy="dynamic"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
new file mode 100644
index 0000000000..a8a87c5c8c
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Customer
+Bundle-SymbolicName: interfaces.supplychain.customer.Customer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.retailer
+Export-Package: supplychain.customer
+Bundle-Activator: supplychain.customer.OSGiCustomerWithQueryImpl
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
new file mode 100644
index 0000000000..05bbf4db88
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Retailer
+Bundle-SymbolicName: interfaces.supplychain.retailer.Retailer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.warehouse
+Export-Package: supplychain.retailer
+Bundle-Activator: supplychain.retailer.OSGiRetailerWithQueryImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
new file mode 100644
index 0000000000..a12d1a21ea
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shipper
+Bundle-SymbolicName: interfaces.supplychain.shipper.Shipper
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.customer
+Export-Package: supplychain.shipper
+Bundle-Activator: supplychain.shipper.OSGiShipperImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
new file mode 100644
index 0000000000..2214db11a6
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Customer
+Bundle-SymbolicName: ds.interfaces.supplychain.customer.Customer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component, supplychain.retailer
+Export-Package: supplychain.customer
+Service-Component: osgi/interfaces/ds/Customer.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
new file mode 100644
index 0000000000..8d44067992
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+--> 
+<component name="CustomerComponent" immediate="true">
+    <implementation class="supplychain.customer.OSGiCustomerWithQueryComponentImpl" />
+    <service>
+         <provide interface="supplychain.customer.Customer"/>
+    </service>
+    <reference 
+        name="retailer"
+        interface="supplychain.retailer.Retailer" 
+        bind="setRetailer"
+        unbind="unsetRetailer"
+        target="(component.service.name=RetailerComponent/Retailer)"
+        policy="dynamic"
+    />
+    
+    <reference 
+        name="retailerQuery"
+        interface="supplychain.retailer.RetailerQuery" 
+        bind="setRetailerQuery"
+        unbind="unsetRetailerQuery"
+        target="(component.service.name=RetailerComponent/RetailerQuery)"
+        policy="dynamic"
+    />
+    
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
new file mode 100644
index 0000000000..60c0fb3fd3
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Retailer
+Bundle-SymbolicName: ds.interfaces.supplychain.retailer.Retailer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component,
+ supplychain.warehouse
+Export-Package: supplychain.retailer
+Service-Component: osgi/interfaces/ds/Retailer.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
new file mode 100644
index 0000000000..ca1392d2b8
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="RetailerComponent" immediate="true" >
+    <implementation class="supplychain.retailer.OSGiRetailerWithQueryComponentImpl" />
+    <service>
+         <provide interface="supplychain.retailer.Retailer"/>
+         <provide interface="supplychain.retailer.RetailerQuery"/>
+    </service>
+    <reference 
+        name="supplychain.warehouse.Warehouse" 
+        interface="supplychain.warehouse.Warehouse" 
+        bind="setWarehouse"
+        unbind="unsetWarehouse"
+    />
+    <reference 
+        name="supplychain.warehouse.WarehouseQuery" 
+        interface="supplychain.warehouse.WarehouseQuery" 
+        bind="setWarehouseQuery"
+        unbind="unsetWarehouseQuery"
+    />
+    <property name="retailerName">amazon.com</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
new file mode 100644
index 0000000000..7c9f67c36d
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shipper
+Bundle-SymbolicName: ds.interfaces.supplychain.shipper.Shipper
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component, supplychain.customer
+Export-Package: supplychain.shipper
+Service-Component: osgi/interfaces/ds/Shipper.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
new file mode 100644
index 0000000000..760c761666
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="ShipperComponent"  immediate="true" >
+    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
+    <service>
+         <provide interface="supplychain.shipper.Shipper" />
+    </service>
+    <reference 
+        name="customer" 
+        interface="supplychain.customer.Customer" 
+        bind="setCustomer"
+        unbind="unsetCustomer"
+        cardinality="0..1"
+        policy="dynamic"
+    />
+    <property name="shipperName">RoyalMail</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
new file mode 100644
index 0000000000..7d56770311
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Greetings
+Bundle-SymbolicName: passbyref.helloworld.Greetings
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework
+Export-Package: helloworld
+Bundle-Activator: helloworld.OSGiGreetingsImpl
+
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
new file mode 100644
index 0000000000..321bdc713f
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: StockQuote
+Bundle-SymbolicName: stockquote.ManagedStockQuoteFactory
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework, org.osgi.service.cm
+Export-Package: stockquote
+Bundle-Activator: stockquote.OSGiManagedStockQuoteFactoryImpl
+
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
new file mode 100644
index 0000000000..66f98011cb
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: StockQuote
+Bundle-SymbolicName: stockquote.StockQuote
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework, org.osgi.service.cm
+Export-Package: stockquote
+Bundle-Activator: stockquote.OSGiStockQuoteImpl
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
new file mode 100644
index 0000000000..6874a66db9
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: StockQuote
+Bundle-SymbolicName: stockquote.StockQuoteFactory
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework, org.osgi.service.cm
+Export-Package: stockquote
+Bundle-Activator: stockquote.OSGiStockQuoteFactoryImpl
+
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
new file mode 100644
index 0000000000..47d290eb1a
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: StockQuote
+Bundle-SymbolicName: ds.stockquote.StockQuote
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework, org.osgi.service.component, org.osgi.service.cm
+Export-Package: stockquote
+Service-Component: osgi/properties/ds/StockQuote.xml
+
+
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
new file mode 100644
index 0000000000..c7f13a50a7
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="StockQuoteComponent" immediate="true">
+    <implementation class="stockquote.OSGiStockQuoteComponentImpl" />
+    <service>
+         <provide interface="stockquote.StockQuote"/>
+    </service>
+    <property name="currency">GBP</property>
+    <property name="exchangeRate" type="Double">1.0</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
new file mode 100644
index 0000000000..f4c102c4f0
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: StockQuote
+Bundle-SymbolicName: ds.stockquote.StockQuoteFactory
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework, org.osgi.service.component, org.osgi.service.cm
+Export-Package: stockquote
+Service-Component: osgi/properties/ds/StockQuoteFactory.xml
+
+
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
new file mode 100644
index 0000000000..cbebf7eec2
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="StockQuoteComponent" >
+    <implementation class="stockquote.OSGiStockQuoteComponentImpl" />
+    <service servicefactory="true" >
+         <provide interface="stockquote.StockQuote" />
+    </service>
+    <property name="currency">GBP</property>
+    <property name="exchangeRate" type="Double">1.0</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
new file mode 100644
index 0000000000..6a3c845cca
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: HelloWorldClient
+Bundle-SymbolicName: ds.helloworld.sdo.HelloWorldClient
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework, org.osgi.service.component, 
+ org.osoa.sca, org.osoa.sca.annotations,
+ commonj.sdo, commonj.sdo.helper, 
+ org.apache.tuscany.sdo.helper, org.apache.tuscany.sdo.impl, org.apache.tuscany.sdo.model, org.apache.tuscany.sdo.model.impl,
+ org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl,
+ helloworld.sdo
+Export-Package: helloworld.sdo.client
+Service-Component: osgi/sdo/ds/HelloWorldClient.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
new file mode 100644
index 0000000000..cb6345432f
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="HelloWorldClientComponent" immediate="true">
+    <implementation class="helloworld.sdo.client.HelloWorldClientComponent" />
+    <service>
+         <provide interface="helloworld.sdo.client.HelloWorldClient"/>
+    </service>
+    <reference 
+        name="helloWorldService"
+        interface="helloworld.sdo.HelloWorldService" 
+        bind="setHelloWorldService"
+        unbind="unsetHelloWorldService"
+        target="(component.service.name=JavaHelloWorldServiceComponent/HelloWorldService)"
+        policy="dynamic"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
new file mode 100644
index 0000000000..89871fa8f6
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: HelloWorldService
+Bundle-SymbolicName: ds.helloworld.sdo.HelloWorldService
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework, org.osgi.service.component,
+ org.osoa.sca, org.osoa.sca.annotations,
+ commonj.sdo, commonj.sdo.helper, 
+ org.apache.tuscany.sdo.helper, org.apache.tuscany.sdo.impl, org.apache.tuscany.sdo.model, org.apache.tuscany.sdo.model.impl,
+ org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl
+Export-Package: helloworld.sdo
+Service-Component: osgi/sdo/ds/HelloWorldService.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
new file mode 100644
index 0000000000..d968d1ffc5
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="HelloWorldServiceComponent" immediate="true">
+    <implementation class="helloworld.sdo.HelloWorldServiceComponent" />
+    <service>
+         <provide interface="helloworld.sdo.HelloWorldService"/>
+    </service>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
new file mode 100644
index 0000000000..fc762df8d5
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Customer
+Bundle-SymbolicName: services.supplychain.customer.Customer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.retailer
+Export-Package: supplychain.customer
+Bundle-Activator: supplychain.customer.OSGiCustomerImpl
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
new file mode 100644
index 0000000000..02e42bc010
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Retailer
+Bundle-SymbolicName: services.supplychain.retailer.Retailer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.warehouse
+Export-Package: supplychain.retailer
+Bundle-Activator: supplychain.retailer.OSGiRetailerImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
new file mode 100644
index 0000000000..390367b99b
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shipper
+Bundle-SymbolicName: services.supplychain.shipper.Shipper
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.customer
+Export-Package: supplychain.shipper
+Bundle-Activator: supplychain.shipper.OSGiShipperImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
new file mode 100644
index 0000000000..4715cbd976
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Warehouse
+Bundle-SymbolicName: services.supplychain.warehouse.Warehouse
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.shipper
+Export-Package: supplychain.warehouse
+Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
new file mode 100644
index 0000000000..932fb8a483
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Customer
+Bundle-SymbolicName: ds.services.supplychain.customer.Customer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component, supplychain.retailer
+Export-Package: supplychain.customer
+Service-Component: osgi/services/ds/Customer.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
new file mode 100644
index 0000000000..b10d0416dc
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="CustomerComponent" immediate="true">
+    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
+    <service>
+         <provide interface="supplychain.customer.Customer"/>
+    </service>
+    <reference 
+        name="retailer1"
+        interface="supplychain.retailer.Retailer" 
+        bind="setRetailer1"
+        unbind="unsetRetailer1"
+        target="(retailerName=amazon.com)"
+        policy="dynamic"
+    />
+    <reference 
+        name="retailer2"
+        interface="supplychain.retailer.Retailer" 
+        bind="setRetailer2"
+        unbind="unsetRetailer2"
+        target="(retailerName=play.com)"
+        policy="dynamic"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
new file mode 100644
index 0000000000..c799f31606
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Retailer
+Bundle-SymbolicName: ds.services.supplychain.retailer.Retailer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component,
+ supplychain.warehouse
+Export-Package: supplychain.retailer
+Service-Component: osgi/services/ds/Retailer1.xml, osgi/services/ds/Retailer2.xml 
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
new file mode 100644
index 0000000000..db68d7e333
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="RetailerComponent1" immediate="true" >
+    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
+    <service>
+         <provide interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference 
+        name="supplychain.warehouse.Warehouse" 
+        interface="supplychain.warehouse.Warehouse" 
+        bind="setWarehouse"
+        unbind="unsetWarehouse"
+    />
+    <property name="retailerName">amazon.com</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
new file mode 100644
index 0000000000..1aea3cf669
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="RetailerComponent2" immediate="true" >
+    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
+    <service>
+         <provide interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference 
+        name="supplychain.warehouse.Warehouse" 
+        interface="supplychain.warehouse.Warehouse" 
+        bind="setWarehouse"
+        unbind="unsetWarehouse"
+    />
+    <property name="retailerName">play.com</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
new file mode 100644
index 0000000000..106bd1b6aa
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shipper
+Bundle-SymbolicName: ds.services.supplychain.shipper.Shipper
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component, supplychain.customer
+Export-Package: supplychain.shipper
+Service-Component: osgi/services/ds/Shipper1.xml, osgi/services/ds/Shipper2.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
new file mode 100644
index 0000000000..1e3c915a59
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="ShipperComponent1"  immediate="true" >
+    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
+    <service>
+         <provide interface="supplychain.shipper.Shipper" />
+    </service>
+    <reference 
+        name="customer" 
+        interface="supplychain.customer.Customer" 
+        bind="setCustomer"
+        unbind="unsetCustomer"
+        cardinality="0..1"
+        policy="dynamic"
+    />
+    <property name="shipperName">RoyalMail</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
new file mode 100644
index 0000000000..d7d0b41f5e
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="ShipperComponent2"  immediate="true" >
+    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
+    <service>
+         <provide interface="supplychain.shipper.Shipper" />
+    </service>
+    <reference 
+        name="customer" 
+        interface="supplychain.customer.Customer" 
+        bind="setCustomer"
+        unbind="unsetCustomer"
+        cardinality="0..1"
+        policy="dynamic"
+    />
+    <property name="shipperName">ParcelForce</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
new file mode 100644
index 0000000000..81c51e6804
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Warehouse
+Bundle-SymbolicName: ds.services.supplychain.warehouse.Warehouse
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component,
+ supplychain.shipper
+Export-Package: supplychain.warehouse
+Service-Component: osgi/services/ds/Warehouse1.xml, osgi/services/ds/Warehouse2.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
new file mode 100644
index 0000000000..ca50b554df
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="WarehouseComponent1"  immediate="true">
+    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
+    <service>
+         <provide interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    <reference 
+        name="shipper" 
+        interface="supplychain.shipper.Shipper" 
+        bind="setShipper"
+        unbind="unsetShipper"
+        policy="dynamic"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
new file mode 100644
index 0000000000..14658127f8
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="WarehouseComponent2"  immediate="true">
+    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
+    <service>
+         <provide interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    <reference 
+        name="shipper" 
+        interface="supplychain.shipper.Shipper" 
+        bind="setShipper"
+        unbind="unsetShipper"
+        policy="dynamic"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
new file mode 100644
index 0000000000..335bc419c1
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Customer
+Bundle-SymbolicName: version.supplychain.customer.Customer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.retailer;version="[1.0.0,2.0.0)"
+Export-Package: supplychain.customer;version="1.0.0"
+Bundle-Activator: supplychain.customer.OSGiVersionedCustomerImpl
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
new file mode 100644
index 0000000000..a68b9d6dbb
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Customer
+Bundle-SymbolicName: version.supplychain.customer.Customer
+Bundle-Version: 2.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.retailer;version="[2.0.0,3.0.0)"
+Export-Package: supplychain.customer;version="2.0.0"
+Bundle-Activator: supplychain.customer.OSGiVersionedCustomerImpl
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
new file mode 100644
index 0000000000..02f79c15f3
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Retailer
+Bundle-SymbolicName: version.supplychain.retailer.Retailer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.warehouse
+Export-Package: supplychain.retailer;version="1.0.0"
+Bundle-Activator: supplychain.retailer.OSGiVersionedRetailerImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
new file mode 100644
index 0000000000..8428b08d96
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Retailer
+Bundle-SymbolicName: version.supplychain.retailer.Retailer
+Bundle-Version: 2.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.warehouse
+Export-Package: supplychain.retailer;version="2.0.0"
+Bundle-Activator: supplychain.retailer.OSGiVersionedRetailerImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
new file mode 100644
index 0000000000..c81bf00d00
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shipper
+Bundle-SymbolicName: version.supplychain.shipper.Shipper
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.customer;version="[1.0.0,2.0.0)"
+Export-Package: supplychain.shipper;version="1.0.0"
+Bundle-Activator: supplychain.shipper.OSGiVersionedShipperImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
new file mode 100644
index 0000000000..61c161617c
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shipper
+Bundle-SymbolicName: version.supplychain.shipper.Shipper
+Bundle-Version: 2.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.customer;version="[2.0.0,3.0.0)"
+Export-Package: supplychain.shipper;version="2.0.0"
+Bundle-Activator: supplychain.shipper.OSGiVersionedShipperImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
new file mode 100644
index 0000000000..fd6a26a65f
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Warehouse
+Bundle-SymbolicName: version.supplychain.warehouse.Warehouse
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.shipper;version="[1.0.0,2.0.0)"
+Export-Package: supplychain.warehouse;version="1.0.0"
+Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
new file mode 100644
index 0000000000..0168bc2435
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Warehouse
+Bundle-SymbolicName: version.supplychain.warehouse.Warehouse
+Bundle-Version: 2.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.shipper;version="2.0.0"
+Export-Package: supplychain.warehouse;version="2.0.0"
+Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
new file mode 100644
index 0000000000..6674cdd7f2
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Customer
+Bundle-SymbolicName: ds.version.supplychain.customer.Customer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component, supplychain.retailer;version="[1.0.0,2.0.0)"
+Export-Package: supplychain.customer;version="1.0.0"
+Service-Component: osgi/version/ds/CustomerV1.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
new file mode 100644
index 0000000000..72df35ef41
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Customer
+Bundle-SymbolicName: ds.version.supplychain.customer.Customer
+Bundle-Version: 2.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component, supplychain.retailer;version="[2.0.0,3.0.0)"
+Export-Package: supplychain.customer;version="2.0.0"
+Service-Component: osgi/version/ds/CustomerV2.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
new file mode 100644
index 0000000000..724c8132df
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="CustomerComponent1" immediate="true">
+    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
+    <service>
+         <provide interface="supplychain.customer.Customer"/>
+    </service>
+    <reference 
+        name="retailer1"
+        interface="supplychain.retailer.Retailer" 
+        bind="setRetailer1"
+        unbind="unsetRetailer1"
+        target="(retailerName=amazon.com)"
+        policy="dynamic"
+    />
+    <reference 
+        name="retailer2"
+        interface="supplychain.retailer.Retailer" 
+        bind="setRetailer2"
+        unbind="unsetRetailer2"
+        target="(retailerName=play.com)"
+        policy="dynamic"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
new file mode 100644
index 0000000000..1e5035d949
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="CustomerComponent2" immediate="true">
+    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
+    <service>
+         <provide interface="supplychain.customer.Customer"/>
+    </service>
+    <reference 
+        name="retailer1"
+        interface="supplychain.retailer.Retailer" 
+        bind="setRetailer1"
+        unbind="unsetRetailer1"
+        target="(retailerName=amazon.com)"
+        policy="dynamic"
+    />
+    <reference 
+        name="retailer2"
+        interface="supplychain.retailer.Retailer" 
+        bind="setRetailer2"
+        unbind="unsetRetailer2"
+        target="(retailerName=play.com)"
+        policy="dynamic"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
new file mode 100644
index 0000000000..85bfd86422
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Retailer
+Bundle-SymbolicName: ds.version.supplychain.retailer.Retailer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component,
+ supplychain.warehouse
+Export-Package: supplychain.retailer;version="1.0.0"
+Service-Component: osgi/version/ds/Retailer1V1.xml, osgi/version/ds/Retailer2V1.xml 
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
new file mode 100644
index 0000000000..6e51b3d6f2
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="RetailerComponent1.Retailer1" immediate="true" >
+    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
+    <service>
+         <provide interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference 
+        name="supplychain.warehouse.Warehouse" 
+        interface="supplychain.warehouse.Warehouse" 
+        bind="setWarehouse"
+        unbind="unsetWarehouse"
+        target="(component.service.name=WarehouseComponent1/Warehouse)"
+    />
+    <property name="retailerName">amazon.com</property>
+    <property name="version">1</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
new file mode 100644
index 0000000000..9a87758ec2
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="RetailerComponent2.Retailer1" immediate="true" >
+    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
+    <service>
+         <provide interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference 
+        name="supplychain.warehouse.Warehouse" 
+        interface="supplychain.warehouse.Warehouse" 
+        bind="setWarehouse"
+        unbind="unsetWarehouse"
+        target="(component.service.name=WarehouseComponent2/Warehouse)"
+    />
+    <property name="retailerName">amazon.com</property>
+    <property name="version">2</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
new file mode 100644
index 0000000000..e134bd1061
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Retailer
+Bundle-SymbolicName: ds.version.supplychain.retailer.Retailer
+Bundle-Version: 2.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component,
+ supplychain.warehouse
+Export-Package: supplychain.retailer;version="2.0.0"
+Service-Component: osgi/version/ds/Retailer1V2.xml, osgi/version/ds/Retailer2V2.xml 
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
new file mode 100644
index 0000000000..c19895bab1
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="RetailerComponent1.Retailer2" immediate="true" >
+    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
+    <service>
+         <provide interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference 
+        name="supplychain.warehouse.Warehouse" 
+        interface="supplychain.warehouse.Warehouse" 
+        bind="setWarehouse"
+        unbind="unsetWarehouse"
+        target="(component.service.name=WarehouseComponent1/Warehouse)"
+    />
+    <property name="retailerName">play.com</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
new file mode 100644
index 0000000000..707609d2c4
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="RetailerComponent2.Retailer2" immediate="true" >
+    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
+    <service>
+         <provide interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference 
+        name="supplychain.warehouse.Warehouse" 
+        interface="supplychain.warehouse.Warehouse" 
+        bind="setWarehouse"
+        unbind="unsetWarehouse"
+        target="(component.service.name=WarehouseComponent2/Warehouse)"
+    />
+    <property name="retailerName">play.com</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
new file mode 100644
index 0000000000..e084e5831a
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shipper
+Bundle-SymbolicName: ds.version.supplychain.shipper.Shipper
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component, supplychain.customer;version="[1.0.0,2.0.0)"
+Export-Package: supplychain.shipper;version="1.0.0"
+Service-Component: osgi/version/ds/Shipper1V1.xml, osgi/version/ds/Shipper2V1.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
new file mode 100644
index 0000000000..d96f6481fb
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="ShipperComponent1.ShipperService1"  immediate="true" >
+    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
+    <service>
+         <provide interface="supplychain.shipper.Shipper" />
+    </service>
+    <reference 
+        name="customer" 
+        interface="supplychain.customer.Customer" 
+        bind="setCustomer"
+        unbind="unsetCustomer"
+        cardinality="0..1"
+        policy="dynamic"
+        target="(component.name=CustomerComponent1)"
+    />
+    <property name="shipperName">RoyalMail</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
new file mode 100644
index 0000000000..10ef690c9b
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="ShipperComponent2.ShipperService1"  immediate="true" >
+    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
+    <service>
+         <provide interface="supplychain.shipper.Shipper" />
+    </service>
+    <reference 
+        name="customer" 
+        interface="supplychain.customer.Customer" 
+        bind="setCustomer"
+        unbind="unsetCustomer"
+        cardinality="0..1"
+        policy="dynamic"
+        target="(component.name=CustomerComponent2)"
+    />
+    <property name="shipperName">RoyalMail</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
new file mode 100644
index 0000000000..003f9dca5a
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shipper
+Bundle-SymbolicName: ds.version.supplychain.shipper.Shipper
+Bundle-Version: 2.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component, supplychain.customer;version="[2.0.0,3.0.0)"
+Export-Package: supplychain.shipper;version="2.0.0"
+Service-Component: osgi/version/ds/Shipper1V2.xml, osgi/version/ds/Shipper2V2.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
new file mode 100644
index 0000000000..fefdea106d
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="ShipperComponent1.ShipperService2"  immediate="true" >
+    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
+    <service>
+         <provide interface="supplychain.shipper.Shipper" />
+    </service>
+    <reference 
+        name="customer" 
+        interface="supplychain.customer.Customer" 
+        bind="setCustomer"
+        unbind="unsetCustomer"
+        cardinality="0..1"
+        policy="dynamic"
+        target="(component.name=CustomerComponent1)"
+    />
+    <property name="shipperName">ParcelForce</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
new file mode 100644
index 0000000000..f6b847ed59
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="ShipperComponent2.ShipperService2"  immediate="true" >
+    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
+    <service>
+         <provide interface="supplychain.shipper.Shipper" />
+    </service>
+    <reference 
+        name="customer" 
+        interface="supplychain.customer.Customer" 
+        bind="setCustomer"
+        unbind="unsetCustomer"
+        cardinality="0..1"
+        policy="dynamic"
+        target="(component.name=CustomerComponent2)"
+    />
+    <property name="shipperName">ParcelForce</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
new file mode 100644
index 0000000000..5cff2f573e
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Warehouse
+Bundle-SymbolicName: ds.version.supplychain.warehouse.Warehouse
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component,
+ supplychain.shipper;version="[1.0.0,2.0.0)"
+Export-Package: supplychain.warehouse;version="1.0.0"
+Service-Component: osgi/version/ds/Warehouse1V1.xml, osgi/version/ds/Warehouse2V2.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
new file mode 100644
index 0000000000..ca50b554df
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="WarehouseComponent1"  immediate="true">
+    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
+    <service>
+         <provide interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    <reference 
+        name="shipper" 
+        interface="supplychain.shipper.Shipper" 
+        bind="setShipper"
+        unbind="unsetShipper"
+        policy="dynamic"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
new file mode 100644
index 0000000000..14658127f8
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="WarehouseComponent2"  immediate="true">
+    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
+    <service>
+         <provide interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    <reference 
+        name="shipper" 
+        interface="supplychain.shipper.Shipper" 
+        bind="setShipper"
+        unbind="unsetShipper"
+        policy="dynamic"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
new file mode 100644
index 0000000000..0fec68a725
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Warehouse
+Bundle-SymbolicName: ds.version.supplychain.warehouse.Warehouse
+Bundle-Version: 2.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component,
+ supplychain.shipper;version="[2.0.0,3.0.0)"
+Export-Package: supplychain.warehouse;version="2.0.0"
+Service-Component: osgi/version/ds/Warehouse1V1.xml, osgi/version/ds/Warehouse2V2.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
new file mode 100644
index 0000000000..ca50b554df
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="WarehouseComponent1"  immediate="true">
+    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
+    <service>
+         <provide interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    <reference 
+        name="shipper" 
+        interface="supplychain.shipper.Shipper" 
+        bind="setShipper"
+        unbind="unsetShipper"
+        policy="dynamic"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
new file mode 100644
index 0000000000..14658127f8
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="WarehouseComponent2"  immediate="true">
+    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
+    <service>
+         <provide interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    <reference 
+        name="shipper" 
+        interface="supplychain.shipper.Shipper" 
+        bind="setShipper"
+        unbind="unsetShipper"
+        policy="dynamic"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
new file mode 100644
index 0000000000..678014d48d
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Customer
+Bundle-SymbolicName: wiring.supplychain.customer.Customer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.retailer
+Export-Package: supplychain.customer
+Bundle-Activator: supplychain.customer.OSGiCustomerImpl
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
new file mode 100644
index 0000000000..f0090fb52b
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Retailer
+Bundle-SymbolicName: wiring.supplychain.retailer.Retailer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.warehouse
+Export-Package: supplychain.retailer
+Bundle-Activator: supplychain.retailer.OSGiRetailerImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
new file mode 100644
index 0000000000..0b50923a05
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shipper
+Bundle-SymbolicName: wiring.supplychain.shipper.Shipper
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.customer
+Export-Package: supplychain.shipper
+Bundle-Activator: supplychain.shipper.OSGiShipperImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
new file mode 100644
index 0000000000..1000a5f974
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Warehouse
+Bundle-SymbolicName: wiring.supplychain.warehouse.Warehouse
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ supplychain.shipper
+Export-Package: supplychain.warehouse
+Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
new file mode 100644
index 0000000000..4e392a9ff1
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Customer
+Bundle-SymbolicName: ds.wiring.supplychain.customer.Customer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component, supplychain.retailer
+Export-Package: supplychain.customer
+Service-Component: osgi/wiring/ds/Customer.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
new file mode 100644
index 0000000000..b10d0416dc
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="CustomerComponent" immediate="true">
+    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
+    <service>
+         <provide interface="supplychain.customer.Customer"/>
+    </service>
+    <reference 
+        name="retailer1"
+        interface="supplychain.retailer.Retailer" 
+        bind="setRetailer1"
+        unbind="unsetRetailer1"
+        target="(retailerName=amazon.com)"
+        policy="dynamic"
+    />
+    <reference 
+        name="retailer2"
+        interface="supplychain.retailer.Retailer" 
+        bind="setRetailer2"
+        unbind="unsetRetailer2"
+        target="(retailerName=play.com)"
+        policy="dynamic"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
new file mode 100644
index 0000000000..788ec4f19a
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Retailer
+Bundle-SymbolicName: ds.wiring.supplychain.retailer.Retailer
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component,
+ supplychain.warehouse
+Export-Package: supplychain.retailer
+Service-Component: osgi/wiring/ds/Retailer1.xml, osgi/wiring/ds/Retailer2.xml 
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
new file mode 100644
index 0000000000..1ba16d0693
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="RetailerComponent1" immediate="true" >
+    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
+    <service>
+         <provide interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference 
+        name="supplychain.warehouse.Warehouse" 
+        interface="supplychain.warehouse.Warehouse" 
+        bind="setWarehouse"
+        unbind="unsetWarehouse"
+        target="(component.service.name=WarehouseComponent1/Warehouse)"
+    />
+    <property name="retailerName">amazon.com</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
new file mode 100644
index 0000000000..a55ebd02a8
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="RetailerComponent2" immediate="true" >
+    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
+    <service>
+         <provide interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference 
+        name="supplychain.warehouse.Warehouse" 
+        interface="supplychain.warehouse.Warehouse" 
+        bind="setWarehouse"
+        unbind="unsetWarehouse"
+        target="(component.service.name=WarehouseComponent1/Warehouse)"
+    />
+    <property name="retailerName">play.com</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
new file mode 100644
index 0000000000..e7459360e6
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shipper
+Bundle-SymbolicName: ds.wiring.supplychain.shipper.Shipper
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component, supplychain.customer
+Export-Package: supplychain.shipper
+Service-Component: osgi/wiring/ds/Shipper1.xml, osgi/wiring/ds/Shipper2.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
new file mode 100644
index 0000000000..d518ecab62
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="ShipperComponent1"  immediate="true" >
+    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
+    <service>
+         <provide interface="supplychain.shipper.Shipper" />
+    </service>
+    <reference 
+        name="customer" 
+        interface="supplychain.customer.Customer" 
+        bind="setCustomer"
+        unbind="unsetCustomer"
+        cardinality="0..1"
+        target="(component.service.name=CustomerComponent/Customer)"
+        policy="dynamic"
+    />
+    <property name="shipperName">RoyalMail</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
new file mode 100644
index 0000000000..d7d0b41f5e
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="ShipperComponent2"  immediate="true" >
+    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
+    <service>
+         <provide interface="supplychain.shipper.Shipper" />
+    </service>
+    <reference 
+        name="customer" 
+        interface="supplychain.customer.Customer" 
+        bind="setCustomer"
+        unbind="unsetCustomer"
+        cardinality="0..1"
+        policy="dynamic"
+    />
+    <property name="shipperName">ParcelForce</property>
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
new file mode 100644
index 0000000000..880304187b
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Warehouse
+Bundle-SymbolicName: ds.wiring.supplychain.warehouse.Warehouse
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component,
+ supplychain.shipper
+Export-Package: supplychain.warehouse
+Service-Component: osgi/wiring/ds/Warehouse1.xml, osgi/wiring/ds/Warehouse2.xml
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
new file mode 100644
index 0000000000..d72db04425
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="WarehouseComponent1"  immediate="true">
+    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
+    <service>
+         <provide interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    <reference 
+        name="shipper" 
+        interface="supplychain.shipper.Shipper" 
+        bind="setShipper"
+        unbind="unsetShipper"
+        policy="dynamic"
+        target="(shipperName=ParcelForce)"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
new file mode 100644
index 0000000000..f9c1218f82
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<component name="WarehouseComponent2"  immediate="true">
+    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
+    <service>
+         <provide interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    <reference 
+        name="shipper" 
+        interface="supplychain.shipper.Shipper" 
+        bind="setShipper"
+        unbind="unsetShipper"
+        policy="dynamic"
+        target="(shipperName=RoyalMail)"
+    />
+</component>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
new file mode 100644
index 0000000000..d8e4c1cb7e
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: HelloWorld
+Bundle-SymbolicName: helloworld.HelloWorld
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Import-Package: org.osgi.framework,
+ org.osgi.service.component ,
+ helloworld.ws
+Export-Package: helloworld
+Bundle-Activator: helloworld.OSGiHelloWorldImpl
+
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
new file mode 100644
index 0000000000..a6de268bf6
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Greetings">
+        <interface.java interface="helloworld.Greetings"/>
+    </service>
+    
+    
+    <reference name="greetingsService" >
+        <interface.java interface="helloworld.Greetings" />
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
new file mode 100644
index 0000000000..660e277693
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           name="HelloWorld">
+
+    <component name="JavaGreetingsComponent">
+        <implementation.java class="helloworld.JavaGreetingsComponent"/>
+        
+        <reference name="greetingsService" target="OSGiGreetingsComponent" />
+    </component>
+
+    <component name="OSGiGreetingsComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="passbyref.helloworld.Greetings"
+            classes="helloworld.OSGiGreetingsImpl"
+        />
+        <reference name="greetingsService" target="JavaGreetingsComponent" />
+    </component>
+
+    
+
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
new file mode 100644
index 0000000000..5e0965d047
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="StockQuoteService">
+        <interface.java interface="stockquote.StockQuote"/>
+    </service>
+    
+    <property name="currency" type="xsd:string" >GBP</property> 
+    <property name="exchangeRate" type="xsd:double" >1.0</property> 
+    
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
new file mode 100644
index 0000000000..5e0965d047
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="StockQuoteService">
+        <interface.java interface="stockquote.StockQuote"/>
+    </service>
+    
+    <property name="currency" type="xsd:string" >GBP</property> 
+    <property name="exchangeRate" type="xsd:double" >1.0</property> 
+    
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
new file mode 100644
index 0000000000..5e0965d047
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="StockQuoteService">
+        <interface.java interface="stockquote.StockQuote"/>
+    </service>
+    
+    <property name="currency" type="xsd:string" >GBP</property> 
+    <property name="exchangeRate" type="xsd:double" >1.0</property> 
+    
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
new file mode 100644
index 0000000000..5e0965d047
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="StockQuoteService">
+        <interface.java interface="stockquote.StockQuote"/>
+    </service>
+    
+    <property name="currency" type="xsd:string" >GBP</property> 
+    <property name="exchangeRate" type="xsd:double" >1.0</property> 
+    
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
new file mode 100644
index 0000000000..02ae93aec2
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+           name="StockQuoteComposite">
+
+    <component name="StockQuoteComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.stockquote.StockQuote"
+            classes="stockquote.OSGiStockQuoteComponentImpl">
+            
+            <properties service="StockQuoteService">
+                <property name="service.pid">stockQuote</property>
+            </properties>
+        </implementation.osgi>
+        
+        <property name="currency" type="xsd:string" >USD</property> 
+        <property name="exchangeRate" type="xsd:double" >2.0</property> 
+            
+    </component>
+
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
new file mode 100644
index 0000000000..c94504f07d
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+           name="StockQuoteComposite">
+
+    <component name="USDStockQuoteComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.stockquote.StockQuoteFactory"
+            classes="stockquote.OSGiStockQuoteComponentImpl">
+            
+            <properties service="StockQuoteService">
+                <property name="service.pid">stockQuote</property>
+            </properties>
+        </implementation.osgi>
+        
+        <property name="currency" type="xsd:string" >USD</property> 
+        <property name="exchangeRate" type="xsd:double" >2.0</property> 
+            
+    </component>
+    
+     <component name="EUROStockQuoteComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.stockquote.StockQuoteFactory"
+            classes="stockquote.OSGiStockQuoteComponentImpl">
+            
+            <properties service="StockQuoteService">
+                <property name="service.pid">stockQuote</property>
+            </properties>
+        </implementation.osgi>
+        
+        <property name="currency" type="xsd:string" >EURO</property> 
+        <property name="exchangeRate" type="xsd:double" >1.48</property> 
+            
+    </component>
+
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
new file mode 100644
index 0000000000..fea03404fd
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+           name="StockQuoteComposite">
+
+    <component name="StockQuoteComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="stockquote.StockQuote"
+            classes="stockquote.OSGiStockQuoteImpl">
+            
+            <properties service="StockQuoteService">
+                <property name="service.pid">stockQuote</property>
+            </properties>
+        </implementation.osgi>
+        
+        <property name="currency" type="xsd:string" >USD</property> 
+        <property name="exchangeRate" type="xsd:double" >2.0</property> 
+            
+    </component>
+
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
new file mode 100644
index 0000000000..3c425fcbc9
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+           name="StockQuoteComposite">
+
+    <component name="USDStockQuoteComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="stockquote.StockQuoteFactory"
+            classes="stockquote.OSGiStockQuoteImpl">
+            
+        </implementation.osgi>
+       
+        
+        <property name="currency" type="xsd:string" >USD</property> 
+        <property name="exchangeRate" type="xsd:double" >2.0</property> 
+            
+    </component>
+    
+    <component name="EUROStockQuoteComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="stockquote.StockQuoteFactory"
+            classes="stockquote.OSGiStockQuoteImpl">
+            
+        </implementation.osgi>
+        
+        
+        <property name="currency" type="xsd:string" >EURO</property> 
+        <property name="exchangeRate" type="xsd:double" >1.48</property> 
+            
+    </component>
+
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
new file mode 100644
index 0000000000..f6c04de980
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    
+    <service name="HelloWorldClient">
+        <interface.java interface="helloworld.sdo.client.HelloWorldClient"/>
+    </service>
+        
+    <reference name="helloWorldService" >
+        <interface.java interface="helloworld.sdo.HelloWorldService" />
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
new file mode 100644
index 0000000000..87918132e6
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="HelloWorldService">
+        <interface.java interface="helloworld.sdo.HelloWorldService"/>
+    </service>
+    
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..9b00787162
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	          targetNamespace="http://helloworld"
+              xmlns:helloworld="http://helloworld">
+   <deployable composite="helloworld:helloworldsdo"/>
+   
+   <import.java package="helloworld.sdo"/>
+</contribution>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
new file mode 100644
index 0000000000..2ecc0bea43
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">
+
+    <wsdl:types>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld"
+            xmlns="http://www.w3.org/2001/XMLSchema">
+
+            <element name="getGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="name" type="tns:Name" />
+                    </sequence>
+                </complexType>
+            </element>
+
+            <element name="getGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getGreetingsReturn" type="xsd:string" />
+                    </sequence>
+                </complexType>
+            </element>
+
+            <complexType name="Name">
+                <sequence>
+                    <element name="first" type="xsd:string" />
+                    <element name="last" type="xsd:string" />
+                </sequence>
+            </complexType>
+
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="getGreetingsRequest">
+        <wsdl:part element="tns:getGreetings" name="parameters" />
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+        <wsdl:part element="tns:getGreetingsResponse" name="parameters" />
+    </wsdl:message>
+
+    <wsdl:portType name="HelloWorld">
+        <wsdl:operation name="getGreetings">
+            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest" />
+            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse" />
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="getGreetings">
+            <wsdlsoap:operation soapAction="" />
+            <wsdl:input name="getGreetingsRequest">
+                <wsdlsoap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output name="getGreetingsResponse">
+                <wsdlsoap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldService">
+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://localhost:8085/HelloWorldService" />
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
new file mode 100644
index 0000000000..af79dc4bdf
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://helloworld"
+    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:hw="http://helloworld"
+    name="helloworldsdo">
+    
+    <component name="JavaHelloWorldServiceComponent">
+        <implementation.java class="helloworld.sdo.HelloWorldServiceComponent" />
+    </component>
+    
+    <component name="JavaHelloWorldClientComponent">
+        <implementation.java class="helloworld.sdo.client.HelloWorldClientComponent" />
+        <reference name="helloWorldService" target="OSGiHelloWorldServiceComponent" />
+    </component>
+    
+    <component name="OSGiHelloWorldServiceComponent">       
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.helloworld.sdo.HelloWorldService"
+        />
+    </component>
+    
+    <component name="OSGiHelloWorldClientComponent">       
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.helloworld.sdo.HelloWorldClient"
+        />
+        
+        <reference name="helloWorldService" target="JavaHelloWorldServiceComponent" />
+    </component>
+
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Customer.componentType
new file mode 100644
index 0000000000..7bcdc6a2bb
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Customer.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="CustomerService">
+        <interface.java interface="supplychain.customer.Customer"/>
+    </service>
+    <reference name="retailer1">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer2">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer3">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
new file mode 100644
index 0000000000..eadb539ea5
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="RetailerService1">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerService2">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerService3">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference name="warehouse">
+            <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
new file mode 100644
index 0000000000..532293b03f
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="ShipperService1">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <service name="ShipperService2">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <reference name="customer">
+            <interface.java interface="supplychain.customer.Customer"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Warehouse">
+        <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    
+    <reference name="shipper">
+            <interface.java interface="supplychain.shipper.Shipper"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
new file mode 100644
index 0000000000..7bcdc6a2bb
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="CustomerService">
+        <interface.java interface="supplychain.customer.Customer"/>
+    </service>
+    <reference name="retailer1">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer2">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer3">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
new file mode 100644
index 0000000000..eadb539ea5
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="RetailerService1">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerService2">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerService3">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference name="warehouse">
+            <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
new file mode 100644
index 0000000000..532293b03f
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="ShipperService1">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <service name="ShipperService2">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <reference name="customer">
+            <interface.java interface="supplychain.customer.Customer"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Warehouse">
+        <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    
+    <reference name="shipper">
+            <interface.java interface="supplychain.shipper.Shipper"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
new file mode 100644
index 0000000000..c144a1bc18
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://supplychain"
+    xmlns:sp="http://supplychain"
+    name="supplychain">
+
+    <component name="CustomerComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.services.supplychain.customer.Customer" >
+            
+            <properties reference="retailer1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="retailer2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties reference="retailer3">
+                <property name="retailerName">ebay.com</property>
+            </properties>            
+            
+        </implementation.osgi>
+        
+        <reference name="retailer1" target="RetailerComponent/RetailerService1"/>
+        
+        <reference name="retailer2" target="RetailerComponent/RetailerService2" />
+        
+        <reference name="retailer3" target="RetailerComponent/RetailerService3" />
+    </component>
+    
+    <component name="RetailerComponent">
+        <!-- implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" -->
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.services.supplychain.retailer.Retailer" >
+            <properties service="RetailerService1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties service="RetailerService2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties service="RetailerService3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>    
+    </component>
+    
+    <component name="WarehouseComponent1">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent/ShipperService2"  />
+    </component>
+    
+
+    <component name="ShipperComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.services.supplychain.shipper.Shipper" >
+            
+            <properties service="ShipperService1">
+                <property name="shipperName">RoyalMail</property>
+            </properties>
+            <properties service="ShipperService2">
+                <property name="shipperName">ParcelForce</property>
+            </properties>
+         </implementation.osgi>
+        <reference name="customer" target="CustomerComponent" />
+        
+    </component>
+    
+    
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/services-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/services-test.composite
new file mode 100644
index 0000000000..64f3b30f88
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/services/services-test.composite
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://supplychain"
+    xmlns:sp="http://supplychain"
+    name="supplychain">
+
+    <component name="CustomerComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="services.supplychain.customer.Customer" >
+            
+            <properties reference="retailer1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="retailer2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties reference="retailer3">
+                <property name="retailerName">ebay.com</property>
+            </properties>            
+            
+        </implementation.osgi>
+        
+        <reference name="retailer1" target="RetailerComponent/RetailerService1"/>
+        
+        <reference name="retailer2" target="RetailerComponent/RetailerService2" />
+        
+        <reference name="retailer3" target="RetailerComponent/RetailerService3" />
+    </component>
+    
+    <component name="RetailerComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="services.supplychain.retailer.Retailer" >
+            <properties service="RetailerService1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties service="RetailerService2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties service="RetailerService3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>    
+    </component>
+    
+    <component name="WarehouseComponent1">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent/ShipperService2"  />
+    </component>
+    
+
+    <component name="ShipperComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="services.supplychain.shipper.Shipper"  >
+            
+            <properties service="ShipperService1">
+                <property name="shipperName">RoyalMail</property>
+            </properties>
+            <properties service="ShipperService2">
+                <property name="shipperName">ParcelForce</property>
+            </properties>
+         </implementation.osgi>
+        <reference name="customer" target="CustomerComponent" />
+        
+    </component>
+    
+    
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
new file mode 100644
index 0000000000..0b0aa0912b
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="StockQuoteService">
+        <interface.java interface="stockquote.StockQuote"/>
+    </service>
+    
+    <property name="currency" type="xsd:string" >GBP</property> 
+    <property name="exchangeRate" type="xsd:double" >1.0</property> 
+    
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
new file mode 100644
index 0000000000..7bcdc6a2bb
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="CustomerService">
+        <interface.java interface="supplychain.customer.Customer"/>
+    </service>
+    <reference name="retailer1">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer2">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer3">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
new file mode 100644
index 0000000000..7bcdc6a2bb
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="CustomerService">
+        <interface.java interface="supplychain.customer.Customer"/>
+    </service>
+    <reference name="retailer1">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer2">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer3">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
new file mode 100644
index 0000000000..eadb539ea5
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="RetailerService1">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerService2">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerService3">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference name="warehouse">
+            <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
new file mode 100644
index 0000000000..eadb539ea5
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="RetailerService1">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerService2">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerService3">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference name="warehouse">
+            <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
new file mode 100644
index 0000000000..532293b03f
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="ShipperService1">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <service name="ShipperService2">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <reference name="customer">
+            <interface.java interface="supplychain.customer.Customer"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
new file mode 100644
index 0000000000..532293b03f
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="ShipperService1">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <service name="ShipperService2">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <reference name="customer">
+            <interface.java interface="supplychain.customer.Customer"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Warehouse">
+        <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    
+    <reference name="shipper">
+            <interface.java interface="supplychain.shipper.Shipper"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Warehouse">
+        <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    
+    <reference name="shipper">
+            <interface.java interface="supplychain.shipper.Shipper"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
new file mode 100644
index 0000000000..7bcdc6a2bb
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="CustomerService">
+        <interface.java interface="supplychain.customer.Customer"/>
+    </service>
+    <reference name="retailer1">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer2">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer3">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
new file mode 100644
index 0000000000..7bcdc6a2bb
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="CustomerService">
+        <interface.java interface="supplychain.customer.Customer"/>
+    </service>
+    <reference name="retailer1">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer2">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer3">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
new file mode 100644
index 0000000000..eadb539ea5
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="RetailerService1">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerService2">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerService3">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference name="warehouse">
+            <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
new file mode 100644
index 0000000000..eadb539ea5
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="RetailerService1">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerService2">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <service name="RetailerService3">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference name="warehouse">
+            <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
new file mode 100644
index 0000000000..532293b03f
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="ShipperService1">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <service name="ShipperService2">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <reference name="customer">
+            <interface.java interface="supplychain.customer.Customer"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
new file mode 100644
index 0000000000..532293b03f
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="ShipperService1">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <service name="ShipperService2">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <reference name="customer">
+            <interface.java interface="supplychain.customer.Customer"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Warehouse">
+        <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    
+    <reference name="shipper">
+            <interface.java interface="supplychain.shipper.Shipper"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Warehouse">
+        <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    
+    <reference name="shipper">
+            <interface.java interface="supplychain.shipper.Shipper"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
new file mode 100644
index 0000000000..877d0de1c9
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://supplychain"
+    xmlns:sp="http://supplychain"
+    name="supplychain">
+
+    <component name="CustomerComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.version.supplychain.customer.Customer"
+                bundleVersion="1.0.0" >
+                
+            <properties service="CustomerService">
+                <property name="component.name">CustomerComponent1</property>
+            </properties>
+            
+            <properties reference="retailer1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="retailer2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties reference="retailer3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+            
+        </implementation.osgi>
+        
+        <reference name="retailer1" target="RetailerComponent1/RetailerService1"/>
+        
+        <reference name="retailer2" target="RetailerComponent1/RetailerService2" />
+        
+        <reference name="retailer3" target="RetailerComponent1/RetailerService3" />
+    </component>
+    
+    
+    
+    <component name="CustomerComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.version.supplychain.customer.Customer"
+                bundleVersion="2.0.0" >
+                
+            <properties service="CustomerService">
+                <property name="component.name">CustomerComponent2</property>
+            </properties>
+            
+            <properties reference="retailer1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="retailer2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties reference="retailer3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+            
+        </implementation.osgi>
+            
+        <reference name="retailer1" target="RetailerComponent2/RetailerService1"/>
+        
+        <reference name="retailer2" target="RetailerComponent2/RetailerService2" />
+        
+        <reference name="retailer3" target="RetailerComponent2/RetailerService3" />
+    </component>
+
+    <component name="RetailerComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.version.supplychain.retailer.Retailer"
+                bundleVersion="1.0.0" >
+            <properties service="RetailerService1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties service="RetailerService2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties service="RetailerService3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+            <properties reference="warehouse">
+                <property name="component.service.name">WarehouseComponent1/Warehouse</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>    
+    </component>
+    
+    <component name="RetailerComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.version.supplychain.retailer.Retailer"
+                bundleVersion="2.0.0" >
+            <properties service="RetailerService1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties service="RetailerService2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties service="RetailerService3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+             <properties reference="warehouse">
+                <property name="component.service.name">WarehouseComponent2/Warehouse</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="warehouse" target="WarehouseComponent2"/>
+    </component>
+
+   
+    <component name="WarehouseComponent1">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent1/ShipperService2"  />
+    </component>
+    
+    <component name="WarehouseComponent2">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent2/ShipperService2"  />
+    </component>
+
+    <component name="ShipperComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.version.supplychain.shipper.Shipper"
+                bundleVersion="1.0.0">
+            
+            <properties service="ShipperService1">
+                <property name="shipperName">RoyalMail</property>
+                <property name="component.name">ShipperComponent1.ShipperService1</property>
+            </properties>
+            <properties service="ShipperService2">
+                <property name="shipperName">ParcelForce</property>
+                <property name="component.name">ShipperComponent1.ShipperService2</property>
+            </properties>
+            <properties reference="customer">
+                <property name="component.name">CustomerComponent1</property>
+            </properties>
+         </implementation.osgi>
+         
+        <reference name="customer" target="CustomerComponent1" />
+    </component>
+    
+     <component name="ShipperComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.version.supplychain.shipper.Shipper"
+                bundleVersion="2.0.0">
+            
+            <properties service="ShipperService1">
+                <property name="shipperName">RoyalMail</property>
+                <property name="component.name">ShipperComponent2.ShipperService1</property>
+            </properties>
+            <properties service="ShipperService2">
+                <property name="shipperName">ParcelForce</property>
+                <property name="component.name">ShipperComponent2.ShipperService2</property>
+            </properties>
+            <properties reference="customer">
+                <property name="component.name">CustomerComponent2</property>
+            </properties>
+         </implementation.osgi>
+         
+        <reference name="customer" target="CustomerComponent2" />
+        
+    </component>
+    
+    
+    
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/version-test.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/version-test.composite
new file mode 100644
index 0000000000..bbb397ee70
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/version/version-test.composite
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://supplychain"
+    xmlns:sp="http://supplychain"
+    name="supplychain">
+
+    <component name="CustomerComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="version.supplychain.customer.Customer"
+                bundleVersion="1.0.0" >
+                
+            <properties reference="retailer1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="retailer2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties reference="retailer3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+            
+        </implementation.osgi>
+        
+        <reference name="retailer1" target="RetailerComponent1/RetailerService1"/>
+        
+        <reference name="retailer2" target="RetailerComponent1/RetailerService2" />
+        
+        <reference name="retailer3" target="RetailerComponent1/RetailerService3" />
+    </component>
+    
+    
+    
+    <component name="CustomerComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="version.supplychain.customer.Customer"
+                bundleVersion="2.0.0" >
+                
+            <properties reference="retailer1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="retailer2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties reference="retailer3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+            
+        </implementation.osgi>
+            
+        <reference name="retailer1" target="RetailerComponent2/RetailerService1"/>
+        
+        <reference name="retailer2" target="RetailerComponent2/RetailerService2" />
+        
+        <reference name="retailer3" target="RetailerComponent2/RetailerService3" />
+    </component>
+
+    <component name="RetailerComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="version.supplychain.retailer.Retailer"
+                bundleVersion="1.0.0" >
+            <properties service="RetailerService1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties service="RetailerService2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties service="RetailerService3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+            
+        </implementation.osgi>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>    
+    </component>
+    
+    <component name="RetailerComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="version.supplychain.retailer.Retailer"
+                bundleVersion="2.0.0"  >
+            <properties service="RetailerService1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties service="RetailerService2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties service="RetailerService3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+            <properties reference="warehouse">
+                <property name="component.service.name">WarehouseComponent2/Warehouse</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="warehouse" target="WarehouseComponent2"/>
+    </component>
+
+   
+    <component name="WarehouseComponent1">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent1/ShipperService2"  />
+    </component>
+    
+    <component name="WarehouseComponent2">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent2/ShipperService2"  />
+    </component>
+
+    <component name="ShipperComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="version.supplychain.shipper.Shipper"
+                bundleVersion="1.0.0" >
+            
+            <properties service="ShipperService1">
+                <property name="shipperName">RoyalMail</property>
+            </properties>
+            <properties service="ShipperService2">
+                <property name="shipperName">ParcelForce</property>
+            </properties>
+            <properties reference="customer">
+                <property name="component.name">CustomerComponent1</property>
+            </properties>
+         </implementation.osgi>
+         
+        <reference name="customer" target="CustomerComponent1" />
+    </component>
+    
+     <component name="ShipperComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="version.supplychain.shipper.Shipper"
+                bundleVersion="2.0.0">
+            
+            <properties service="ShipperService1">
+                <property name="shipperName">RoyalMail</property>
+            </properties>
+            <properties service="ShipperService2">
+                <property name="shipperName">ParcelForce</property>
+            </properties>
+            <properties reference="customer">
+                <property name="component.name">CustomerComponent2</property>
+            </properties>
+         </implementation.osgi>
+         
+        <reference name="customer" target="CustomerComponent2" />
+        
+    </component>
+    
+    
+    
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
new file mode 100644
index 0000000000..1fd551be3b
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Customer">
+        <interface.java interface="supplychain.customer.Customer"/>
+    </service>
+    <reference name="retailer1">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer2">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer3">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
new file mode 100644
index 0000000000..5599c44bc3
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="Retailer">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference name="warehouse">
+            <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </reference>
+    <property name="retailerName" type="xsd:string" >default</property> 
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
new file mode 100644
index 0000000000..8743f8c145
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="Shipper">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <reference name="customer">
+            <interface.java interface="supplychain.customer.Customer"/>
+    </reference>
+    <property name="shipperName" type="xsd:string" >default</property> 
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Warehouse">
+        <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    
+    <reference name="shipper">
+            <interface.java interface="supplychain.shipper.Shipper"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
new file mode 100644
index 0000000000..1fd551be3b
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Customer">
+        <interface.java interface="supplychain.customer.Customer"/>
+    </service>
+    <reference name="retailer1">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer2">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+    <reference name="retailer3">
+            <interface.java interface="supplychain.retailer.Retailer"/>
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
new file mode 100644
index 0000000000..5599c44bc3
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="Retailer">
+        <interface.java interface="supplychain.retailer.Retailer"/>
+    </service>
+    <reference name="warehouse">
+            <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </reference>
+    <property name="retailerName" type="xsd:string" >default</property> 
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
new file mode 100644
index 0000000000..8743f8c145
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <service name="Shipper">
+        <interface.java interface="supplychain.shipper.Shipper"/>
+    </service>
+    <reference name="customer">
+            <interface.java interface="supplychain.customer.Customer"/>
+    </reference>
+    <property name="shipperName" type="xsd:string" >default</property> 
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="Warehouse">
+        <interface.java interface="supplychain.warehouse.Warehouse"/>
+    </service>
+    
+    <reference name="shipper">
+            <interface.java interface="supplychain.shipper.Shipper"/>
+    </reference>
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
new file mode 100644
index 0000000000..617200d8dd
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://supplychain"
+    xmlns:sp="http://supplychain"
+    name="supplychain">
+
+    <component name="CustomerComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.wiring.supplychain.customer.Customer" >
+            
+            <properties reference="retailer1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="retailer2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties reference="retailer3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+        </implementation.osgi>
+            
+        <reference name="retailer1" target="RetailerComponent1/Retailer" />
+        
+        <reference name="retailer2" target="RetailerComponent2/Retailer" />
+        
+        <reference name="retailer3" target="RetailerComponent3" />
+    </component>
+
+    <component name="RetailerComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >
+            <properties service="Retailer">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="warehouse">
+                <property name="component.name">WarehouseComponent1</property>
+            </properties>
+        </implementation.osgi>
+        <service name="Retailer"/>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>        
+        <property name="retailerName" type="xsd:string" >amazon.com</property> 
+    </component>
+    
+    <component name="RetailerComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >
+            <properties service="Retailer">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties reference="warehouse">
+                <property name="component.name">WarehouseComponent1</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>
+        <property name="retailerName" type="xsd:string" >play.com</property> 
+    </component>
+    
+    
+    <component name="RetailerComponent3">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >
+            <properties service="Retailer">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+            <properties reference="warehouse">
+                <property name="component.name">WarehouseComponent2</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="warehouse" target="WarehouseComponent2"/>
+        <property name="retailerName" type="xsd:string" >play.com</property> 
+    </component>
+
+
+    <component name="WarehouseComponent1">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent2"  />
+    </component>
+    
+    <component name="WarehouseComponent2">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent1"  />
+    </component>
+
+    <component name="ShipperComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper" >
+            
+            <properties service="Shipper">
+                <property name="component.name">ShipperComponent1</property>
+                <property name="shipperName">RoyalMail</property>
+            </properties>
+        </implementation.osgi>
+        <reference name="customer" target="CustomerComponent" />
+        <property name="shipperName" type="xsd:string" >RoyalMail</property> 
+    </component>
+    
+     <component name="ShipperComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper"  >
+            
+            <properties service="Shipper">
+                <property name="component.name">ShipperComponent2</property>
+                <property name="shipperName">ParcelForce</property>
+            </properties>
+        </implementation.osgi>
+        <reference name="customer" target="CustomerComponent" />
+        <property name="shipperName" type="xsd:string" >ParcelForce</property> 
+        
+    </component>
+    
+    
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
new file mode 100644
index 0000000000..213cde2c1d
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://supplychain"
+    xmlns:sp="http://supplychain"
+    name="supplychain">
+
+    <component name="CustomerComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.wiring.supplychain.customer.Customer" >
+            
+            <properties reference="retailer1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="retailer2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties reference="retailer3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+        </implementation.osgi>
+            
+        <reference name="retailer1" target="RetailerComponent1/Retailer" />
+        
+        <reference name="retailer2" target="RetailerComponent2/Retailer" />
+        
+        <reference name="retailer3" target="RetailerComponent3/Retailer" />
+    </component>
+
+    <component name="RetailerComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >
+            <properties service="Retailer">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="warehouse">
+                <property name="component.name">WarehouseComponent1</property>
+            </properties>
+        </implementation.osgi>
+        <service name="Retailer"/>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>        
+        <property name="retailerName" type="xsd:string" >amazon.com</property> 
+    </component>
+    
+    <component name="RetailerComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >
+            
+            <properties service="Retailer">
+                <property name="retailerName">play.com</property>
+            </properties>
+            
+            <properties reference="warehouse">
+                <property name="component.name">WarehouseComponent1</property>
+            </properties>
+        </implementation.osgi>
+        <reference name="warehouse" target="WarehouseComponent1"/>
+        <property name="retailerName" type="xsd:string" >play.com</property> 
+    </component>
+    
+    <component name="RetailerComponent3">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >
+            
+            <properties service="Retailer">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+            <properties reference="warehouse">
+                <property name="component.name">WarehouseComponent1</property>
+            </properties>
+        </implementation.osgi>
+        <reference name="warehouse" target="WarehouseComponent1"/>
+        <property name="retailerName" type="xsd:string" >ebay.com</property> 
+    </component>
+    
+    <component name="WarehouseComponent1">
+        
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.wiring.supplychain.warehouse.Warehouse" >
+                
+            <properties reference="shipper">
+                <property name="shipperName">ParcelForce</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="shipper" target="ShipperComponent2"  />
+    </component>
+
+
+    <component name="WarehouseComponent2">
+        
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="ds.wiring.supplychain.warehouse.Warehouse" >
+                
+            <properties reference="shipper">
+                <property name="shipperName">RoyalMail</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="shipper" target="ShipperComponent1"  />
+    </component>
+    
+   
+    <component name="ShipperComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper">
+            
+            <properties service="Shipper">
+                <property name="shipperName">RoyalMail</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="customer" target="CustomerComponent" />
+        <property name="shipperName" type="xsd:string" >RoyalMail</property> 
+    </component>
+    
+     <component name="ShipperComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper">
+            
+            <properties service="Shipper">
+                <property name="shipperName">ParcelForce</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="customer" target="CustomerComponent" />
+        <property name="shipperName" type="xsd:string" >ParcelForce</property> 
+        
+    </component>
+    
+    
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
new file mode 100644
index 0000000000..0dca0da75e
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://supplychain"
+    xmlns:sp="http://supplychain"
+    name="supplychain">
+
+    <component name="CustomerComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="wiring.supplychain.customer.Customer"
+                classes="supplychain.customer.OSGiCustomerImpl" >
+            
+            <properties reference="retailer1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="retailer2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties reference="retailer3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+        </implementation.osgi>
+            
+        <reference name="retailer1" target="RetailerComponent1/Retailer" />
+        
+        <reference name="retailer2" target="RetailerComponent2/Retailer" />
+        
+        <reference name="retailer3" target="RetailerComponent3/Retailer" />
+    </component>
+
+    <component name="RetailerComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >
+            <properties service="Retailer">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>        
+        <property name="retailerName" type="xsd:string" >amazon.com</property> 
+    </component>
+    
+    <component name="RetailerComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >
+            
+            <properties service="Retailer">
+                <property name="retailerName">play.com</property>
+            </properties>
+        </implementation.osgi>
+        <reference name="warehouse" target="WarehouseComponent1"/>
+        <property name="retailerName" type="xsd:string" >play.com</property> 
+    </component>
+    
+    <component name="RetailerComponent3">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >
+            
+            <properties service="Retailer">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+        </implementation.osgi>
+        <reference name="warehouse" target="WarehouseComponent2"/>
+        <property name="retailerName" type="xsd:string" >ebay.com</property> 
+    </component>
+
+
+    <component name="WarehouseComponent1">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent2"  />
+    </component>
+    
+    <component name="WarehouseComponent2">
+        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
+        
+        <reference name="shipper" target="ShipperComponent1"  />
+    </component>
+    
+   
+    <component name="ShipperComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="wiring.supplychain.shipper.Shipper">
+            
+            <properties service="Shipper">
+                <property name="shipperName">RoyalMail</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="customer" target="CustomerComponent" />
+        <property name="shipperName" type="xsd:string" >RoyalMail</property> 
+    </component>
+    
+     <component name="ShipperComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="wiring.supplychain.shipper.Shipper">
+            
+            <properties service="Shipper">
+                <property name="shipperName">ParcelForce</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="customer" target="CustomerComponent" />
+        <property name="shipperName" type="xsd:string" >ParcelForce</property> 
+        
+    </component>
+    
+    
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
new file mode 100644
index 0000000000..953045fefa
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://supplychain"
+    xmlns:sp="http://supplychain"
+    name="supplychain">
+
+    <component name="CustomerComponent">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="wiring.supplychain.customer.Customer" >
+            
+            <properties reference="retailer1">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="retailer2">
+                <property name="retailerName">play.com</property>
+            </properties>
+            <properties reference="retailer3">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+        </implementation.osgi>
+            
+        <reference name="retailer1" target="RetailerComponent1/Retailer" />
+        
+        <reference name="retailer2" target="RetailerComponent2/Retailer" />
+        
+        <reference name="retailer3" target="RetailerComponent3/Retailer" />
+    </component>
+
+    <component name="RetailerComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >
+            <properties service="Retailer">
+                <property name="retailerName">amazon.com</property>
+            </properties>
+            <properties reference="warehouse">
+                <property name="component.name">WarehouseComponent1</property>
+            </properties>
+        </implementation.osgi>
+        <service name="Retailer"/>
+        
+        <reference name="warehouse" target="WarehouseComponent1"/>        
+        <property name="retailerName" type="xsd:string" >amazon.com</property> 
+    </component>
+    
+    <component name="RetailerComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >
+            
+            <properties service="Retailer">
+                <property name="retailerName">play.com</property>
+            </properties>
+            
+            <properties reference="warehouse">
+                <property name="component.name">WarehouseComponent1</property>
+            </properties>
+        </implementation.osgi>
+        <reference name="warehouse" target="WarehouseComponent1"/>
+        <property name="retailerName" type="xsd:string" >play.com</property> 
+    </component>
+    
+    <component name="RetailerComponent3">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >
+            
+            <properties service="Retailer">
+                <property name="retailerName">ebay.com</property>
+            </properties>
+            <properties reference="warehouse">
+                <property name="component.name">WarehouseComponent1</property>
+            </properties>
+        </implementation.osgi>
+        <reference name="warehouse" target="WarehouseComponent1"/>
+        <property name="retailerName" type="xsd:string" >ebay.com</property> 
+    </component>
+    
+    <component name="WarehouseComponent1">
+        
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="wiring.supplychain.warehouse.Warehouse" >
+                
+            <properties reference="shipper">
+                <property name="shipperName">ParcelForce</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="shipper" target="ShipperComponent2"  />
+    </component>
+
+
+    <component name="WarehouseComponent2">
+        
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+                bundleSymbolicName="wiring.supplychain.warehouse.Warehouse" >
+                
+            <properties reference="shipper">
+                <property name="shipperName">RoyalMail</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="shipper" target="ShipperComponent1"  />
+    </component>
+    
+   
+    <component name="ShipperComponent1">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="wiring.supplychain.shipper.Shipper">
+            
+            <properties service="Shipper">
+                <property name="shipperName">RoyalMail</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="customer" target="CustomerComponent" />
+        <property name="shipperName" type="xsd:string" >RoyalMail</property> 
+    </component>
+    
+     <component name="ShipperComponent2">
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="wiring.supplychain.shipper.Shipper">
+            
+            <properties service="Shipper">
+                <property name="shipperName">ParcelForce</property>
+            </properties>
+        </implementation.osgi>
+        
+        <reference name="customer" target="CustomerComponent" />
+        <property name="shipperName" type="xsd:string" >ParcelForce</property> 
+        
+    </component>
+    
+    
+</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
new file mode 100644
index 0000000000..c621d9aca0
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <service name="OSGiHelloWorld">
+        <interface.java interface="helloworld.HelloWorld"/>
+    </service>
+    
+    
+    <reference name="helloWorldWS" >
+        <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" / -->
+        <interface.java interface="helloworld.ws.HelloWorld" />
+    </reference>
+      
+</componentType>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
new file mode 100644
index 0000000000..6d3f853382
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	name="helloworld">
+
+    <wsdl:types>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
+
+            <element name="getGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="name" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+
+            <element name="getGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getGreetingsReturn" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="getGreetingsRequest">
+        <wsdl:part element="tns:getGreetings" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:portType name="HelloWorld">
+        <wsdl:operation name="getGreetings">
+            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
+            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="getGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getGreetingsResponse">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldService">
+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
new file mode 100644
index 0000000000..d545c844d2
--- /dev/null
+++ b/sca-java-1.x/tags/1.5.1-RC4/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           name="HelloWorld">
+
+    <service name="helloWorld" promote="HelloWorldService">
+        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
+        <!-- interface.java interface="helloworld.ws.HelloWorld" / -->
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
+    </service>
+
+    <component name="HelloWorldService">
+        <implementation.java class="helloworld.ws.HelloWorldService"/>
+    </component>
+
+    <component name="HelloWorldComponent">
+        <!--implementation.java class="helloworld.HelloWorldComponent"/-->
+        
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+            bundleSymbolicName="helloworld.HelloWorld"
+        />
+        
+        <service name="OSGiHelloWorld"/>
+        
+        <reference name="helloWorldWS" />
+    </component>
+
+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">
+        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
+        <!-- interface.java interface="helloworld.ws.HelloWorld" / -->
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
+    </reference>
+
+</composite>
-- 
cgit v1.2.3