From 496a0ea8d015ff2ef0777a8a182f96fee9cd1222 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 26 May 2009 11:59:37 +0000
Subject: Rename old RC tag

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@778667 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 deletions(-)
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Customer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/services-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/version-test.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
 delete mode 100644 tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite

(limited to 'tags/java/sca/1.5/itest/osgi-implementation/src/main/resources')

diff --git a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
deleted file mode 100644
index 71e248590b..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
deleted file mode 100644
index 7c1125bbb5..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
deleted file mode 100644
index 8456b878f2..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
deleted file mode 100644
index d5a47c6403..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
deleted file mode 100644
index e6391d2159..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
deleted file mode 100644
index c79ede815b..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
deleted file mode 100644
index 04cc73b85c..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
deleted file mode 100644
index 9ece700efe..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
deleted file mode 100644
index 52bc43478d..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
+++ /dev/null
@@ -1,162 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
deleted file mode 100644
index 0b8d2e5851..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
+++ /dev/null
@@ -1,130 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
deleted file mode 100644
index 87370a6df4..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
deleted file mode 100644
index 127349eacf..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
deleted file mode 100644
index 7e3810c458..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
deleted file mode 100644
index fb9a112d18..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
deleted file mode 100644
index ee732b5efc..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
deleted file mode 100644
index b1723660d7..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
deleted file mode 100644
index fb9a112d18..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
deleted file mode 100644
index ee732b5efc..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
deleted file mode 100644
index b1723660d7..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
deleted file mode 100644
index 5172cbe21e..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
deleted file mode 100644
index b7591e732d..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
deleted file mode 100644
index cf8717fcf5..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
deleted file mode 100644
index 785212fa6d..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
deleted file mode 100644
index 7a06030e32..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
deleted file mode 100644
index 5c39b53b0a..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
deleted file mode 100644
index b8bb809319..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
deleted file mode 100644
index 26f32fe617..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
deleted file mode 100644
index 1b9e0e847e..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
deleted file mode 100644
index 6066a38f29..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
deleted file mode 100644
index 777edd3f7d..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
deleted file mode 100644
index d8adaa2ba3..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
deleted file mode 100644
index e0bd9d8c10..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
deleted file mode 100644
index 6005ae785c..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
deleted file mode 100644
index 6f0b79ebc2..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
deleted file mode 100644
index d4b461460e..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
deleted file mode 100644
index bb15e6e3aa..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
deleted file mode 100644
index 7591201b8c..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
deleted file mode 100644
index 0e844fab99..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
deleted file mode 100644
index fc86a76784..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
deleted file mode 100644
index a8a87c5c8c..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
deleted file mode 100644
index 05bbf4db88..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
deleted file mode 100644
index a12d1a21ea..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
deleted file mode 100644
index 2214db11a6..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
deleted file mode 100644
index 8d44067992..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
deleted file mode 100644
index 60c0fb3fd3..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
deleted file mode 100644
index ca1392d2b8..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
deleted file mode 100644
index 7c9f67c36d..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
deleted file mode 100644
index 760c761666..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
deleted file mode 100644
index 7d56770311..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
deleted file mode 100644
index 321bdc713f..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
deleted file mode 100644
index 66f98011cb..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
deleted file mode 100644
index 6874a66db9..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
deleted file mode 100644
index 47d290eb1a..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
deleted file mode 100644
index c7f13a50a7..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
deleted file mode 100644
index f4c102c4f0..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
deleted file mode 100644
index cbebf7eec2..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
deleted file mode 100644
index 6a3c845cca..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
+++ /dev/null
@@ -1,14 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
deleted file mode 100644
index cb6345432f..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
deleted file mode 100644
index 89871fa8f6..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
deleted file mode 100644
index d968d1ffc5..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
deleted file mode 100644
index fc762df8d5..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
deleted file mode 100644
index 02e42bc010..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
deleted file mode 100644
index 390367b99b..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
deleted file mode 100644
index 4715cbd976..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
deleted file mode 100644
index 932fb8a483..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
deleted file mode 100644
index b10d0416dc..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
deleted file mode 100644
index c799f31606..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
deleted file mode 100644
index db68d7e333..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
deleted file mode 100644
index 1aea3cf669..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
deleted file mode 100644
index 106bd1b6aa..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
deleted file mode 100644
index 1e3c915a59..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
deleted file mode 100644
index d7d0b41f5e..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
deleted file mode 100644
index 81c51e6804..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
deleted file mode 100644
index 335bc419c1..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
deleted file mode 100644
index a68b9d6dbb..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
deleted file mode 100644
index 02f79c15f3..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
deleted file mode 100644
index 8428b08d96..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
deleted file mode 100644
index c81bf00d00..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
deleted file mode 100644
index 61c161617c..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
deleted file mode 100644
index fd6a26a65f..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
deleted file mode 100644
index 0168bc2435..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
deleted file mode 100644
index 6674cdd7f2..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
deleted file mode 100644
index 72df35ef41..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
deleted file mode 100644
index 724c8132df..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
deleted file mode 100644
index 1e5035d949..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
deleted file mode 100644
index 85bfd86422..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
deleted file mode 100644
index 6e51b3d6f2..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
deleted file mode 100644
index 9a87758ec2..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
deleted file mode 100644
index e134bd1061..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
deleted file mode 100644
index c19895bab1..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
deleted file mode 100644
index 707609d2c4..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
deleted file mode 100644
index e084e5831a..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
deleted file mode 100644
index d96f6481fb..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
deleted file mode 100644
index 10ef690c9b..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
deleted file mode 100644
index 003f9dca5a..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
deleted file mode 100644
index fefdea106d..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
deleted file mode 100644
index f6b847ed59..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
deleted file mode 100644
index 5cff2f573e..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
deleted file mode 100644
index 0fec68a725..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
deleted file mode 100644
index 678014d48d..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
deleted file mode 100644
index f0090fb52b..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
deleted file mode 100644
index 0b50923a05..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
deleted file mode 100644
index 1000a5f974..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
deleted file mode 100644
index 4e392a9ff1..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
deleted file mode 100644
index b10d0416dc..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
deleted file mode 100644
index 788ec4f19a..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
deleted file mode 100644
index 1ba16d0693..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
deleted file mode 100644
index a55ebd02a8..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
deleted file mode 100644
index e7459360e6..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
deleted file mode 100644
index d518ecab62..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
deleted file mode 100644
index d7d0b41f5e..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
deleted file mode 100644
index 880304187b..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
deleted file mode 100644
index d72db04425..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
deleted file mode 100644
index f9c1218f82..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
deleted file mode 100644
index d8e4c1cb7e..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
deleted file mode 100644
index a6de268bf6..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
deleted file mode 100644
index 660e277693..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
deleted file mode 100644
index 02ae93aec2..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
deleted file mode 100644
index c94504f07d..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
deleted file mode 100644
index fea03404fd..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
deleted file mode 100644
index 3c425fcbc9..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
deleted file mode 100644
index f6c04de980..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
deleted file mode 100644
index 87918132e6..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
deleted file mode 100644
index 9b00787162..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
deleted file mode 100644
index 2ecc0bea43..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
deleted file mode 100644
index af79dc4bdf..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Customer.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Customer.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
deleted file mode 100644
index c144a1bc18..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/services-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/services-test.composite
deleted file mode 100644
index 64f3b30f88..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/services/services-test.composite
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
deleted file mode 100644
index 0b0aa0912b..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
deleted file mode 100644
index 877d0de1c9..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
+++ /dev/null
@@ -1,184 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/version-test.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/version-test.composite
deleted file mode 100644
index bbb397ee70..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/version/version-test.composite
+++ /dev/null
@@ -1,170 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
deleted file mode 100644
index 617200d8dd..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
deleted file mode 100644
index 213cde2c1d..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
+++ /dev/null
@@ -1,151 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
deleted file mode 100644
index 0dca0da75e..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
deleted file mode 100644
index 953045fefa..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
+++ /dev/null
@@ -1,151 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
deleted file mode 100644
index c621d9aca0..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
deleted file mode 100644
index 6d3f853382..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
deleted file mode 100644
index d545c844d2..0000000000
--- a/tags/java/sca/1.5/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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