296 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-android/itest/osgi-implementation/build-bundles.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/build-bundles.xml
index 53bf014546..53bf014546 100644
--- a/branches/sca-android/itest/osgi-implementation/build-bundles.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/build-bundles.xml
diff --git a/branches/sca-android/itest/osgi-implementation/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/pom.xml
index d9249b6b9f..d9249b6b9f 100644
--- a/branches/sca-android/itest/osgi-implementation/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/pom.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
index cfecd989fe..cfecd989fe 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
index 43bc26f2f5..43bc26f2f5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
index f78878ef47..f78878ef47 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
index 1c65ca573b..1c65ca573b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
index 5383e1e268..5383e1e268 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
index b2af2fa68d..b2af2fa68d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
index c05a3f52a8..c05a3f52a8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
index c92f078e49..c92f078e49 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
index af269052c7..af269052c7 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
index 5eb16be597..5eb16be597 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
index 8479624546..8479624546 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
index 3aedabc29c..3aedabc29c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
index b12e094bc1..b12e094bc1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
index 59e128b993..59e128b993 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
index ff6f16cba3..ff6f16cba3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
index 4524c6bd3d..4524c6bd3d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
index bcd24ef0b1..bcd24ef0b1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
index 903f8bf229..903f8bf229 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
index fe8bd23f07..fe8bd23f07 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
index ec30d641ac..ec30d641ac 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
index 34baca71d1..34baca71d1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
index 9285c0a8d5..9285c0a8d5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
index 16d0eae990..16d0eae990 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
index 3d0e045225..3d0e045225 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
index c055aee142..c055aee142 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
index 661eb5a8cb..661eb5a8cb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
index 0588da9a85..0588da9a85 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
index fff67e1978..fff67e1978 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
index 98085449e6..98085449e6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
index 5089019671..5089019671 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
index 1aabf4d10c..1aabf4d10c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
index 039a214856..039a214856 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
index 4a3cd4aed2..4a3cd4aed2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
index 2251bf5be6..2251bf5be6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
index e2d25bf47d..e2d25bf47d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
index f2ae804ad1..f2ae804ad1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
index a47f68c579..a47f68c579 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
index 25d7bcf2ff..25d7bcf2ff 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
index 2762bc62be..2762bc62be 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 80346311b1..80346311b1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a879505610..a879505610 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
index c8cb522cf4..c8cb522cf4 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 546971860e..546971860e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
index 593e55f3f5..593e55f3f5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
index 18483817ad..18483817ad 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
index 5ba42780f2..5ba42780f2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
index bc569d0ac0..bc569d0ac0 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
index 599ab51a50..599ab51a50 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index df52c6c760..df52c6c760 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index aca5943552..aca5943552 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e71c624f49..e71c624f49 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
index a036ecfc76..a036ecfc76 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
index db877bb366..db877bb366 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
index ee1f575e70..ee1f575e70 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
index 09e60ca626..09e60ca626 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
index 7dd70889c7..7dd70889c7 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
index 354f40a064..354f40a064 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index d0cf43a960..d0cf43a960 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index ff40a7ae36..ff40a7ae36 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
index ef989d6fcf..ef989d6fcf 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index effae8c246..effae8c246 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
index 4effadf208..4effadf208 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
index 13bce67bb4..13bce67bb4 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
index 071a131f40..071a131f40 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
index 6ebd1f2894..6ebd1f2894 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
index b66961b1c2..b66961b1c2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 9edf3567e5..9edf3567e5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
index 659f16be7f..659f16be7f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 7c9e102fd2..7c9e102fd2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index bb04ff42e0..bb04ff42e0 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
index 3317816557..3317816557 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
index 6d1ad76796..6d1ad76796 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
index 71e248590b..71e248590b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
index 7c1125bbb5..7c1125bbb5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
index 8456b878f2..8456b878f2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
index d5a47c6403..d5a47c6403 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
index e6391d2159..e6391d2159 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
index c79ede815b..c79ede815b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
index 04cc73b85c..04cc73b85c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
index 9ece700efe..9ece700efe 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
index 52bc43478d..52bc43478d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
index 0b8d2e5851..0b8d2e5851 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
index 87370a6df4..87370a6df4 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
index 127349eacf..127349eacf 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
index 7e3810c458..7e3810c458 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
index fb9a112d18..fb9a112d18 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
index ee732b5efc..ee732b5efc 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
index b1723660d7..b1723660d7 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
index fb9a112d18..fb9a112d18 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
index ee732b5efc..ee732b5efc 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
index b1723660d7..b1723660d7 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
index 5172cbe21e..5172cbe21e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
index b7591e732d..b7591e732d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
index cf8717fcf5..cf8717fcf5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
index 785212fa6d..785212fa6d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
index 7a06030e32..7a06030e32 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
index 5c39b53b0a..5c39b53b0a 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
index b8bb809319..b8bb809319 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
index 26f32fe617..26f32fe617 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
index 1b9e0e847e..1b9e0e847e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
index 6066a38f29..6066a38f29 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
index 777edd3f7d..777edd3f7d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
index d8adaa2ba3..d8adaa2ba3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
index e0bd9d8c10..e0bd9d8c10 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
index 6005ae785c..6005ae785c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
index 6f0b79ebc2..6f0b79ebc2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
index d4b461460e..d4b461460e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
index bb15e6e3aa..bb15e6e3aa 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
index 7591201b8c..7591201b8c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
index 0e844fab99..0e844fab99 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
index a8a87c5c8c..a8a87c5c8c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
index 05bbf4db88..05bbf4db88 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
index a12d1a21ea..a12d1a21ea 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
index 2214db11a6..2214db11a6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
index 8d44067992..8d44067992 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
index 60c0fb3fd3..60c0fb3fd3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
index ca1392d2b8..ca1392d2b8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
index 7c9f67c36d..7c9f67c36d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
index 760c761666..760c761666 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
index 7d56770311..7d56770311 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
index 321bdc713f..321bdc713f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
index 66f98011cb..66f98011cb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
index 6874a66db9..6874a66db9 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
index 47d290eb1a..47d290eb1a 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
index c7f13a50a7..c7f13a50a7 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
index f4c102c4f0..f4c102c4f0 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
index cbebf7eec2..cbebf7eec2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
index 6a3c845cca..6a3c845cca 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
index cb6345432f..cb6345432f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
index 89871fa8f6..89871fa8f6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
index d968d1ffc5..d968d1ffc5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
index fc762df8d5..fc762df8d5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
index 02e42bc010..02e42bc010 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
index 390367b99b..390367b99b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
index 4715cbd976..4715cbd976 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
index 932fb8a483..932fb8a483 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
index c799f31606..c799f31606 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
index db68d7e333..db68d7e333 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
index 1aea3cf669..1aea3cf669 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
index 106bd1b6aa..106bd1b6aa 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
index 1e3c915a59..1e3c915a59 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
index 81c51e6804..81c51e6804 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
index 335bc419c1..335bc419c1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
index a68b9d6dbb..a68b9d6dbb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
index 02f79c15f3..02f79c15f3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
index 8428b08d96..8428b08d96 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
index c81bf00d00..c81bf00d00 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
index 61c161617c..61c161617c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
index fd6a26a65f..fd6a26a65f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
index 0168bc2435..0168bc2435 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
index 6674cdd7f2..6674cdd7f2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
index 72df35ef41..72df35ef41 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
index 724c8132df..724c8132df 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
index 1e5035d949..1e5035d949 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
index 85bfd86422..85bfd86422 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
index 6e51b3d6f2..6e51b3d6f2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
index 9a87758ec2..9a87758ec2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
index e134bd1061..e134bd1061 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
index c19895bab1..c19895bab1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
index 707609d2c4..707609d2c4 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
index e084e5831a..e084e5831a 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
index d96f6481fb..d96f6481fb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
index 10ef690c9b..10ef690c9b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
index 003f9dca5a..003f9dca5a 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
index fefdea106d..fefdea106d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
index f6b847ed59..f6b847ed59 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
index 5cff2f573e..5cff2f573e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
index 0fec68a725..0fec68a725 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
index 678014d48d..678014d48d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
index f0090fb52b..f0090fb52b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
index 0b50923a05..0b50923a05 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
index 1000a5f974..1000a5f974 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
index 4e392a9ff1..4e392a9ff1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
index 788ec4f19a..788ec4f19a 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
index 1ba16d0693..1ba16d0693 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
index a55ebd02a8..a55ebd02a8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
index e7459360e6..e7459360e6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
index d518ecab62..d518ecab62 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
index 880304187b..880304187b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
index d72db04425..d72db04425 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
index f9c1218f82..f9c1218f82 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
index d8e4c1cb7e..d8e4c1cb7e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
index a6de268bf6..a6de268bf6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
index 660e277693..660e277693 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
index 02ae93aec2..02ae93aec2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
index c94504f07d..c94504f07d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
index fea03404fd..fea03404fd 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
index 3c425fcbc9..3c425fcbc9 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
index f6c04de980..f6c04de980 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
index 87918132e6..87918132e6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
index 9b00787162..9b00787162 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
index 2ecc0bea43..2ecc0bea43 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
index af79dc4bdf..af79dc4bdf 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Customer.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
index c144a1bc18..c144a1bc18 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/services-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/services-test.composite
index 64f3b30f88..64f3b30f88 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/services-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/services-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
index 0b0aa0912b..0b0aa0912b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
index 877d0de1c9..877d0de1c9 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/version-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/version-test.composite
index bbb397ee70..bbb397ee70 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/version-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/version-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
index 617200d8dd..617200d8dd 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
index 213cde2c1d..213cde2c1d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
index 0dca0da75e..0dca0da75e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
index 953045fefa..953045fefa 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
index c621d9aca0..c621d9aca0 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
index 6d3f853382..6d3f853382 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
index d545c844d2..d545c844d2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
index 54b9b00bc8..54b9b00bc8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
index b26bfbd98d..b26bfbd98d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
index 667df7aa12..667df7aa12 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
index a95437f8c1..a95437f8c1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
index c5d94df93d..c5d94df93d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
index d340923938..d340923938 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
index c1f11d0b6e..c1f11d0b6e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
index 49afb3d8e8..49afb3d8e8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
index a858c18a90..a858c18a90 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
index a9941aebcd..a9941aebcd 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
index 8e939b1a83..8e939b1a83 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
index 39d90bb75c..39d90bb75c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
index 5376687b61..5376687b61 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
index 6d8dc1021e..6d8dc1021e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
index e037ae9675..e037ae9675 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
index eecf67913d..eecf67913d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
index 203bf5123c..203bf5123c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
index 429b1f10ef..429b1f10ef 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
index dbc980f8c4..dbc980f8c4 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
index e39295a402..e39295a402 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
index c2f6bff4f5..c2f6bff4f5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
index 17ba7a2f14..17ba7a2f14 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
index 8c33720018..8c33720018 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
index 0c6edd6691..0c6edd6691 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
index 0b48ac90ba..0b48ac90ba 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
index c84741f34f..c84741f34f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
index 5a9b2a8b1d..5a9b2a8b1d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
index 7b95c12038..7b95c12038 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
index 8399991503..8399991503 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties