From 6fadbc9cd1fcf03d0b3630f772d91df149b70428 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:07:19 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835123 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/callback/client/CallbackCallback.java | 33 --- .../main/java/callback/client/CallbackClient.java | 31 --- .../callback/client/JavaCallbackClientImpl.java | 141 ------------ .../callback/client/OSGiCallbackClientImpl.java | 181 --------------- .../java/callback/service/CallbackService.java | 39 ---- .../callback/service/JavaCallbackServiceImpl.java | 68 ------ .../callback/service/OSGiCallbackServiceImpl.java | 95 -------- .../client/ConversationalCallback.java | 50 ---- .../conversation/client/ConversationalClient.java | 51 ----- .../client/ConversationalClientActivator.java | 124 ---------- .../client/ConversationalClientServiceFactory.java | 135 ----------- .../client/ConversationalClientStatefulImpl.java | 254 --------------------- .../client/ConversationalClientStatelessImpl.java | 253 -------------------- .../ConversationalReferenceClient.java | 38 --- .../ConversationalReferenceClientActivator.java | 66 ------ .../ConversationalReferenceClientImpl.java | 45 ---- .../service/ConversationalService.java | 65 ------ .../service/ConversationalServiceActivator.java | 76 ------ .../service/ConversationalServiceFactory.java | 52 ----- .../service/ConversationalServiceStatefulImpl.java | 121 ---------- .../ConversationalServiceStatelessImpl.java | 127 ----------- .../src/main/java/helloworld/Greetings.java | 36 --- .../src/main/java/helloworld/HelloWorld.java | 29 --- .../java/helloworld/JavaGreetingsComponent.java | 73 ------ .../java/helloworld/JavaHelloWorldComponent.java | 41 ---- .../main/java/helloworld/OSGiGreetingsImpl.java | 112 --------- .../main/java/helloworld/OSGiHelloWorldImpl.java | 81 ------- .../src/main/java/helloworld/ws/HelloWorld.java | 29 --- .../main/java/helloworld/ws/HelloWorldService.java | 28 --- .../stockquote/OSGiStockQuoteComponentImpl.java | 86 ------- .../java/stockquote/OSGiStockQuoteFactoryImpl.java | 65 ------ .../main/java/stockquote/OSGiStockQuoteImpl.java | 119 ---------- .../src/main/java/stockquote/StockQuote.java | 31 --- .../src/main/java/supplychain/OSGiBundleImpl.java | 163 ------------- .../main/java/supplychain/customer/Customer.java | 39 ---- .../customer/JavaCustomerComponentImpl.java | 88 ------- .../customer/OSGiCustomerComponentImpl.java | 104 --------- .../customer/OSGiCustomerFactoryImpl.java | 65 ------ .../supplychain/customer/OSGiCustomerImpl.java | 92 -------- .../OSGiCustomerWithQueryComponentImpl.java | 100 -------- .../customer/OSGiCustomerWithQueryImpl.java | 82 ------- .../OSGiStatelessCustomerComponentImpl.java | 30 --- .../customer/OSGiStatelessCustomerImpl.java | 35 --- .../customer/OSGiVersionedCustomerImpl.java | 98 -------- .../retailer/JavaRetailerComponentImpl.java | 67 ------ .../retailer/OSGiRetailerComponentImpl.java | 64 ------ .../supplychain/retailer/OSGiRetailerImpl.java | 58 ----- .../retailer/OSGiRetailerServiceImpl.java | 45 ---- .../OSGiRetailerWithQueryComponentImpl.java | 78 ------- .../retailer/OSGiRetailerWithQueryImpl.java | 64 ------ .../retailer/OSGiVersionedRetailerImpl.java | 75 ------ .../retailer/OSGiVersionedRetailerServiceImpl.java | 47 ---- .../main/java/supplychain/retailer/Retailer.java | 28 --- .../java/supplychain/retailer/RetailerQuery.java | 28 --- .../shipper/JavaShipperComponentImpl.java | 58 ----- .../shipper/OSGiShipperComponentImpl.java | 62 ----- .../shipper/OSGiShipperFactoryImpl.java | 78 ------- .../java/supplychain/shipper/OSGiShipperImpl.java | 57 ----- .../shipper/OSGiShipperServiceImpl.java | 43 ---- .../shipper/OSGiStatelessShipperComponentImpl.java | 30 --- .../shipper/OSGiStatelessShipperServiceImpl.java | 35 --- .../shipper/OSGiVersionedShipperImpl.java | 78 ------- .../shipper/OSGiVersionedShipperServiceImpl.java | 46 ---- .../src/main/java/supplychain/shipper/Shipper.java | 28 --- .../warehouse/JavaWarehouseComponentImpl.java | 48 ---- .../JavaWarehouseWithQueryComponentImpl.java | 52 ----- .../warehouse/OSGiWarehouseComponentImpl.java | 57 ----- .../supplychain/warehouse/OSGiWarehouseImpl.java | 68 ------ .../warehouse/OSGiWarehouseServiceImpl.java | 62 ----- .../main/java/supplychain/warehouse/Warehouse.java | 28 --- .../java/supplychain/warehouse/WarehouseQuery.java | 28 --- .../src/main/resources/META-INF/LICENSE.txt | 202 ---------------- .../src/main/resources/META-INF/NOTICE | 14 -- .../src/main/resources/META-INF/README.txt | 35 --- .../main/resources/META-INF/sca-contribution.xml | 24 -- .../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 --- .../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 ---- .../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 ----- 256 files changed, 11281 deletions(-) delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/Greetings.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/README.txt delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/factory-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/services-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Customer1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Customer2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/version-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite (limited to 'branches/sca-java-1.0.1/itest/osgi-implementation/src/main') diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java deleted file mode 100644 index cfecd989fe..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package callback.client; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -/* - * Callback interface - */ -public interface CallbackCallback { - - public void callbackMessage(String aString); - - public void callbackIncrement(String aString); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java deleted file mode 100644 index 43bc26f2f5..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package callback.client; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -/** - * Callback test client interface - */ -public interface CallbackClient { - - public void run(); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java deleted file mode 100644 index 1a6b194b04..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package callback.client; - -import junit.framework.Assert; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -import callback.service.CallbackService; - -@Service(CallbackClient.class) -/** - * Callback test client implementation - */ -public class JavaCallbackClientImpl implements CallbackClient, CallbackCallback { - - @Reference - protected CallbackService callbackService; - - private static String returnMessage = null; - private static int callbackCount = 0; - private static Object monitor = new Object(); - - public void run() { - - // This tests basic callback patterns. - - // Test1 is the basic callback where the target calls back prior to - // returning to the client. - test1a(); - - // Test2 is where the target does not call back to the client. - test1b(); - - // Test3 is where the target calls back multiple times to the client. - test1c(); - - return; - } - - private void test1a() { - callbackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we cant get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallbackITest - test1a", "Who's There", this.getReturnMessage()); - - } - - private void test1b() { - callbackService.noCallback("No Reply Desired"); - Assert.assertEquals("CallbackITest - test1b", 1, 1); - - return; - } - - private void test1c() { - callbackService.multiCallback("Call me back 3 times"); - int count = 0; - - // - // If we cant get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (this.getCallbackCount() < 3 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallbackITest - test1c", 3, this.getCallbackCount()); - return; - } - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public int getCallbackCount() { - return callbackCount; - } - - public void incrementCallbackCount() { - callbackCount++; - } - - public void callbackMessage(String aString) { - System.out.println("Entering callback callbackMessage: " + aString); - synchronized (monitor) { - this.setReturnMessage(aString); - monitor.notify(); - } - } - - public void callbackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - synchronized (monitor) { - this.incrementCallbackCount(); - monitor.notify(); - } - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java deleted file mode 100644 index 414e5d2f9b..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package callback.client; - -import java.util.Hashtable; - - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; - -import callback.service.CallbackService; - -/** - * OSGi Callback test client implementation - */ -public class OSGiCallbackClientImpl implements - CallbackClient, CallbackCallback, BundleActivator { - - protected CallbackService callbackService; - - private static String returnMessage = null; - private static int callbackCount = 0; - private static Object monitor = new Object(); - - private BundleContext bundleContext; - - public void run() { - - // This tests basic callback patterns. - - // Test1 is the basic callback where the target calls back prior to - // returning to the client. - test1a(); - - // Test2 is where the target does not call back to the client. - test1b(); - - // Test3 is where the target calls back multiple times to the client. - test1c(); - - return; - } - - - - private void test1a() { - callbackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we cant get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - if (!"Who's There".equals(this.getReturnMessage())) { - throw new RuntimeException("CallbackITest - test1a"); - } - - } - - private void test1b() { - callbackService.noCallback("No Reply Desired"); - - return; - } - - private void test1c() { - callbackService.multiCallback("Call me back 3 times"); - int count = 0; - - // - // If we cant get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (this.getCallbackCount() < 3 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - if (this.getCallbackCount() != 3) - throw new RuntimeException("CallbackITest - test1c"); - return; - } - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public int getCallbackCount() { - return callbackCount; - } - - public void incrementCallbackCount() { - callbackCount++; - } - - public void callbackMessage(String aString) { - System.out.println("Entering callback callbackMessage: " + aString); - synchronized (monitor) { - this.setReturnMessage(aString); - monitor.notify(); - } - } - - public void callbackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - synchronized (monitor) { - this.incrementCallbackCount(); - monitor.notify(); - } - } - - - public void start(BundleContext bc) throws Exception { - - System.out.println("Started OSGiCallbackClientImpl bundle "); - - this.bundleContext = bc; - - Hashtable serviceProps = new Hashtable(); - serviceProps.put("component.service.name", "CallbackClient/CallbackClient"); - - serviceProps.put("component.name", "CallbackClient"); - bundleContext.registerService("callback.client.CallbackClient", this, serviceProps); - - Hashtable callbackProps = new Hashtable(); - callbackProps.put("component.service.name", "CallbackClient/callbackService"); - callbackProps.put("component.name", "CallbackClient"); - - bundleContext.registerService("callback.client.CallbackCallback", this, callbackProps); - - ServiceReference ref= bundleContext.getServiceReference("callback.service.CallbackService"); - - if (ref != null) - callbackService = (callback.service.CallbackService)bundleContext.getService(ref); - - - - - } - - public void stop(BundleContext bc) { - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java deleted file mode 100644 index 5383e1e268..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package callback.service; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -import callback.client.CallbackCallback; - -@Remotable -@Callback(CallbackCallback.class) -/* - * Callback service interface - */ -public interface CallbackService { - - public void knockKnock(String aString); - - public void noCallback(String aString); - - public void multiCallback(String aString); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java deleted file mode 100644 index b2af2fa68d..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package callback.service; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; - -import callback.client.CallbackCallback; - -@Service(CallbackService.class) -/* - * Callback service implementation - */ -public class JavaCallbackServiceImpl implements CallbackService { - - private CallbackCallback callback; - - @Callback - protected void setCallback(CallbackCallback callback) { - this.callback = callback; - } - - public void knockKnock(String aString) { - - System.out.println("CallbackServiceImpl message received: " + aString); - callback.callbackMessage("Who's There"); - System.out.println("CallbackServiceImpl response sent"); - return; - - } - - public void multiCallback(String aString) { - - System.out.println("CallbackServiceImpl message received: " + aString); - callback.callbackIncrement("Who's There 1"); - System.out.println("CallbackServiceImpl response sent"); - callback.callbackIncrement("Who's There 2"); - System.out.println("CallbackServiceImpl response sent"); - callback.callbackIncrement("Who's There 3"); - System.out.println("CallbackServiceImpl response sent"); - return; - - } - - public void noCallback(String aString) { - - System.out.println("CallbackServiceImpl message received: " + aString); - // System.out.println("CallbackServiceImpl No response desired"); - return; - - } -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java deleted file mode 100644 index c05a3f52a8..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package callback.service; - -import java.util.Hashtable; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osoa.sca.annotations.Callback; - -import callback.client.CallbackCallback; - -/* - * OSGi Callback service implementation - */ -public class OSGiCallbackServiceImpl implements CallbackService, BundleActivator { - - @Callback - protected CallbackCallback callback; - - - private BundleContext bundleContext; - - public void knockKnock(String aString) { - - System.out.println("CallbackServiceImpl message received: " + aString); - callback.callbackMessage("Who's There"); - System.out.println("CallbackServiceImpl response sent"); - return; - - } - - public void multiCallback(String aString) { - - System.out.println("CallbackServiceImpl message received: " + aString); - callback.callbackIncrement("Who's There 1"); - System.out.println("CallbackServiceImpl response sent"); - callback.callbackIncrement("Who's There 2"); - System.out.println("CallbackServiceImpl response sent"); - callback.callbackIncrement("Who's There 3"); - System.out.println("CallbackServiceImpl response sent"); - return; - - } - - public void noCallback(String aString) { - - System.out.println("CallbackServiceImpl message received: " + aString); - // System.out.println("CallbackServiceImpl No response desired"); - return; - - } - - - public void start(BundleContext bc) throws Exception { - - System.out.println("Started OSGiCallbackServiceImpl bundle "); - - this.bundleContext = bc; - - Hashtable serviceProps = new Hashtable(); - serviceProps.put("component.service.name", "CallbackService/CallbackService"); - bundleContext.registerService("callback.service.CallbackService", this, serviceProps); - - - ServiceReference ref= bundleContext.getServiceReference("callback.client.CallbackCallback"); - - if (ref != null) - callback = (CallbackCallback)bundleContext.getService(ref); - - } - - public void stop(BundleContext bc) { - } - - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java deleted file mode 100644 index a6202309bd..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package conversation.client; - -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - - -/** - * The callback interface used when testing caonversational callbacks - * - * @version $Rev$ $Date$ - */ -@Remotable -@Conversational -public interface ConversationalCallback { - - public void init(); - - public void destroy(); - - public void initializeCount(int count); - - public void incrementCount(); - - public int retrieveCount(); - - public void businessException() throws Exception; - - @EndsConversation - public String endConversation(); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java deleted file mode 100644 index af269052c7..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package conversation.client; - -import org.osoa.sca.annotations.Remotable; - -/** - * The client for the conversational itest. Is implemented by clients - * offering both stateless and stateful callbacks - * - * @version $Rev$ $Date$ - */ - -@Remotable -public interface ConversationalClient { - - public int runConversationFromInjectedReference(); - public int runConversationFromServiceReference(); - public int runConversationWithUserDefinedConversationId(); - public String runConversationCheckUserDefinedConversationId(); - public int runConversationCheckingScope(); - public int runConversationWithCallback(); - public int runConversationHavingPassedReference(); - public String runConversationBusinessException(); - public String runConversationBusinessExceptionCallback(); - public int runConversationCallingEndedConversation(); - public int runConversationCallingEndedConversationCallback(); - public int runConversationAgeTimeout(); - public int runConversationIdleTimeout(); - public int runConversationPrincipleError(); - - public String getCalls(); - public String getServiceCalls(); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java deleted file mode 100644 index f74353a6af..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package conversation.client; - -import java.util.Hashtable; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; - -import conversation.client.ConversationalCallback; -import conversation.client.ConversationalClient; -import conversation.client.ConversationalClientStatefulImpl; -import conversation.client.ConversationalClientStatelessImpl; -import conversation.referenceclient.ConversationalReferenceClient; -import conversation.referenceclient.ConversationalReferenceClientImpl; -import conversation.service.ConversationalService; -import conversation.service.ConversationalServiceStatefulImpl; -import conversation.service.ConversationalServiceStatelessImpl; - -/* - * OSGi bundle activator for conversation tests - */ -public class ConversationalClientActivator implements BundleActivator, ServiceListener { - - - private BundleContext bundleContext; - - - public void start(BundleContext bc) throws Exception { - - System.out.println("Started OSGiConversationClientActivator "); - - this.bundleContext = bc; - - bc.addServiceListener(this); - - Hashtable serviceProps; - - serviceProps = new Hashtable(); - - serviceProps.put("component.name", "ConversationalStatelessClientStatelessService"); - Object statelessClientFactory1 = - new ConversationalClientServiceFactory(ConversationalClientStatelessImpl.class, bundleContext, 1); - bundleContext.registerService( - new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()}, - statelessClientFactory1, - serviceProps); - - serviceProps = new Hashtable(); - serviceProps.put("component.name", "ConversationalStatelessClientStatefulService"); - Object statelessClientFactory2 = - new ConversationalClientServiceFactory(ConversationalClientStatelessImpl.class, bundleContext, 2); - bundleContext.registerService( - new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()}, - statelessClientFactory2, - serviceProps); - - - serviceProps.put("component.name", "ConversationalStatefulClientStatelessService"); - Object statefulClientFactory1 = - new ConversationalClientServiceFactory(ConversationalClientStatefulImpl.class, bundleContext, 3); - bundleContext.registerService( - new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()}, - statefulClientFactory1, - serviceProps); - - serviceProps = new Hashtable(); - serviceProps.put("component.name", "ConversationalStatefulClientStatefulService"); - Object statefulClientFactory2 = - new ConversationalClientServiceFactory(ConversationalClientStatefulImpl.class, bundleContext, 4); - bundleContext.registerService( - new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()}, - statefulClientFactory2, - serviceProps); - - serviceProps.put("component.name", "ConversationalReferenceClient"); - ConversationalReferenceClientImpl refClient = new ConversationalReferenceClientImpl(); - bundleContext.registerService(ConversationalReferenceClient.class.getName(), refClient, serviceProps); - - serviceProps = new Hashtable(); - serviceProps.put("component.name", "ConversationalServiceStateful"); - Object statefulService = - new ConversationalClientServiceFactory(ConversationalServiceStatefulImpl.class, bundleContext, 5); - bundleContext.registerService(ConversationalService.class.getName(), statefulService, serviceProps); - - serviceProps = new Hashtable(); - serviceProps.put("component.name", "ConversationalServiceStateless"); - ConversationalServiceStatelessImpl statelessService = new ConversationalServiceStatelessImpl(); - bundleContext.registerService(ConversationalService.class.getName(), statelessService, serviceProps); - - - } - - - - public void stop(BundleContext bc) { - } - - public void serviceChanged(ServiceEvent event) { - - if (event.getType() == ServiceEvent.REGISTERED) { - - } - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java deleted file mode 100644 index 129b903ae9..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package conversation.client; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceFactory; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.ServiceRegistration; - -import conversation.client.ConversationalClientStatefulImpl; -import conversation.client.ConversationalClientStatelessImpl; -import conversation.referenceclient.ConversationalReferenceClient; -import conversation.service.ConversationalService; - -public class ConversationalClientServiceFactory implements ServiceFactory { - - private Class clazz; - private BundleContext bundleContext; - private int serviceNum; - - public ConversationalClientServiceFactory(Class clazz, BundleContext bundleContext, int serviceNum) { - this.clazz = clazz; - this.bundleContext = bundleContext; - this.serviceNum = serviceNum; - } - - public Object getService(Bundle bundle, ServiceRegistration reg) { - - - try { - Object instance = clazz.newInstance(); - - ConversationalClientStatelessImpl statelessClient = null; - ConversationalClientStatefulImpl statefulClient = null; - - if (serviceNum == 1 || serviceNum == 2) { - - ServiceReference ref = bundleContext.getServiceReference(ConversationalReferenceClient.class.getName()); - statelessClient = (ConversationalClientStatelessImpl)instance; - statelessClient.conversationalReferenceClient = - (ConversationalReferenceClient)bundleContext.getService(ref); - } - if (serviceNum == 1) { - - ServiceReference ref = getServiceReference(ConversationalService.class.getName(), - "(component.name=ConversationalServiceStateless)"); - statelessClient.conversationalService = (ConversationalService)bundleContext.getService(ref); - - } - - if (serviceNum == 2) { - - ServiceReference ref = getServiceReference(ConversationalService.class.getName(), - "(component.name=ConversationalServiceStateful)"); - statelessClient.conversationalService = (ConversationalService)bundleContext.getService(ref); - - } - - - if (serviceNum == 3 || serviceNum == 4) { - - ServiceReference ref = bundleContext.getServiceReference(ConversationalReferenceClient.class.getName()); - statefulClient = (ConversationalClientStatefulImpl)instance; - statefulClient.conversationalReferenceClient = - (ConversationalReferenceClient)bundleContext.getService(ref); - } - if (serviceNum == 3) { - - ServiceReference ref = getServiceReference(ConversationalService.class.getName(), - "(component.name=ConversationalServiceStateless)"); - statefulClient.conversationalService = (ConversationalService)bundleContext.getService(ref); - - } - - if (serviceNum == 4) { - - ServiceReference ref = getServiceReference(ConversationalService.class.getName(), - "(component.name=ConversationalServiceStateful)"); - statefulClient.conversationalService = (ConversationalService)bundleContext.getService(ref); - - } - - return instance; - } catch (Exception e) { - - e.printStackTrace(); - return null; - } - } - - public void ungetService(Bundle bundle, ServiceRegistration reg, Object obj) { - bundle.getBundleContext().ungetService(reg.getReference()); - } - - private ServiceReference getServiceReference(String name, String filter) throws Exception { - - ServiceReference refs[] = bundleContext.getServiceReferences(name, filter); - ServiceReference ref = refs[0]; - int ranking = 0; - if (ref.getProperty(Constants.SERVICE_RANKING) instanceof Integer) - ranking = (Integer)ref.getProperty(Constants.SERVICE_RANKING); - for (int i = 1; i < refs.length; i++) { - int thisranking = 0; - if (refs[i].getProperty(Constants.SERVICE_RANKING) instanceof Integer) { - thisranking = (Integer)refs[i].getProperty(Constants.SERVICE_RANKING); - } - if (thisranking > ranking) { - ref = refs[i]; - ranking = thisranking; - } - } - - return ref; - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java deleted file mode 100644 index 3aedabc29c..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java +++ /dev/null @@ -1,254 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package conversation.client; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import conversation.referenceclient.ConversationalReferenceClient; -import conversation.service.ConversationalService; - -/** - * The client for the conversational itest which presents a stateful - * callback interface - * - * @version $Rev$ $Date$ - */ - -@Service(interfaces={ConversationalClient.class}) -@Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) -public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback { - - @Context - protected ComponentContext componentContext; - - protected ConversationalService conversationalService; - - protected ConversationalReferenceClient conversationalReferenceClient; - - private int clientCount = 0; - private int callbackCount = 0; - - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - // From ConversationalClient - public int runConversationFromInjectedReference(){ - calls.append("runConversationFromInjectedReference,"); - conversationalService.initializeCount(1); - conversationalService.incrementCount(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromServiceReference(){ - calls.append("runConversationFromServiceReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public int runConversationWithUserDefinedConversationId(){ - calls.append("runConversationWithUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation1"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public String runConversationCheckUserDefinedConversationId(){ - calls.append("runConversationCheckUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation2"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - return callableReference.endConversation(); - - } - public int runConversationCheckingScope(){ - calls.append("runConversationCheckingScope,"); - // run a conversation - return runConversationFromInjectedReference(); - - // test will then use a static method to find out how many times - // init/destroy were called - } - public int runConversationWithCallback(){ - calls.append("runConversationWithCallback,"); - callbackCount = 2; - conversationalService.initializeCountCallback(1); - conversationalService.incrementCountCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - - return clientCount; - } - public int runConversationHavingPassedReference(){ - calls.append("runConversationHavingPassedReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - conversationalReferenceClient.incrementCount(serviceReference); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - serviceReference.getConversation().end(); - - return clientCount; - } - public String runConversationBusinessException(){ - calls.append("runConversationbusinessException,"); - try { - conversationalService.initializeCount(1); - conversationalService.businessException(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public String runConversationBusinessExceptionCallback(){ - calls.append("runConversationbusinessExceptionCallback,"); - try { - conversationalService.initializeCountCallback(1); - conversationalService.businessExceptionCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public int runConversationCallingEndedConversation(){ - calls.append("runConversationCallingEndedConversation,"); - conversationalService.initializeCount(1); - conversationalService.endConversation(); - return conversationalService.retrieveCount(); - } - - public int runConversationCallingEndedConversationCallback(){ - calls.append("runConversationCallingEndedConversationCallback,"); - conversationalService.initializeCountCallback(1); - conversationalService.endConversationCallback(); - return conversationalService.retrieveCountCallback(); - } - - public int runConversationAgeTimeout(){ - calls.append("runConversationAgeTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationIdleTimeout(){ - calls.append("runConversationIdleTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationPrincipleError(){ - calls.append("runConversationPrincipleError,"); - // TODO - when policy framework is done - return clientCount; - } - - - // From ConversationalCallback - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - callbackCount += count; - } - - public void incrementCount(){ - calls.append("incrementCount,"); - callbackCount++; - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - return callbackCount; - } - - public void businessException() throws Exception { - throw new Exception("Business Exception"); - } - - public String endConversation(){ - calls.append("endConversation,"); - callbackCount = 0; - return null; - } - - public String getCalls() { - return calls.toString(); - } - - public String getServiceCalls() { - return conversationalService.getCalls().toString(); - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java deleted file mode 100644 index b12e094bc1..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java +++ /dev/null @@ -1,253 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package conversation.client; - - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import conversation.referenceclient.ConversationalReferenceClient; -import conversation.service.ConversationalService; - -/** - * The client for the conversational itest which presents a stateful - * callback interface - * - * @version $Rev$ $Date$ - */ - -@Service(interfaces={ConversationalClient.class}) -@Scope("STATELESS") -public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback { - - @Context - protected ComponentContext componentContext; - - @Reference - protected ConversationalService conversationalService; - - @Reference - protected ConversationalReferenceClient conversationalReferenceClient; - - private int clientCount = 0; - private int callbackCount = 0; - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - // From ConversationalClient - public int runConversationFromInjectedReference(){ - calls.append("runConversationFromInjectedReference,"); - conversationalService.initializeCount(1); - conversationalService.incrementCount(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromServiceReference(){ - calls.append("runConversationFromServiceReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public int runConversationWithUserDefinedConversationId(){ - calls.append("runConversationWithUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public String runConversationCheckUserDefinedConversationId(){ - calls.append("runConversationCheckUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation2"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - return callableReference.endConversation(); - - } - public int runConversationCheckingScope(){ - calls.append("runConversationCheckingScope,"); - // run a conversation - return runConversationFromInjectedReference(); - - // test will then use a static method to find out how many times - // init/destroy were called - } - public int runConversationWithCallback(){ - calls.append("runConversationWithCallback,"); - conversationalService.initializeCountCallback(1); - conversationalService.incrementCountCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - - return clientCount; - } - - public int runConversationHavingPassedReference(){ - calls.append("runConversationHavingPassedReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - conversationalReferenceClient.incrementCount(serviceReference); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - - public String runConversationBusinessException(){ - calls.append("runConversationbusinessException,"); - try { - conversationalService.initializeCount(1); - conversationalService.businessException(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public String runConversationBusinessExceptionCallback(){ - calls.append("runConversationbusinessExceptionCallback,"); - try { - conversationalService.initializeCountCallback(1); - conversationalService.businessExceptionCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public int runConversationCallingEndedConversation(){ - calls.append("runConversationCallingEndedConversation,"); - conversationalService.initializeCount(1); - conversationalService.endConversation(); - return conversationalService.retrieveCount(); - } - - public int runConversationCallingEndedConversationCallback(){ - calls.append("runConversationCallingEndedConversationCallback,"); - conversationalService.initializeCountCallback(1); - conversationalService.endConversationCallback(); - return conversationalService.retrieveCountCallback(); - } - - public int runConversationAgeTimeout(){ - calls.append("runConversationAgeTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationIdleTimeout(){ - calls.append("runConversationIdleTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationPrincipleError(){ - calls.append("runConversationPrincipleError,"); - // TODO - when policy framework is done - return clientCount; - } - - - // From ConversationalCallback - @Init - public void init(){ - calls.append("init,"); - - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - callbackCount = 0; - } - - public void incrementCount(){ - calls.append("incrementCount,"); - callbackCount++; - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - return callbackCount; - } - - public void businessException() throws Exception { - throw new Exception("Business Exception"); - } - - public String endConversation(){ - calls.append("endConversation,"); - return null; - } - - public String getCalls() { - return calls.toString(); - } - - public String getServiceCalls() { - return conversationalService.getCalls().toString(); - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java deleted file mode 100644 index 59e128b993..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package conversation.referenceclient; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; - -import conversation.service.ConversationalService; - -/** - * The client that calls into an existing conversation by accepting - * a reference to that conversation - * - * @version $Rev$ $Date$ - */ - -@Remotable -public interface ConversationalReferenceClient { - - public void incrementCount(CallableReference conversationalService); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java deleted file mode 100644 index ff6f16cba3..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package conversation.referenceclient; - -import java.util.Hashtable; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; - -/* - * OSGi bundle activator for conversation tests - */ -public class ConversationalReferenceClientActivator implements BundleActivator, ServiceListener { - - - private BundleContext bundleContext; - - - public void start(BundleContext bc) throws Exception { - - System.out.println("Started OSGiConversationReferenceClientActivator "); - - this.bundleContext = bc; - - bc.addServiceListener(this); - - Hashtable serviceProps; - - serviceProps = new Hashtable(); - serviceProps.put("component.name", "ConversationalReferenceClient"); - ConversationalReferenceClientImpl refClient = new ConversationalReferenceClientImpl(); - bundleContext.registerService(ConversationalReferenceClient.class.getName(), refClient, serviceProps); - - } - - - - public void stop(BundleContext bc) { - } - - public void serviceChanged(ServiceEvent event) { - - if (event.getType() == ServiceEvent.REGISTERED) { - - } - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java deleted file mode 100644 index 4524c6bd3d..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package conversation.referenceclient; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Service; - -import conversation.service.ConversationalService; - -/** - * A client component that accepts a reference to an ongoing conversation - * and takes part in that conversation - * - * @version $Rev$ $Date$ - */ - -@Service(interfaces={ConversationalReferenceClient.class}) -@AllowsPassByReference -public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{ - - public void incrementCount(CallableReference conversationalService){ - ConversationalService callableReference = conversationalService.getService(); - - callableReference.incrementCount(); - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java deleted file mode 100644 index bcd24ef0b1..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package conversation.service; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - -import conversation.client.ConversationalCallback; - - -/** - * The service interface used when testing conversations - * - * @version $Rev$ $Date$ - */ -@Remotable -@Conversational -@Callback(ConversationalCallback.class) -public interface ConversationalService { - - public void init(); - - public void destroy(); - - public void initializeCount(int count); - - public void incrementCount(); - - public int retrieveCount(); - - public void businessException() throws Exception; - - public void initializeCountCallback(int count); - - public void incrementCountCallback(); - - public int retrieveCountCallback(); - - public void businessExceptionCallback() throws Exception; - - @EndsConversation - public String endConversation(); - - public String endConversationCallback(); - - public String getCalls(); -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java deleted file mode 100644 index 903f8bf229..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package conversation.service; - -import java.util.Hashtable; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; - - -/* - * OSGi bundle activator for conversation tests - */ -public class ConversationalServiceActivator implements BundleActivator, ServiceListener { - - - private BundleContext bundleContext; - - - public void start(BundleContext bc) throws Exception { - - System.out.println("Started OSGiConversationServiceActivator "); - - this.bundleContext = bc; - - bc.addServiceListener(this); - - Hashtable serviceProps; - - serviceProps = new Hashtable(); - - serviceProps = new Hashtable(); - serviceProps.put("component.name", "ConversationalServiceStateful"); - Object statefulService = - new ConversationalServiceFactory(ConversationalServiceStatefulImpl.class); - bundleContext.registerService(ConversationalService.class.getName(), statefulService, serviceProps); - - serviceProps = new Hashtable(); - serviceProps.put("component.name", "ConversationalServiceStateless"); - ConversationalServiceStatelessImpl statelessService = new ConversationalServiceStatelessImpl(); - bundleContext.registerService(ConversationalService.class.getName(), statelessService, serviceProps); - - - } - - - - public void stop(BundleContext bc) { - } - - public void serviceChanged(ServiceEvent event) { - - if (event.getType() == ServiceEvent.REGISTERED) { - - } - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java deleted file mode 100644 index 43393ff9e9..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package conversation.service; - -import org.osgi.framework.Bundle; -import org.osgi.framework.ServiceFactory; -import org.osgi.framework.ServiceRegistration; - - -public class ConversationalServiceFactory implements ServiceFactory { - - private Class clazz; - - public ConversationalServiceFactory(Class clazz) { - this.clazz = clazz; - } - - public Object getService(Bundle bundle, ServiceRegistration reg) { - - try { - return clazz.newInstance(); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - - } - - public void ungetService(Bundle bundle, ServiceRegistration reg, Object obj) { - bundle.getBundleContext().ungetService(reg.getReference()); - } - - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java deleted file mode 100644 index ec30d641ac..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package conversation.service; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import conversation.client.ConversationalCallback; - - -/** - * The service used when testing stateful conversations - * - * @version $Rev$ $Date$ - */ -@Service(ConversationalService.class) -@Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) -public class ConversationalServiceStatefulImpl implements ConversationalService { - - @ConversationID - protected String conversationId; - - @Callback - protected ConversationalCallback conversationalCallback; - - // local count - accumulates during the conversation - private int count = 0; - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - this.count = count; - } - - public void incrementCount(){ - calls.append("incrementCount,"); - count++; - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - return count; - } - - public void businessException() throws Exception { - throw new Exception("Business Exception"); - } - - public void initializeCountCallback(int count){ - calls.append("initializeCountCallback,"); - this.count = count; - conversationalCallback.initializeCount(count); - } - - public void incrementCountCallback(){ - calls.append("incrementCountCallback,"); - count++; - conversationalCallback.incrementCount(); - } - - public int retrieveCountCallback(){ - calls.append("retrieveCountCallback,"); - return conversationalCallback.retrieveCount(); - } - - public void businessExceptionCallback() throws Exception { - calls.append("businessExceptionCallback,"); - conversationalCallback.businessException(); - } - - public String endConversation(){ - calls.append("endConversation,"); - count = 0; - return conversationId; - } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); - return conversationalCallback.endConversation(); - } - - public String getCalls() { - return calls.toString(); - } -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java deleted file mode 100644 index 34baca71d1..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package conversation.service; - -import java.util.HashMap; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import conversation.client.ConversationalCallback; - - -/** - * The service used when testing stateful conversations - * - * @version $Rev$ $Date$ - */ -@Service(ConversationalService.class) -@Scope("STATELESS") -public class ConversationalServiceStatelessImpl implements ConversationalService { - - @ConversationID - protected String conversationId; - - @Callback - protected ConversationalCallback conversationalCallback; - - // static area in which to hold conversational data - private static HashMap conversationalState = new HashMap(); - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - Integer conversationalCount = new Integer(count); - conversationalState.put(conversationId, conversationalCount); - } - - public void incrementCount(){ - calls.append("incrementCount,"); - Integer conversationalCount = conversationalState.get(conversationId); - conversationalCount++; - conversationalState.put(conversationId, conversationalCount); - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - Integer count = conversationalState.get(conversationId); - if (count != null){ - return count.intValue(); - } else { - return -999; - } - } - - public void businessException() throws Exception { - throw new Exception("Business Exception"); - } - - public void initializeCountCallback(int count){ - calls.append("initializeCountCallback,"); - initializeCount(count); - conversationalCallback.initializeCount(count); - } - - public void incrementCountCallback(){ - calls.append("incrementCountCallback,"); - incrementCount(); - conversationalCallback.incrementCount(); - } - - public int retrieveCountCallback(){ - calls.append("retrieveCountCallback,"); - return conversationalCallback.retrieveCount(); - } - - public void businessExceptionCallback() throws Exception { - calls.append("businessExceptionCallback,"); - conversationalCallback.businessException(); - } - - public String endConversation(){ - calls.append("endConversation,"); - conversationalState.remove(conversationId); - return conversationId; - } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); - return conversationalCallback.endConversation(); - } - - public String getCalls() { - return calls.toString(); - } -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/Greetings.java deleted file mode 100644 index 9285c0a8d5..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/Greetings.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package helloworld; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface Greetings { - - - public String[] getGreetingsFromJava(String[] s); - - public String[] getGreetingsFromOSGi(String[] s); - - public String[] getModifiedGreetingsFromJava(String[] s); - - public String[] getModifiedGreetingsFromOSGi(String[] s); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java deleted file mode 100644 index 16d0eae990..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package helloworld; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface HelloWorld { - - public String getGreetings(String s); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java deleted file mode 100644 index 3d0e045225..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package helloworld; - -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(Greetings.class) -@Scope("COMPOSITE") -public class JavaGreetingsComponent implements Greetings { - - private Greetings greetingsService; - - @Reference - public void setGreetingsService(Greetings greetingsService) { - this.greetingsService = greetingsService; - } - - - public String[] getGreetingsFromJava(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = "Hello " + s[i] + "(From Java)"; - } - - return greetingsService.getGreetingsFromJava(s); - } - - public String[] getGreetingsFromOSGi(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = s[i] + "(From Java)"; - } - - return s; - } - - @AllowsPassByReference - public String[] getModifiedGreetingsFromJava(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = "Hello " + s[i] + "(From Java)"; - } - - return greetingsService.getModifiedGreetingsFromJava(s); - } - - @AllowsPassByReference - public String[] getModifiedGreetingsFromOSGi(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = s[i] + "(From Java)"; - } - - return s; - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java deleted file mode 100644 index c055aee142..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package helloworld; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; - -@Scope("COMPOSITE") -public class JavaHelloWorldComponent implements HelloWorld { - - public helloworld.ws.HelloWorld helloWorldWS; - - @Reference - public void setHelloWorldWS(helloworld.ws.HelloWorld helloWorldWS) { - this.helloWorldWS = helloWorldWS; - } - - public String getGreetings(String s) { - return helloWorldWS.getGreetings(s); - } - - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java deleted file mode 100644 index 661eb5a8cb..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package helloworld; - -import java.util.Hashtable; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.BundleActivator; -import org.osoa.sca.annotations.AllowsPassByReference; - - -public class OSGiGreetingsImpl implements Greetings, ServiceListener, BundleActivator { - - private Greetings greetingsService; - - private BundleContext bundleContext; - - public String[] getGreetingsFromOSGi(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = "Hello " + s[i] + "(From OSGi)"; - } - - return greetingsService.getGreetingsFromOSGi(s); - } - - public String[] getGreetingsFromJava(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = s[i] + "(From OSGi)"; - } - - return s; - } - - @AllowsPassByReference - public String[] getModifiedGreetingsFromOSGi(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = "Hello " + s[i] + "(From OSGi)"; - } - - return greetingsService.getModifiedGreetingsFromOSGi(s); - } - - @AllowsPassByReference - public String[] getModifiedGreetingsFromJava(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = s[i] + "(From OSGi)"; - } - - return s; - } - - public void start(BundleContext bc) { - - System.out.println("Started OsgiGreetingsImpl bundle "); - - this.bundleContext = bc; - - Hashtable serviceProps = new Hashtable(); - serviceProps.put("component.service.name", "OSGiGreetingsComponent/Greetings"); - bundleContext.registerService("helloworld.Greetings", this, serviceProps); - - - ServiceReference ref = bundleContext.getServiceReference("helloworld.Greetings"); - if (ref != null) - greetingsService = (helloworld.Greetings)bundleContext.getService(ref); - else { - try { - String filter = "(objectclass=helloworld.Greetings)"; - this.bundleContext.addServiceListener(this, filter); - - } catch (InvalidSyntaxException e) { - e.printStackTrace(); - } - } - - } - - public void stop(BundleContext bc) { - } - - public void serviceChanged(ServiceEvent event) { - try { - if (event.getType() == ServiceEvent.REGISTERED) { - ServiceReference ref = event.getServiceReference(); - greetingsService = (helloworld.Greetings) bundleContext.getService(ref); - } - } catch (Throwable e) { - e.printStackTrace(); - } - } -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java deleted file mode 100644 index 0588da9a85..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package helloworld; - -import java.util.Hashtable; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.BundleActivator; - - -public class OSGiHelloWorldImpl implements HelloWorld, ServiceListener, BundleActivator { - - public helloworld.ws.HelloWorld helloWorldWS; - - private BundleContext bundleContext; - - public String getGreetings(String s) { - return helloWorldWS.getGreetings(s); - } - - - public void start(BundleContext bc) { - - System.out.println("Started OsgiHelloWorldImpl bundle "); - - this.bundleContext = bc; - - Hashtable serviceProps = new Hashtable(); - serviceProps.put("component.name", "HelloWorldComponent"); - bundleContext.registerService("helloworld.HelloWorld", this, serviceProps); - - ServiceReference ref = bundleContext.getServiceReference("helloworld.ws.HelloWorld"); - if (ref != null) - helloWorldWS = (helloworld.ws.HelloWorld)bundleContext.getService(ref); - else { - try { - String filter = "(objectclass=helloworld.ws.HelloWorld)"; - this.bundleContext.addServiceListener(this, filter); - - } catch (InvalidSyntaxException e) { - e.printStackTrace(); - } - } - - } - - public void stop(BundleContext bc) { - } - - public void serviceChanged(ServiceEvent event) { - try { - if (event.getType() == ServiceEvent.REGISTERED) { - ServiceReference ref = event.getServiceReference(); - helloWorldWS = (helloworld.ws.HelloWorld) bundleContext.getService(ref); - } - } catch (Throwable e) { - e.printStackTrace(); - } - } -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java deleted file mode 100644 index 039a214856..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package helloworld.ws; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface HelloWorld { - - public String getGreetings(String s); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java deleted file mode 100644 index 4a3cd4aed2..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package helloworld.ws; - -public class HelloWorldService implements HelloWorld { - - public String getGreetings(String s) { - return "Hello " + s; - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java deleted file mode 100644 index 2251bf5be6..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package stockquote; - -import java.util.Dictionary; - -import org.osgi.service.component.ComponentContext; -import org.osoa.sca.annotations.Property; - -/** - * Declarative Stock quote with configurable properties. - */ -public class OSGiStockQuoteComponentImpl implements StockQuote { - - @Property - public double exchangeRate; - - private String currency; - - - public double configExchangeRate; - public String configCurrency; - - @Property - public void setCurrency(String currency) { - this.currency = currency; - } - - public double getQuote(String ticker) throws Exception { - - if (exchangeRate == 2.0 && !"USD".equals(currency)) { - throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + - exchangeRate + " currency=" + currency); - } - if (exchangeRate == 1.48 && !"EURO".equals(currency)) { - throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + - exchangeRate + " currency=" + currency); - } - - if (configExchangeRate == 2.0 && !"USD".equals(configCurrency)) { - throw new RuntimeException("ConfigAdmin Property exchangeRate not set correctly, exchangeRate= " + - configExchangeRate + " currency=" + configCurrency); - } - if (configExchangeRate == 1.48 && !"EURO".equals(configCurrency)) { - throw new RuntimeException("Property configExchangeRate not set correctly, exchangeRate= " + - configExchangeRate + " currency=" + configCurrency); - } - - return 52.81 * exchangeRate; - - } - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiStockQuoteComponentImpl bundle "); - Dictionary props = context.getProperties(); - Object prop = props.get("currency"); - if (prop instanceof String[]&& ((String [])prop).length > 0) - configCurrency = ((String [])prop)[0]; - prop = props.get("exchangeRate"); - if (prop instanceof Double[]&& ((Double [])prop).length > 0) - configExchangeRate = (double)((Double [])prop)[0]; - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiStockQuoteComponentImpl bundle "); - } - - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java deleted file mode 100644 index e2d25bf47d..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package stockquote; - -import java.util.Hashtable; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceFactory; -import org.osgi.framework.ServiceRegistration; - -/** - * - * OSGi service factory where service has configurable properties - * Only property injection is tested. ConfigurationAdmin is not used. - * - */ -public class OSGiStockQuoteFactoryImpl implements BundleActivator, ServiceFactory { - - - private BundleContext bundleContext; - - - public void start(BundleContext bc) throws Exception { - - bundleContext = bc; - - Hashtable props = new Hashtable(); - bc.registerService(StockQuote.class.getName(), this, props); - - } - - public void stop(BundleContext bc) throws Exception { - } - - - public Object getService(Bundle bundle, ServiceRegistration registration) { - return new OSGiStockQuoteImpl(bundleContext); - } - - - public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) { - - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java deleted file mode 100644 index f2ae804ad1..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package stockquote; - -import java.util.Dictionary; -import java.util.Hashtable; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.service.cm.Configuration; -import org.osgi.service.cm.ConfigurationAdmin; -import org.osoa.sca.annotations.Property; - -/** - * - * Stock quote with configurable properties. - * - */ -public class OSGiStockQuoteImpl implements StockQuote, BundleActivator { - - public String pid; - - @Property - public double exchangeRate; - - private String currency; - - private BundleContext bundleContext; - - public OSGiStockQuoteImpl() { - this.pid = "stockQuote"; - } - - protected OSGiStockQuoteImpl(BundleContext bc) { - this.bundleContext = bc; - } - - @Property - public void setCurrency(String currency) { - this.currency = currency; - } - - - private void checkProperties() throws Exception { - - if (exchangeRate == 2.0 && !"USD".equals(currency)) { - throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + - exchangeRate + " currency=" + currency); - } - - if (exchangeRate == 1.48 && !"EURO".equals(currency)) { - throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + - exchangeRate + " currency=" + currency); - } - - ServiceReference configAdminReference = bundleContext.getServiceReference("org.osgi.service.cm.ConfigurationAdmin"); - if (configAdminReference != null && pid != null ) { - - ConfigurationAdmin cm = (ConfigurationAdmin)bundleContext.getService(configAdminReference); - - Configuration config = cm.getConfiguration("stockQuote", null); - - Dictionary props = config.getProperties(); - - if (exchangeRate != (double)(Double)props.get("exchangeRate")) { - throw new Exception("Config Property exchangeRate not set correctly, expected " - + props.get("exchangeRate") + " got " + exchangeRate); - } - - if (!currency.equals(props.get("currency"))) { - throw new Exception("Config Property currency not set correctly, expected " - + props.get("currency") + " got " + currency); - } - } - - } - - public double getQuote(String ticker) throws Exception { - - checkProperties(); - - return 52.81 * exchangeRate; - - } - - public void start(BundleContext bc) throws Exception { - - bundleContext = bc; - - Hashtable props = new Hashtable(); - props.put("service.pid", "stockQuote"); - - bc.registerService(StockQuote.class.getName(), this, props); - - } - - public void stop(BundleContext bc) throws Exception { - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java deleted file mode 100644 index a47f68c579..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package stockquote; - -/** - * - * Stock Quote interface - * - */ -public interface StockQuote { - - public double getQuote(String ticker) throws Exception ; - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java deleted file mode 100644 index 25d7bcf2ff..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package supplychain; - - - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Hashtable; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; - - -/** - * This class implements the Customer service component. - */ -public class OSGiBundleImpl implements ServiceListener, BundleActivator { - - - String name; - - String[] references; - Class[] referenceClasses; - Field[] referenceFields; - String[] referenceFilters; - - Class myClass; - ArrayList serviceNames = new ArrayList(); - ArrayList serviceObjs = new ArrayList(); - ArrayList> serviceProperties = new ArrayList>(); - - - private BundleContext bundleContext; - - public OSGiBundleImpl() {} - - public OSGiBundleImpl(String[] references, String[] filters) { - - myClass = this.getClass(); - this.name = this.getClass().getSimpleName(); - this.references = references == null?new String[0] : references; - - - try { - referenceClasses = new Class[references.length]; - referenceFields = new Field[references.length]; - referenceFilters = new String[references.length]; - for (int i = 0; i < references.length; i++) { - referenceFields[i] = this.getClass().getDeclaredField(references[i]); - referenceFields[i].setAccessible(true); - referenceClasses[i] = referenceFields[i].getType(); - - if (filters != null && filters.length > i) - referenceFilters[i] = filters[i]; - } - - } catch (Exception e) { - throw new RuntimeException(e); - } - - } - - public void start(BundleContext bc) { - - System.out.println("Started bundle " + name); - - this.bundleContext = bc; - - boolean useSingleRegisterService = serviceNames.size() > 1; - for (int i = 1; i < serviceNames.size(); i++) { - if (serviceObjs.get(i) != serviceObjs.get(0) || - serviceProperties.get(i) != serviceProperties.get(0)) { - useSingleRegisterService = false; - break; - } - } - if (useSingleRegisterService) { - bundleContext.registerService(serviceNames.toArray(new String[serviceNames.size()]), - serviceObjs.get(0), serviceProperties.get(0)); - } - else { - for (int i = 0; i < serviceNames.size(); i++) { - bundleContext.registerService(serviceNames.get(i), serviceObjs.get(i), serviceProperties.get(i)); - } - } - - started(bc); - - for (int i = 0; i < references.length; i++) { - - try { - if (referenceFields[i].get(this) != null) - continue; - - ServiceReference[] refs = bundleContext.getServiceReferences(referenceClasses[i].getName(), referenceFilters[i]); - if (refs != null && refs.length > 0) { - Object obj = bundleContext.getService(refs[0]); - referenceFields[i].set(this, referenceClasses[i].cast(obj)); - } else { - String filter = "(objectclass=" + referenceClasses[i].getName() + ")"; - this.bundleContext.addServiceListener(this, filter); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - public void stop(BundleContext bc) { - System.out.println("Stop bundle " + name); - - } - - protected void started(BundleContext bc) { - - } - - public void serviceChanged(ServiceEvent event) { - try { - if (event.getType() == ServiceEvent.REGISTERED) { - - ServiceReference ref = event.getServiceReference(); - Object obj = bundleContext.getService(ref); - for (int i = 0; i < references.length; i++) { - if (referenceClasses[i].isAssignableFrom(obj.getClass())) { - referenceFields[i].set(this, referenceClasses[i].cast(obj)); - } - } - } - } catch (Throwable e) { - e.printStackTrace(); - } - } - - - public void registerService(Object serviceObject, String serviceName, Hashtable props) { - serviceObjs.add(serviceObject); - serviceNames.add(serviceName); - serviceProperties.add(props == null? new Hashtable() : props); - } -} - \ No newline at end of file diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java deleted file mode 100644 index 2762bc62be..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.customer; - -import org.osoa.sca.annotations.OneWay; - -/** - * This is the business interface of the Customer service component. - */ -public interface Customer { - - public void purchaseBooks(); - - public void purchaseGames(); - - public void purchaseGoods(); - - @OneWay - public void notifyShipment(String order); - - public boolean hasOutstandingOrders(); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java deleted file mode 100644 index 80346311b1..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.customer; - -import java.util.ArrayList; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.retailer.Retailer; - -/** - * This class implements the Customer service component. - */ -@Service(Customer.class) -@Scope("COMPOSITE") -public class JavaCustomerComponentImpl implements Customer { - - private Retailer retailer1; - - private Retailer retailer2; - - private Retailer retailer3; - - private static ArrayList outstandingOrders = new ArrayList(); - - @Reference - public void setRetailer1(Retailer retailer1) { - this.retailer1 = retailer1; - } - - @Reference - public void setRetailer2(Retailer retailer2) { - this.retailer2 = retailer2; - } - - @Reference - public void setRetailer3(Retailer retailer3) { - this.retailer3 = retailer3; - } - - public void purchaseBooks() { - System.out.println("JavaCustomerComponentImpl.purchaseBooks"); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)"); - retailer1.submitOrder("Order"); - } - - public void purchaseGames() { - System.out.println("JavaCustomerComponentImpl.purchaseGames"); - outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)"); - - retailer2.submitOrder("Order"); - } - - public void purchaseGoods() { - retailer3.submitOrder("Order"); - } - - public void notifyShipment(String order) { - outstandingOrders.remove(order); - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - public boolean hasOutstandingOrders() { - return outstandingOrders.size() != 0; - } - - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java deleted file mode 100644 index 9717025a4f..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.customer; - - -import java.util.ArrayList; - -import org.osgi.service.component.ComponentContext; - - -import supplychain.retailer.Retailer; - -/** - * This class implements the Customer service component. - */ -public class OSGiCustomerComponentImpl implements Customer { - - - private Retailer retailer1; - private Retailer retailer2; - private Retailer retailer3; - - private ArrayList outstandingOrders = new ArrayList(); - - public OSGiCustomerComponentImpl() { - System.out.println("Created OSGiCustomerComponentImpl " + this); - } - - protected void setRetailer1(Retailer retailer1) { - this.retailer1 = retailer1; - } - - protected void unsetRetailer1(Retailer retailer1) { - this.retailer1 = null; - } - - - protected void setRetailer2(Retailer retailer2) { - this.retailer2 = retailer2; - } - - protected void unsetRetailer2(Retailer retailer2) { - this.retailer2 = null; - } - - protected void setRetailer3(Retailer retailer2) { - this.retailer3 = retailer2; - } - - protected void unsetRetailer3(Retailer retailer2) { - this.retailer3 = null; - } - - public void purchaseBooks() { - System.out.println("OSGiCustomerComponentImpl.purchaseBooks"); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)"); - retailer1.submitOrder("Order"); - } - - public void purchaseGames() { - System.out.println("OSGiCustomerComponentImpl.purchaseGames"); - outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)"); - - retailer2.submitOrder("Order"); - } - - public void purchaseGoods() { - retailer3.submitOrder("Order"); - } - - public void notifyShipment(String order) { - outstandingOrders.remove(order); - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiCustomerComponentImpl bundle "); - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiCustomerComponentImpl bundle "); - } - - public boolean hasOutstandingOrders() { - return outstandingOrders.size() != 0; - } -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java deleted file mode 100644 index c8cb522cf4..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.customer; - - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceFactory; -import org.osgi.framework.ServiceRegistration; - -/** - * This class implements the Customer service component. - */ -public class OSGiCustomerFactoryImpl implements BundleActivator, ServiceFactory { - - private BundleContext bundleContext; - - public OSGiCustomerFactoryImpl() { - } - - - public void start(BundleContext bc) { - - this.bundleContext = bc; - bc.registerService(Customer.class.getName(), this, null); - } - - - - - public void stop(BundleContext context) throws Exception { - - } - - - public Object getService(Bundle bundle, ServiceRegistration registration) { - - OSGiCustomerImpl customer = new OSGiCustomerImpl(false); - customer.start(bundleContext); - return customer; - - } - - public void ungetService(Bundle bundle, ServiceRegistration registration, Object obj) { - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java deleted file mode 100644 index 546971860e..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.customer; - - -import java.util.ArrayList; - -import org.osoa.sca.annotations.AllowsPassByReference; - -import supplychain.OSGiBundleImpl; -import supplychain.retailer.Retailer; - -/** - * This class implements the Customer service component. - */ -@AllowsPassByReference -public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer { - - private ArrayList outstandingOrders = new ArrayList(); - - private Retailer retailer1; - private Retailer retailer2; - private Retailer retailer3; - - public OSGiCustomerImpl() { - super( new String[]{"retailer1", "retailer2", "retailer3"}, - new String[]{"(retailerName=amazon.com)", - "(retailerName=play.com)", - "(retailerName=ebay.com)" - }); - registerService(this, "supplychain.customer.Customer", null); - - } - - public OSGiCustomerImpl(boolean ignore) { // Used only to test service factories - super( new String[]{"retailer1", "retailer2", "retailer3"}, - new String[]{"(retailerName=amazon.com)", - "(retailerName=play.com)", - "(retailerName=ebay.com)" - }); - - } - - public void purchaseBooks() { - System.out.println("OSGiCustomerImpl.purchaseBooks, retailer is " + retailer1); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)"); - - retailer1.submitOrder("Order"); - - } - - public void purchaseGames() { - System.out.println("OSGiCustomerImpl.purchaseGames, retailer is " + retailer2); - outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)"); - - retailer2.submitOrder("Order"); - - } - - public void purchaseGoods() { - retailer3.submitOrder("Order"); - } - - public void notifyShipment(String order) { - - outstandingOrders.remove(order); - - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - public boolean hasOutstandingOrders() { - return outstandingOrders.size() != 0; - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java deleted file mode 100644 index 02862bc5f6..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.customer; - - -import java.util.ArrayList; - -import org.osgi.service.component.ComponentContext; - - -import supplychain.retailer.Retailer; -import supplychain.retailer.RetailerQuery; - -/** - * This class implements the Customer service component. - */ -public class OSGiCustomerWithQueryComponentImpl implements Customer { - - - private Retailer retailer; - private RetailerQuery retailerQuery; - - private static ArrayList outstandingOrders = new ArrayList(); - - public OSGiCustomerWithQueryComponentImpl() { - System.out.println("Created OSGiCustomerWithQueryComponentImpl " + this); - } - - protected void setRetailer(Retailer retailer) { - this.retailer = retailer; - } - - protected void unsetRetailer(Retailer retailer) { - this.retailer = null; - } - - - protected void setRetailerQuery(RetailerQuery retailerQuery) { - this.retailerQuery = retailerQuery; - } - - protected void unsetRetailerQuery(RetailerQuery retailerQuery) { - this.retailerQuery = null; - } - - public void purchaseBooks() { - System.out.println("OSGiCustomerWithQueryComponentImpl.purchaseBooks"); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)"); - - if (retailerQuery.isAvailable("Order")) - retailer.submitOrder("Order"); - } - - public void purchaseGames() { - System.out.println("OSGiCustomerWithQueryComponentImpl.purchaseGames"); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)"); - - if (retailerQuery.isAvailable("Order")) - retailer.submitOrder("Order"); - } - - public void purchaseGoods() { - if (retailerQuery.isAvailable("Order")) - retailer.submitOrder("Order"); - } - - public void notifyShipment(String order) { - outstandingOrders.remove(order); - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiCustomerWithQueryComponentImpl bundle "); - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiCustomerWithQueryComponentImpl bundle "); - } - - public boolean hasOutstandingOrders() { - return outstandingOrders.size() != 0; - } -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java deleted file mode 100644 index 18483817ad..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.customer; - - -import java.util.ArrayList; - -import supplychain.OSGiBundleImpl; -import supplychain.retailer.Retailer; -import supplychain.retailer.RetailerQuery; - -/** - * This class implements the Customer service component. - */ -public class OSGiCustomerWithQueryImpl extends OSGiBundleImpl implements Customer { - - private static ArrayList outstandingOrders = new ArrayList(); - - private Retailer retailer; - private RetailerQuery retailerQuery; - - public OSGiCustomerWithQueryImpl() { - super( new String[]{"retailer", "retailerQuery"}, - new String[]{"(component.service.name=RetailerComponent/Retailer)", - "(component.service.name=RetailerComponent/RetailerQuery)" - }); - registerService(this, "supplychain.customer.Customer", null); - - } - - public void purchaseBooks() { - System.out.println("OSGiCustomerWithQueryImpl.purchaseBooks"); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)"); - - if (retailerQuery.isAvailable("Order")) - retailer.submitOrder("Order"); - - } - - public void purchaseGames() { - System.out.println("OSGiCustomerWithQueryImpl.purchaseGames"); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)"); - - if (retailerQuery.isAvailable("Order")) - retailer.submitOrder("Order"); - - } - - public void purchaseGoods() { - if (retailerQuery.isAvailable("Order")) - retailer.submitOrder("Order"); - } - - public void notifyShipment(String order) { - - outstandingOrders.remove(order); - - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - public boolean hasOutstandingOrders() { - return outstandingOrders.size() != 0; - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java deleted file mode 100644 index 5ba42780f2..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.customer; - -import org.osoa.sca.annotations.Scope; - - -/** - * This class implements the Customer service component. - */ -@Scope("STATELESS") -public class OSGiStatelessCustomerComponentImpl extends OSGiCustomerComponentImpl { - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java deleted file mode 100644 index bc569d0ac0..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.customer; - - -import org.osoa.sca.annotations.Scope; - - -/** - * This class implements the Customer service component. - */ -@Scope("STATELESS") -public class OSGiStatelessCustomerImpl extends OSGiCustomerImpl { - - public OSGiStatelessCustomerImpl(boolean ignore) { - super(ignore); - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java deleted file mode 100644 index 599ab51a50..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.customer; - - -import java.util.ArrayList; -import java.util.Hashtable; - -import org.osgi.framework.BundleContext; - -import supplychain.OSGiBundleImpl; -import supplychain.retailer.Retailer; - -/** - * This class implements the Customer service component. - */ -public class OSGiVersionedCustomerImpl extends OSGiBundleImpl implements Customer { - - private static ArrayList outstandingOrders = new ArrayList(); - - private Retailer retailer1; - private Retailer retailer2; - private Retailer retailer3; - private int version; - - public OSGiVersionedCustomerImpl() { - super( new String[]{"retailer1", "retailer2", "retailer3"}, - new String[]{"(retailerName=amazon.com)", - "(retailerName=play.com)", - "(retailerName=ebay.com)" - }); - - } - - protected void started(BundleContext bc) { - - String jarFile = bc.getBundle().getLocation(); - if (jarFile.endsWith("1.jar")) version = 1; - else if (jarFile.endsWith("2.jar")) version = 2; - else version = 3; - - Hashtable props1 = new Hashtable(); - props1.put("component.name", "CustomerComponent" + version); - bc.registerService("supplychain.customer.Customer", this, props1); - - } - - public void purchaseBooks() { - System.out.println("OSGiVersionedCustomerImpl.purchaseBooks , retailer is " + retailer1); - outstandingOrders.add("Order, submitted (amazon.com v" + version + - "), fulfilled, shipped (ParcelForce)"); - - retailer1.submitOrder("Order"); - - } - - public void purchaseGames() { - System.out.println("OSGiCustomerImpl.purchaseGames"); - outstandingOrders.add("Order, submitted (play.com v" + version + - "), fulfilled, shipped (ParcelForce)"); - - retailer2.submitOrder("Order"); - - } - - public void purchaseGoods() { - retailer3.submitOrder("Order"); - } - - public void notifyShipment(String order) { - - outstandingOrders.remove(order); - - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - public boolean hasOutstandingOrders() { - return outstandingOrders.size() != 0; - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java deleted file mode 100644 index df52c6c760..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.retailer; - - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.warehouse.Warehouse; - -/** - * This class implements the Customer service component. - */ -@Service(Retailer.class) -@Scope("COMPOSITE") -public class JavaRetailerComponentImpl implements Retailer { - - private Warehouse warehouse; - - private String retailerName; - - public JavaRetailerComponentImpl() { - System.out.println("Created RetailerComponentImpl"); - } - - @Reference - public void setWarehouse(Warehouse warehouse) { - System.out.println("retailer setWarehouse " + warehouse); - - this.warehouse = warehouse; - } - - @Property - public void setRetailerName(String retailerName) { - this.retailerName = retailerName; - } - - - public void submitOrder(String order) { - - System.out.println("JavaRetailerComponentImpl.submitOrder " + warehouse); - warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")"); - - } - - - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java deleted file mode 100644 index d4374e4315..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.retailer; - -import org.osgi.service.component.ComponentContext; - -import supplychain.warehouse.Warehouse; - -/** - * This class implements the Customer service component. - */ -public class OSGiRetailerComponentImpl implements Retailer { - - private Warehouse warehouse; - private String retailerName; - - - protected void setWarehouse(Warehouse warehouse) { - this.warehouse = warehouse; - } - - protected void unsetWarehouse(Warehouse warehouse) { - this.warehouse = null; - } - - public void submitOrder(String order) { - - System.out.println("OSGiRetailerComponentImpl.submitOrder , warehouse is " + warehouse); - warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")"); - - } - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiRetailerComponentImpl bundle "); - - Object prop = context.getProperties().get("retailerName"); - if (prop instanceof String[]) - retailerName = ((String [])prop)[0]; - - - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiRetailerComponentImpl bundle "); - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java deleted file mode 100644 index e71c624f49..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.retailer; - - -import java.util.Hashtable; - -import supplychain.OSGiBundleImpl; -import supplychain.warehouse.Warehouse; - -/** - * This class implements the Retailer service component. - */ -public class OSGiRetailerImpl extends OSGiBundleImpl { - - protected Warehouse warehouse; - - public OSGiRetailerImpl() { - - super(new String[]{"warehouse"}, - new String[]{"(component.service.name=WarehouseComponent1/Warehouse)"}); - - Hashtable props1 = new Hashtable(); - props1.put("retailerName", "amazon.com"); - registerService(new OSGiRetailerServiceImpl(this, "amazon.com"), - "supplychain.retailer.Retailer", props1); - - Hashtable props2 = new Hashtable(); - props2.put("retailerName", "play.com"); - registerService( - new OSGiRetailerServiceImpl(this, "play.com"), - "supplychain.retailer.Retailer", props2); - - Hashtable props3 = new Hashtable(); - props3.put("retailerName", "ebay.com"); - registerService( - new OSGiRetailerServiceImpl(this, "ebay.com"), - "supplychain.retailer.Retailer", props3); - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java deleted file mode 100644 index a036ecfc76..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.retailer; - - -/** - * This class implements the Retailer service. - */ -public class OSGiRetailerServiceImpl implements Retailer { - - private OSGiRetailerImpl retailerImpl; - - private String retailerName; - - OSGiRetailerServiceImpl(OSGiRetailerImpl retailerImpl, String retailerName) { - this.retailerImpl = retailerImpl; - this.retailerName = retailerName; - - } - - public void submitOrder(String order) { - - System.out.println("Retailer.submitOrder, warehouse is " + retailerImpl.warehouse); - retailerImpl.warehouse.fulfillOrder(order + ", submitted (" - + retailerName + ")"); - - } - -} \ No newline at end of file diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java deleted file mode 100644 index 278a439540..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.retailer; - -import org.osgi.service.component.ComponentContext; - -import supplychain.warehouse.Warehouse; -import supplychain.warehouse.WarehouseQuery; - -/** - * This class implements the Customer service component. - */ -public class OSGiRetailerWithQueryComponentImpl implements Retailer, RetailerQuery { - - private Warehouse warehouse; - private WarehouseQuery warehouseQuery; - private String retailerName; - - - protected void setWarehouse(Warehouse warehouse) { - this.warehouse = warehouse; - } - - protected void unsetWarehouse(Warehouse warehouse) { - this.warehouse = null; - } - - protected void setWarehouseQuery(WarehouseQuery warehouseQuery) { - this.warehouseQuery = warehouseQuery; - } - - protected void unsetWarehouseQuery(WarehouseQuery warehouse) { - this.warehouseQuery = null; - } - - public void submitOrder(String order) { - - System.out.println("OSGiRetailerComponentImpl.submitOrder , warehouse is " + warehouse); - warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")"); - - } - - public boolean isAvailable(String order) { - return warehouseQuery.isAvailable(order); - } - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiRetailerComponentImpl bundle "); - - Object prop = context.getProperties().get("retailerName"); - if (prop instanceof String[]) - retailerName = ((String [])prop)[0]; - - - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiRetailerComponentImpl bundle "); - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java deleted file mode 100644 index ee1f575e70..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.retailer; - - -import java.util.Hashtable; - -import supplychain.OSGiBundleImpl; -import supplychain.warehouse.Warehouse; -import supplychain.warehouse.WarehouseQuery; - -/** - * This class implements the Retailer service component with query. - */ -public class OSGiRetailerWithQueryImpl extends OSGiBundleImpl implements Retailer, RetailerQuery { - - private Warehouse warehouse; - private WarehouseQuery warehouseQuery; - - public OSGiRetailerWithQueryImpl() { - - super(new String[]{"warehouse", "warehouseQuery"}, null); - - Hashtable props1 = new Hashtable(); - props1.put("retailerName", "amazon.com"); - registerService(this, - "supplychain.retailer.Retailer", props1); - - registerService(this, - "supplychain.retailer.RetailerQuery", props1); - - } - - public void submitOrder(String order) { - - System.out.println("Retailer.submitOrder, warehouse is " + warehouse); - warehouse.fulfillOrder(order + ", submitted (" - + "amazon.com" + ")"); - - } - - public boolean isAvailable(String order) { - return warehouseQuery.isAvailable(order); - } - - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java deleted file mode 100644 index 09e60ca626..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.retailer; - - -import java.util.Hashtable; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceReference; - -import supplychain.OSGiBundleImpl; -import supplychain.warehouse.Warehouse; - -/** - * This class implements the Retailer service component. - */ -public class OSGiVersionedRetailerImpl extends OSGiBundleImpl { - - protected Warehouse warehouse; - - private int version; - - public OSGiVersionedRetailerImpl() { - - super(new String[]{"warehouse"}, null); - - - } - - protected void started(BundleContext bc) { - String jarFile = bc.getBundle().getLocation(); - if (jarFile.endsWith("1.jar")) version = 1; - else if (jarFile.endsWith("2.jar")) version = 2; - else version = 3; - - Hashtable props1 = new Hashtable(); - props1.put("retailerName", "amazon.com"); - bc.registerService("supplychain.retailer.Retailer", - new OSGiVersionedRetailerServiceImpl(this, "amazon.com", version), - props1); - - Hashtable props2 = new Hashtable(); - props2.put("retailerName", "play.com"); - bc.registerService( - "supplychain.retailer.Retailer", - new OSGiVersionedRetailerServiceImpl(this, "play.com", version), - props2); - - try { - ServiceReference[] refs = bc.getServiceReferences(Warehouse.class.getName(), - "(component.service.name=WarehouseComponent" + version + "/Warehouse)"); - if (refs != null && refs.length > 0) { - warehouse = (Warehouse) bc.getService(refs[0]); - } - } catch (InvalidSyntaxException e) { - } - } -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java deleted file mode 100644 index 7dd70889c7..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.retailer; - - -/** - * This class implements the Retailer service. - */ -public class OSGiVersionedRetailerServiceImpl implements Retailer { - - private OSGiVersionedRetailerImpl retailerImpl; - - private String retailerName; - - private int version; - - OSGiVersionedRetailerServiceImpl(OSGiVersionedRetailerImpl retailerImpl, String retailerName, int version) { - this.retailerImpl = retailerImpl; - this.retailerName = retailerName; - this.version = version; - } - - public void submitOrder(String order) { - - System.out.println("Retailer.submitOrder, warehouse is " + retailerImpl.warehouse); - retailerImpl.warehouse.fulfillOrder(order + ", submitted (" - + retailerName + " v" + version + ")"); - - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java deleted file mode 100644 index 1e87d59af1..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.retailer; - -/** - * This is the business interface of the Retailer service component. - */ -public interface Retailer { - - public void submitOrder(String order); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java deleted file mode 100644 index 354f40a064..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.retailer; - -/** - * This is the business interface of the RetailerQuery service. - */ -public interface RetailerQuery { - - public boolean isAvailable(String order); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java deleted file mode 100644 index d0cf43a960..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.shipper; - - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.customer.Customer; - -/** - * This class implements the Shipper service component. - */ -@Service(Shipper.class) -@Scope("COMPOSITE") -public class JavaShipperComponentImpl implements Shipper { - - private Customer customer; - - private String shipperName; - - @Reference - public void setCustomer(Customer customer) { - this.customer = customer; - } - - @Property - public void setShipperName(String shipperName) { - this.shipperName = shipperName; - } - - - - public void processShipment(String order) { - System.out.println("JavaShipperComponentImpl.processShipment"); - customer.notifyShipment(order + ", shipped (" + shipperName + ")"); - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java deleted file mode 100644 index f3a98be77b..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.shipper; - - -import org.osgi.service.component.ComponentContext; - -import supplychain.customer.Customer; - -/** - * This class implements the Shipper service component. - */ -public class OSGiShipperComponentImpl implements Shipper { - - private Customer customer; - private String shipperName; - - protected void setCustomer(Customer customer) { - this.customer = customer; - } - - protected void unsetCustomer(Customer customer) { - this.customer = null; - } - - public void processShipment(String order) { - System.out.println("OSGiShipperComponentImpl.processShipment, customer is " + customer); - customer.notifyShipment(order + ", shipped (" + shipperName + ")"); - } - - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiShipperComponentImpl bundle "); - - Object prop = context.getProperties().get("shipperName"); - if (prop instanceof String[]) - shipperName = ((String [])prop)[0]; - - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiShipperComponentImpl bundle "); - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java deleted file mode 100644 index ef989d6fcf..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.shipper; - - -import java.util.Hashtable; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceFactory; -import org.osgi.framework.ServiceRegistration; - - -/** - * This class implements the Shipper service component. - */ -public class OSGiShipperFactoryImpl implements BundleActivator, ServiceFactory { - - private BundleContext bundleContext; - - public OSGiShipperFactoryImpl() { - - } - - - public void start(BundleContext bc) { - - this.bundleContext = bc; - - Hashtable props1 = new Hashtable(); - props1.put("shipperName", "RoyalMail"); - bc.registerService(Shipper.class.getName(), this, props1); - - Hashtable props2 = new Hashtable(); - props2.put("shipperName", "ParcelForce"); - bc.registerService(Shipper.class.getName(), this, props2); - } - - - - - public void stop(BundleContext context) throws Exception { - - } - - - public Object getService(Bundle bundle, ServiceRegistration reg) { - OSGiShipperImpl shipper = new OSGiShipperImpl(false); - shipper.start(bundleContext); - OSGiStatelessShipperServiceImpl shipperService = new OSGiStatelessShipperServiceImpl(shipper, - (String)reg.getReference().getProperty("shipperName")); - return shipperService; - } - - public void ungetService(Bundle arg0, ServiceRegistration arg1, Object arg2) { - - } - - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java deleted file mode 100644 index effae8c246..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.shipper; - - -import java.util.Hashtable; - -import supplychain.OSGiBundleImpl; -import supplychain.customer.Customer; - -/** - * This class implements the Shipper service component. - */ -public class OSGiShipperImpl extends OSGiBundleImpl { - - protected Customer customer; - - - public OSGiShipperImpl() { - - super(new String[]{"customer"}, null); - - Hashtable props1 = new Hashtable(); - props1.put("shipperName", "RoyalMail"); - registerService(new OSGiShipperServiceImpl(this, "RoyalMail"), - "supplychain.shipper.Shipper", props1); - - Hashtable props2 = new Hashtable(); - props2.put("shipperName", "ParcelForce"); - registerService( - new OSGiShipperServiceImpl(this, "ParcelForce"), - "supplychain.shipper.Shipper", props2); - } - - // Used only by service factories - public OSGiShipperImpl(boolean ignore) { - - super(new String[]{"customer"}, null); - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java deleted file mode 100644 index 4effadf208..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.shipper; - - -/** - * This class implements the Shipper service. - */ -public class OSGiShipperServiceImpl implements Shipper { - - private OSGiShipperImpl shipperImpl; - - private String shipperName; - - OSGiShipperServiceImpl(OSGiShipperImpl shipperImpl, String shipperName) { - this.shipperImpl = shipperImpl; - this.shipperName = shipperName; - } - - public void processShipment(String order) { - - System.out.println("Shipper.submitOrder, warehouse is " + shipperImpl.customer); - shipperImpl.customer.notifyShipment(order + ", shipped (" + shipperName + ")"); - - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java deleted file mode 100644 index 13bce67bb4..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.shipper; - -import org.osoa.sca.annotations.Scope; - - -/** - * This class implements the Shipper service component. - */ -@Scope("STATELESS") -public class OSGiStatelessShipperComponentImpl extends OSGiShipperComponentImpl { - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java deleted file mode 100644 index 071a131f40..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.shipper; - -import org.osoa.sca.annotations.Scope; - - -/** - * This class implements the Shipper service. - */ -@Scope("STATELESS") -public class OSGiStatelessShipperServiceImpl extends OSGiShipperServiceImpl { - - public OSGiStatelessShipperServiceImpl(OSGiShipperImpl shipperImpl, String shipperName) { - super(shipperImpl, shipperName); - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java deleted file mode 100644 index 6ebd1f2894..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.shipper; - - -import java.util.Hashtable; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceReference; - -import supplychain.OSGiBundleImpl; -import supplychain.customer.Customer; - -/** - * This class implements the Shipper service component. - */ -public class OSGiVersionedShipperImpl extends OSGiBundleImpl { - - protected Customer customer; - - private int version; - - - public OSGiVersionedShipperImpl() { - - super(new String[]{"customer"}, null); - } - - protected void started(BundleContext bc) { - - String jarFile = bc.getBundle().getLocation(); - if (jarFile.endsWith("1.jar")) version = 1; - else if (jarFile.endsWith("2.jar")) version = 2; - - - Hashtable props1 = new Hashtable(); - props1.put("shipperName", "RoyalMail"); - props1.put("component.service.name", "ShipperComponent"+version+"/ShipperService1"); - bc.registerService("supplychain.shipper.Shipper", - new OSGiVersionedShipperServiceImpl(this, "RoyalMail", version), - props1); - - Hashtable props2 = new Hashtable(); - props2.put("shipperName", "ParcelForce"); - props2.put("component.service.name", "ShipperComponent"+version+"/ShipperService2"); - bc.registerService("supplychain.shipper.Shipper", - new OSGiVersionedShipperServiceImpl(this, "ParcelForce", version), - props2); - - try { - ServiceReference[] refs = bc.getServiceReferences(Customer.class.getName(), - "(component.service.name=CustomerComponent" + version + "/CustomerService)"); - if (refs != null && refs.length > 0) { - customer = (Customer) bc.getService(refs[0]); - } - } catch (InvalidSyntaxException e) { - } - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java deleted file mode 100644 index b66961b1c2..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.shipper; - - -/** - * This class implements the Shipper service. - */ -public class OSGiVersionedShipperServiceImpl implements Shipper { - - private OSGiVersionedShipperImpl shipperImpl; - - private String shipperName; - - private int version; - - OSGiVersionedShipperServiceImpl(OSGiVersionedShipperImpl shipperImpl, String shipperName, int version) { - this.shipperImpl = shipperImpl; - this.shipperName = shipperName; - this.version = version; - } - - public void processShipment(String order) { - - System.out.println("Shipper.processShipment, version " + version + " customer is " + shipperImpl.customer); - shipperImpl.customer.notifyShipment(order + ", shipped (" + shipperName + ")"); - - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java deleted file mode 100644 index 2514928c10..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.shipper; - -/** - * This is the business interface of the Shipper service component. - */ -public interface Shipper { - - public void processShipment(String order); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java deleted file mode 100644 index 9edf3567e5..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.warehouse; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.shipper.Shipper; - -/** - * This class implements the Warehouse service component. - */ -@Service(Warehouse.class) -@Scope("STATELESS") -public class JavaWarehouseComponentImpl implements Warehouse { - - private Shipper shipper; - - @Reference - public void setShipper(Shipper shipper) { - this.shipper = shipper; - } - - public void fulfillOrder(String order) { - System.out.println("JavaWarehouseComponentImpl.fulfillOrder : shipper is " + shipper); - - shipper.processShipment(order + ", fulfilled"); - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java deleted file mode 100644 index 659f16be7f..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.warehouse; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.shipper.Shipper; - -/** - * This class implements the Warehouse service component. - */ -@Service(interfaces={Warehouse.class, WarehouseQuery.class}) -@Scope("COMPOSITE") -public class JavaWarehouseWithQueryComponentImpl implements Warehouse, WarehouseQuery { - - private Shipper shipper; - - @Reference - public void setShipper(Shipper shipper) { - this.shipper = shipper; - } - - public void fulfillOrder(String order) { - System.out.println("JavaWarehouseComponentImpl.fulfillOrder : shipper is " + shipper); - - shipper.processShipment(order + ", fulfilled"); - } - - public boolean isAvailable(String order) { - return true; - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java deleted file mode 100644 index dd283bf779..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.warehouse; - - -import org.osgi.service.component.ComponentContext; - -import supplychain.shipper.Shipper; - -/** - * This class implements the Warehouse service component. - */ - -public class OSGiWarehouseComponentImpl implements Warehouse { - - private Shipper shipper; - - protected void setShipper(Shipper shipper) { - this.shipper = shipper; - } - - protected void unsetShipper(Shipper shipper) { - this.shipper = null; - } - - public void fulfillOrder(String order) { - System.out.println("OSGiWarehouseComponentImpl.fulfillOrder : shipper is " + shipper); - - shipper.processShipment(order + ", fulfilled"); - - } - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiWarehouseComponentImpl "); - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiWarehouseComponentImpl "); - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java deleted file mode 100644 index bb04ff42e0..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.warehouse; - - -import java.util.Hashtable; - -import org.osgi.framework.BundleContext; - -import supplychain.OSGiBundleImpl; -import supplychain.shipper.Shipper; - -/** - * This class implements the Warehouse service component. - */ - -public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse { - - protected Shipper shipper; - private OSGiWarehouseServiceImpl warehouseService1; - private OSGiWarehouseServiceImpl warehouseService2; - - public OSGiWarehouseImpl() { - super(new String[]{"shipper"}, null); - - Hashtable props1 = new Hashtable(); - props1.put("component.name", "WarehouseComponent1"); - warehouseService1 = new OSGiWarehouseServiceImpl(this, 2); - registerService(warehouseService1, - "supplychain.warehouse.Warehouse", props1); - - Hashtable props2 = new Hashtable(); - props2.put("component.name", "WarehouseComponent2"); - warehouseService2 = new OSGiWarehouseServiceImpl(this, 1); - registerService(warehouseService2, - "supplychain.warehouse.Warehouse", props2); - } - - protected void started(BundleContext bc) { - warehouseService1.started(bc); - warehouseService2.started(bc); - } - - public void fulfillOrder(String order) { - System.out.println("OSGiWarehouseImpl.fulfillOrder : shipper is " + shipper); - - shipper.processShipment(order + ", fulfilled"); - - } - - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java deleted file mode 100644 index 3317816557..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.warehouse; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceReference; - -import supplychain.shipper.Shipper; - - -/** - * This class implements the Warehouse service. - */ -public class OSGiWarehouseServiceImpl implements Warehouse { - - private OSGiWarehouseImpl warehouseImpl; - private Shipper shipper; - private int shipperNum; - - - OSGiWarehouseServiceImpl(OSGiWarehouseImpl warehouseImpl, int shipperNum) { - this.warehouseImpl = warehouseImpl; - this.shipperNum = shipperNum; - } - - - protected void started(BundleContext bc) { - try { - ServiceReference[] refs = bc.getServiceReferences(Shipper.class.getName(), - "(component.service.name=ShipperComponent" + shipperNum + "/Shipper)"); - if (refs != null && refs.length > 0) { - shipper = (Shipper) bc.getService(refs[0]); - } - } catch (InvalidSyntaxException e) { - } - } - - public void fulfillOrder(String order) { - System.out.println("OSGiWarehouseImpl.fulfillOrder : shipper is " + warehouseImpl.shipper); - - shipper.processShipment(order + ", fulfilled"); - - } - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java deleted file mode 100644 index 6f1f6b8730..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.warehouse; - -/** - * This is the business interface of the Warehouse service component. - */ -public interface Warehouse { - - public void fulfillOrder(String order); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java deleted file mode 100644 index 6d1ad76796..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package supplychain.warehouse; - -/** - * This is the business interface of the RetailerQuery service. - */ -public interface WarehouseQuery { - - public boolean isAvailable(String order); - -} diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt deleted file mode 100644 index 0084319535..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, serviceDefinition marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/NOTICE b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/NOTICE deleted file mode 100644 index d83ebbe236..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/NOTICE +++ /dev/null @@ -1,14 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2006 The Apache Software Foundation - -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/README.txt b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/README.txt deleted file mode 100644 index 9b26d1690a..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/README.txt +++ /dev/null @@ -1,35 +0,0 @@ -Apache Tuscany M1 build (May, 2006) -=================================== - -http://incubator.apache.org/tuscany/ - -Tuscany is an effort undergoing incubation at the Apache Software Foundation -(ASF), sponsored by the Web Services PMC. - -Incubation is required of all newly accepted projects until a further review -indicates that the infrastructure, communications, and decision making process -have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness or -stability of the code, it does indicate that the project has yet to be fully -endorsed by the ASF. - - -Support -------- - -Any problem with this release can be reported to the Tuscany mailing list -or in the JIRA issue tracker. - -Mailing list subscription: - tuscany-dev-subscribe@ws.apache.org - -Jira: - http://issues.apache.org/jira/browse/Tuscany - - -Thank you for using Tuscany! - - -The Tuscany Team. - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 2d345390b7..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType deleted file mode 100644 index 71e248590b..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType deleted file mode 100644 index 7c1125bbb5..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite deleted file mode 100644 index 8456b878f2..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - CallbackClient - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite deleted file mode 100644 index d5a47c6403..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - CallbackClient - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite deleted file mode 100644 index e6391d2159..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType deleted file mode 100644 index c79ede815b..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType deleted file mode 100644 index 04cc73b85c..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType deleted file mode 100644 index 9ece700efe..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite deleted file mode 100644 index 52bc43478d..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - ConversationalStatelessClientStatelessService - - - ConversationalReferenceClient - - - ConversationalServiceStateless - - - ConversationalStatelessClientStatelessService - - - - - - - - - - - - - - - ConversationalStatelessClientStatefulService - - - ConversationalReferenceClient - - - ConversationalServiceStateful - - - ConversationalStatelessClientStatefulService - - - - - - - - - - - - - ConversationalStatefulClientStatelessService - - - ConversationalReferenceClient - - - ConversationalServiceStateless - - - ConversationalStatefulClientStatelessService - - - - - - - - - - - - - - ConversationalStatefulClientStatefulService - - - ConversationalReferenceClient - - - ConversationalServiceStateful - - - ConversationalStatefulClientStatefulService - - - - - - - - - - - - - - - - - - - - - ConversationalServiceStateful - - - - - - - - - - - - ConversationalServiceStateless - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Customer.componentType deleted file mode 100644 index 1fd551be3b..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Customer.componentType +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType deleted file mode 100644 index 5599c44bc3..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - default - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType deleted file mode 100644 index 8743f8c145..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - default - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType deleted file mode 100644 index d349edf265..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType deleted file mode 100644 index 1fd551be3b..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType deleted file mode 100644 index 5599c44bc3..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - default - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType deleted file mode 100644 index 8743f8c145..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - default - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType deleted file mode 100644 index d349edf265..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite deleted file mode 100644 index 0b8d2e5851..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - amazon.com - - - - - - amazon.com - - - - - - play.com - - - - - play.com - - - - - - ebay.com - - - - - ebay.com - - - - - - - - - - - - - - - - - - - - - RoyalMail - - - - - RoyalMail - - - - - - - ParcelForce - - - - - ParcelForce - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/factory-test.composite deleted file mode 100644 index 87370a6df4..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/factory-test.composite +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - amazon.com - - - - - - amazon.com - - - - - - play.com - - - - - play.com - - - - - - ebay.com - - - - - ebay.com - - - - - - - - - - - - - - - - - - - - - ParcelForce - - - - - ParcelForce - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType deleted file mode 100644 index 127349eacf..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType deleted file mode 100644 index 7e3810c458..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType deleted file mode 100644 index fb9a112d18..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType deleted file mode 100644 index ee732b5efc..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - default - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType deleted file mode 100644 index 8743f8c145..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - default - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType deleted file mode 100644 index b1723660d7..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType deleted file mode 100644 index fb9a112d18..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType deleted file mode 100644 index ee732b5efc..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - default - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType deleted file mode 100644 index 8743f8c145..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - default - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType deleted file mode 100644 index b1723660d7..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite deleted file mode 100644 index 5172cbe21e..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite deleted file mode 100644 index b7591e732d..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf deleted file mode 100644 index cf8717fcf5..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf deleted file mode 100644 index 785212fa6d..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf deleted file mode 100644 index 7a06030e32..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf deleted file mode 100644 index 5c39b53b0a..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf deleted file mode 100644 index b8bb809319..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf deleted file mode 100644 index 26f32fe617..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf deleted file mode 100644 index 1b9e0e847e..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf deleted file mode 100644 index 6066a38f29..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf deleted file mode 100644 index 777edd3f7d..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml deleted file mode 100644 index d8adaa2ba3..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf deleted file mode 100644 index e0bd9d8c10..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml deleted file mode 100644 index 6005ae785c..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - amazon.com - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml deleted file mode 100644 index 6f0b79ebc2..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - play.com - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf deleted file mode 100644 index d4b461460e..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml deleted file mode 100644 index bb15e6e3aa..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - RoyalMail - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml deleted file mode 100644 index 7591201b8c..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - ParcelForce - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf deleted file mode 100644 index 0e844fab99..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml deleted file mode 100644 index fc86a76784..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf deleted file mode 100644 index a8a87c5c8c..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf deleted file mode 100644 index 05bbf4db88..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf deleted file mode 100644 index a12d1a21ea..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf deleted file mode 100644 index 2214db11a6..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml deleted file mode 100644 index 8d44067992..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf deleted file mode 100644 index 60c0fb3fd3..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml deleted file mode 100644 index ca1392d2b8..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - amazon.com - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf deleted file mode 100644 index 7c9f67c36d..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml deleted file mode 100644 index 760c761666..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - RoyalMail - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf deleted file mode 100644 index 7d56770311..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf deleted file mode 100644 index 321bdc713f..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf deleted file mode 100644 index 66f98011cb..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf deleted file mode 100644 index 6874a66db9..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf deleted file mode 100644 index 47d290eb1a..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml deleted file mode 100644 index c7f13a50a7..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - GBP - 1.0 - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf deleted file mode 100644 index f4c102c4f0..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml deleted file mode 100644 index cbebf7eec2..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - GBP - 1.0 - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf deleted file mode 100644 index fc762df8d5..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf deleted file mode 100644 index 02e42bc010..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf deleted file mode 100644 index 390367b99b..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf deleted file mode 100644 index 4715cbd976..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf deleted file mode 100644 index 932fb8a483..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml deleted file mode 100644 index b10d0416dc..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf deleted file mode 100644 index c799f31606..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml deleted file mode 100644 index db68d7e333..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - amazon.com - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml deleted file mode 100644 index 1aea3cf669..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - play.com - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf deleted file mode 100644 index 106bd1b6aa..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml deleted file mode 100644 index 1e3c915a59..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - RoyalMail - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml deleted file mode 100644 index d7d0b41f5e..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - ParcelForce - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf deleted file mode 100644 index 81c51e6804..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml deleted file mode 100644 index ca50b554df..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml deleted file mode 100644 index 14658127f8..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf deleted file mode 100644 index 335bc419c1..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf deleted file mode 100644 index a68b9d6dbb..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf deleted file mode 100644 index 02f79c15f3..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf deleted file mode 100644 index 8428b08d96..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf deleted file mode 100644 index c81bf00d00..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf deleted file mode 100644 index 61c161617c..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf deleted file mode 100644 index fd6a26a65f..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf deleted file mode 100644 index 0168bc2435..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf deleted file mode 100644 index 6674cdd7f2..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf deleted file mode 100644 index 72df35ef41..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml deleted file mode 100644 index 724c8132df..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml deleted file mode 100644 index 1e5035d949..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf deleted file mode 100644 index 85bfd86422..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml deleted file mode 100644 index 6e51b3d6f2..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - amazon.com - 1 - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml deleted file mode 100644 index 9a87758ec2..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - amazon.com - 2 - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf deleted file mode 100644 index e134bd1061..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml deleted file mode 100644 index c19895bab1..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - play.com - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml deleted file mode 100644 index 707609d2c4..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - play.com - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf deleted file mode 100644 index e084e5831a..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml deleted file mode 100644 index d96f6481fb..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - RoyalMail - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml deleted file mode 100644 index 10ef690c9b..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - RoyalMail - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf deleted file mode 100644 index 003f9dca5a..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml deleted file mode 100644 index fefdea106d..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - ParcelForce - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml deleted file mode 100644 index f6b847ed59..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - ParcelForce - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf deleted file mode 100644 index 5cff2f573e..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml deleted file mode 100644 index ca50b554df..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml deleted file mode 100644 index 14658127f8..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf deleted file mode 100644 index 0fec68a725..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml deleted file mode 100644 index ca50b554df..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml deleted file mode 100644 index 14658127f8..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf deleted file mode 100644 index 678014d48d..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf deleted file mode 100644 index f0090fb52b..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf deleted file mode 100644 index 0b50923a05..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf deleted file mode 100644 index 1000a5f974..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf deleted file mode 100644 index 4e392a9ff1..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml deleted file mode 100644 index b10d0416dc..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf deleted file mode 100644 index 788ec4f19a..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml deleted file mode 100644 index 1ba16d0693..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - amazon.com - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml deleted file mode 100644 index a55ebd02a8..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - play.com - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf deleted file mode 100644 index e7459360e6..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml deleted file mode 100644 index d518ecab62..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - RoyalMail - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml deleted file mode 100644 index d7d0b41f5e..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - ParcelForce - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf deleted file mode 100644 index 880304187b..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml deleted file mode 100644 index d72db04425..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml deleted file mode 100644 index f9c1218f82..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf deleted file mode 100644 index d8e4c1cb7e..0000000000 --- a/branches/sca-java-1.0.1/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/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType deleted file mode 100644 index a6de268bf6..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite deleted file mode 100644 index 660e277693..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType deleted file mode 100644 index 5e0965d047..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - GBP - 1.0 - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType deleted file mode 100644 index 5e0965d047..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - GBP - 1.0 - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType deleted file mode 100644 index 5e0965d047..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - GBP - 1.0 - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType deleted file mode 100644 index 5e0965d047..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - GBP - 1.0 - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite deleted file mode 100644 index 02ae93aec2..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - stockQuote - - - - USD - 2.0 - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite deleted file mode 100644 index c94504f07d..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - stockQuote - - - - USD - 2.0 - - - - - - - - stockQuote - - - - EURO - 1.48 - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite deleted file mode 100644 index fea03404fd..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - stockQuote - - - - USD - 2.0 - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite deleted file mode 100644 index 3c425fcbc9..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - USD - 2.0 - - - - - - - - - - EURO - 1.48 - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Customer.componentType deleted file mode 100644 index 7bcdc6a2bb..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Customer.componentType +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Retailer.componentType deleted file mode 100644 index eadb539ea5..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Retailer.componentType +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Shipper.componentType deleted file mode 100644 index 532293b03f..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Shipper.componentType +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType deleted file mode 100644 index d349edf265..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType deleted file mode 100644 index 7bcdc6a2bb..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType deleted file mode 100644 index eadb539ea5..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType deleted file mode 100644 index 532293b03f..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType deleted file mode 100644 index d349edf265..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite deleted file mode 100644 index c144a1bc18..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - - - - - RoyalMail - - - ParcelForce - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/services-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/services-test.composite deleted file mode 100644 index 64f3b30f88..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/services-test.composite +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - - - - - RoyalMail - - - ParcelForce - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType deleted file mode 100644 index 0b0aa0912b..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - GBP - 1.0 - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Customer1.componentType deleted file mode 100644 index 7bcdc6a2bb..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Customer1.componentType +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Customer2.componentType deleted file mode 100644 index 7bcdc6a2bb..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Customer2.componentType +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType deleted file mode 100644 index eadb539ea5..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType deleted file mode 100644 index eadb539ea5..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType deleted file mode 100644 index 532293b03f..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType deleted file mode 100644 index 532293b03f..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType deleted file mode 100644 index d349edf265..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType deleted file mode 100644 index d349edf265..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType deleted file mode 100644 index 7bcdc6a2bb..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType deleted file mode 100644 index 7bcdc6a2bb..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType deleted file mode 100644 index eadb539ea5..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType deleted file mode 100644 index eadb539ea5..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType deleted file mode 100644 index 532293b03f..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType deleted file mode 100644 index 532293b03f..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType deleted file mode 100644 index d349edf265..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType deleted file mode 100644 index d349edf265..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite deleted file mode 100644 index 877d0de1c9..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - CustomerComponent1 - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - - - - - CustomerComponent2 - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - WarehouseComponent1/Warehouse - - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - WarehouseComponent2/Warehouse - - - - - - - - - - - - - - - - - - - - - - - - RoyalMail - ShipperComponent1.ShipperService1 - - - ParcelForce - ShipperComponent1.ShipperService2 - - - CustomerComponent1 - - - - - - - - - - - RoyalMail - ShipperComponent2.ShipperService1 - - - ParcelForce - ShipperComponent2.ShipperService2 - - - CustomerComponent2 - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/version-test.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/version-test.composite deleted file mode 100644 index bbb397ee70..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/version-test.composite +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - WarehouseComponent2/Warehouse - - - - - - - - - - - - - - - - - - - - - - - - RoyalMail - - - ParcelForce - - - CustomerComponent1 - - - - - - - - - - - RoyalMail - - - ParcelForce - - - CustomerComponent2 - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType deleted file mode 100644 index 1fd551be3b..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType deleted file mode 100644 index 5599c44bc3..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - default - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType deleted file mode 100644 index 8743f8c145..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - default - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType deleted file mode 100644 index d349edf265..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType deleted file mode 100644 index 1fd551be3b..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType deleted file mode 100644 index 5599c44bc3..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - default - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType deleted file mode 100644 index 8743f8c145..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - default - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType deleted file mode 100644 index d349edf265..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite deleted file mode 100644 index 617200d8dd..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - amazon.com - - - WarehouseComponent1 - - - - - - amazon.com - - - - - - play.com - - - WarehouseComponent1 - - - - - play.com - - - - - - - ebay.com - - - WarehouseComponent2 - - - - - play.com - - - - - - - - - - - - - - - - - - - - ShipperComponent1 - RoyalMail - - - - RoyalMail - - - - - - - ShipperComponent2 - ParcelForce - - - - ParcelForce - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite deleted file mode 100644 index 213cde2c1d..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - amazon.com - - - WarehouseComponent1 - - - - - - amazon.com - - - - - - - play.com - - - - WarehouseComponent1 - - - - play.com - - - - - - - ebay.com - - - WarehouseComponent1 - - - - ebay.com - - - - - - - - ParcelForce - - - - - - - - - - - - - RoyalMail - - - - - - - - - - - - RoyalMail - - - - - RoyalMail - - - - - - - ParcelForce - - - - - ParcelForce - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite deleted file mode 100644 index 0dca0da75e..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - amazon.com - - - - - amazon.com - - - - - - - play.com - - - - play.com - - - - - - - ebay.com - - - - ebay.com - - - - - - - - - - - - - - - - - - - - - RoyalMail - - - - - RoyalMail - - - - - - - ParcelForce - - - - - ParcelForce - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite deleted file mode 100644 index 953045fefa..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - amazon.com - - - play.com - - - ebay.com - - - - - - - - - - - - - - amazon.com - - - WarehouseComponent1 - - - - - - amazon.com - - - - - - - play.com - - - - WarehouseComponent1 - - - - play.com - - - - - - - ebay.com - - - WarehouseComponent1 - - - - ebay.com - - - - - - - - ParcelForce - - - - - - - - - - - - - RoyalMail - - - - - - - - - - - - RoyalMail - - - - - RoyalMail - - - - - - - ParcelForce - - - - - ParcelForce - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType deleted file mode 100644 index c621d9aca0..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl deleted file mode 100644 index 6d3f853382..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite deleted file mode 100644 index d545c844d2..0000000000 --- a/branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3