198 files changed, 0 insertions, 0 deletions

diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/build-bundles.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/build-bundles.xml
index 450b14a463..450b14a463 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/build-bundles.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/build-bundles.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/pom.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/pom.xml
index 772413d568..772413d568 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/pom.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/pom.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
index 9285c0a8d5..9285c0a8d5 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
index 16d0eae990..16d0eae990 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
index 3d0e045225..3d0e045225 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
index c055aee142..c055aee142 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
index fb0313a313..fb0313a313 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
index 0588da9a85..0588da9a85 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
index 039a214856..039a214856 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
index 4a3cd4aed2..4a3cd4aed2 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
index a69f325526..a69f325526 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
index e2d25bf47d..e2d25bf47d 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
index 3f91f1e922..3f91f1e922 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
index a47f68c579..a47f68c579 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
index 25d7bcf2ff..25d7bcf2ff 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
index 2762bc62be..2762bc62be 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 80346311b1..80346311b1 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index 9717025a4f..9717025a4f 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
index c8cb522cf4..c8cb522cf4 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 37077bad8b..37077bad8b 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
index 02862bc5f6..02862bc5f6 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
index 981e3c7520..981e3c7520 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
index 599ab51a50..599ab51a50 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index df52c6c760..df52c6c760 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index d4374e4315..d4374e4315 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e71c624f49..e71c624f49 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
index a036ecfc76..a036ecfc76 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
index 278a439540..278a439540 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
index ee1f575e70..ee1f575e70 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
index 09e60ca626..09e60ca626 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
index 7dd70889c7..7dd70889c7 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
index 354f40a064..354f40a064 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index d0cf43a960..d0cf43a960 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index f3a98be77b..f3a98be77b 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
index e2f649e4f4..e2f649e4f4 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index effae8c246..effae8c246 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
index 4effadf208..4effadf208 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
index 3b87f6b087..3b87f6b087 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
index b66961b1c2..b66961b1c2 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 9edf3567e5..9edf3567e5 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
index 659f16be7f..659f16be7f 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index dd283bf779..dd283bf779 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index bb04ff42e0..bb04ff42e0 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
index 3317816557..3317816557 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
index 6d1ad76796..6d1ad76796 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/NOTICE b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/NOTICE
index d83ebbe236..d83ebbe236 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/NOTICE
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/README.txt b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/README.txt
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml
index 2d345390b7..2d345390b7 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
index 127349eacf..127349eacf 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
index 7e3810c458..7e3810c458 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
index 26f32fe617..26f32fe617 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
index 1b9e0e847e..1b9e0e847e 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
index 6066a38f29..6066a38f29 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
index 777edd3f7d..777edd3f7d 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
index d8adaa2ba3..d8adaa2ba3 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
index e0bd9d8c10..e0bd9d8c10 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
index 6005ae785c..6005ae785c 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
index 6f0b79ebc2..6f0b79ebc2 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
index d4b461460e..d4b461460e 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
index bb15e6e3aa..bb15e6e3aa 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
index 7591201b8c..7591201b8c 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
index 0e844fab99..0e844fab99 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
index a8a87c5c8c..a8a87c5c8c 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
index 05bbf4db88..05bbf4db88 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
index a12d1a21ea..a12d1a21ea 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
index 2214db11a6..2214db11a6 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
index 236ff3f84f..236ff3f84f 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
index 60c0fb3fd3..60c0fb3fd3 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
index ca1392d2b8..ca1392d2b8 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
index 7c9f67c36d..7c9f67c36d 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
index 760c761666..760c761666 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
index ebca01749a..ebca01749a 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
index c7ff94d216..c7ff94d216 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
index 66f98011cb..66f98011cb 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
index 02fefbce42..02fefbce42 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
index 8b2e1717fa..8b2e1717fa 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
index c7f13a50a7..c7f13a50a7 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
index 01c125ae38..01c125ae38 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
index cbebf7eec2..cbebf7eec2 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
index fc762df8d5..fc762df8d5 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
index 02e42bc010..02e42bc010 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
index 390367b99b..390367b99b 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
index 4715cbd976..4715cbd976 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
index 932fb8a483..932fb8a483 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
index c799f31606..c799f31606 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
index db68d7e333..db68d7e333 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
index 1aea3cf669..1aea3cf669 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
index 106bd1b6aa..106bd1b6aa 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
index 1e3c915a59..1e3c915a59 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
index 81c51e6804..81c51e6804 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
index ca50b554df..ca50b554df 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
index 14658127f8..14658127f8 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
index 335bc419c1..335bc419c1 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
index a68b9d6dbb..a68b9d6dbb 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
index 02f79c15f3..02f79c15f3 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
index 8428b08d96..8428b08d96 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
index 01d0320f5b..01d0320f5b 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
index 8f311807b5..8f311807b5 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
index fccaad9e05..fccaad9e05 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
index 7ebbfbe185..7ebbfbe185 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
index 6674cdd7f2..6674cdd7f2 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
index 72df35ef41..72df35ef41 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
index 724c8132df..724c8132df 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
index 1e5035d949..1e5035d949 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
index 85bfd86422..85bfd86422 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
index 6e51b3d6f2..6e51b3d6f2 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
index 9a87758ec2..9a87758ec2 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
index e134bd1061..e134bd1061 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
index c19895bab1..c19895bab1 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
index 707609d2c4..707609d2c4 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
index e084e5831a..e084e5831a 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
index d96f6481fb..d96f6481fb 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
index 10ef690c9b..10ef690c9b 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
index 003f9dca5a..003f9dca5a 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
index fefdea106d..fefdea106d 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
index f6b847ed59..f6b847ed59 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
index 5cff2f573e..5cff2f573e 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
index ca50b554df..ca50b554df 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
index 14658127f8..14658127f8 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
index 0fec68a725..0fec68a725 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
index ca50b554df..ca50b554df 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
index 14658127f8..14658127f8 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
index 678014d48d..678014d48d 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
index f0090fb52b..f0090fb52b 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
index 0b50923a05..0b50923a05 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
index 1000a5f974..1000a5f974 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
index 4e392a9ff1..4e392a9ff1 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
index 788ec4f19a..788ec4f19a 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
index 1ba16d0693..1ba16d0693 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
index a55ebd02a8..a55ebd02a8 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
index e7459360e6..e7459360e6 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
index d518ecab62..d518ecab62 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
index 880304187b..880304187b 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
index ca50b554df..ca50b554df 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
index 14658127f8..14658127f8 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
index d8e4c1cb7e..d8e4c1cb7e 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite
index ed5b7593dc..ed5b7593dc 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/factory-test.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/factory-test.composite
index 53abe030b7..53abe030b7 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/factory-test.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/factory-test.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/helloworld.wsdl b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/helloworld.wsdl
index 68174d1ecd..68174d1ecd 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/helloworld.wsdl
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/helloworld.wsdl
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite
index c3ad9e1588..c3ad9e1588 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite
index 56b04f348d..56b04f348d 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite
index 84e2c5b1cf..84e2c5b1cf 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite
index e6f51208a7..e6f51208a7 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties-test.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties-test.composite
index 2794007254..2794007254 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties-test.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties-test.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite
index c341446691..c341446691 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite
index 67b5c294ae..67b5c294ae 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite
index db743296a0..db743296a0 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/services-test.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/services-test.composite
index 35bb9834d6..35bb9834d6 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/services-test.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/services-test.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite
index 66d3a6474d..66d3a6474d 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/version-test.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/version-test.composite
index d3d1551c73..d3d1551c73 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/version-test.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/version-test.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite
index 24f8c8f6fc..24f8c8f6fc 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite
index 95be8374cd..95be8374cd 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite
index 67066049e7..67066049e7 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite
index a5a634208d..a5a634208d 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite
index 30fd337134..30fd337134 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
index 0b0aa0912b..0b0aa0912b 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Customer.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Customer.componentType
index 64986c7dcc..64986c7dcc 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Customer.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Customer.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/CustomerServices.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/CustomerServices.componentType
index 0cf5563258..0cf5563258 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/CustomerServices.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/CustomerServices.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/CustomerWithQuery.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/CustomerWithQuery.componentType
index 9906af1463..9906af1463 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/CustomerWithQuery.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/CustomerWithQuery.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Retailer.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Retailer.componentType
index 7323b2d9be..7323b2d9be 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Retailer.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Retailer.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/RetailerServices.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/RetailerServices.componentType
index f7ead7eb85..f7ead7eb85 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/RetailerServices.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/RetailerServices.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/RetailerWithQuery.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/RetailerWithQuery.componentType
index f6ac2393dc..f6ac2393dc 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/RetailerWithQuery.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/RetailerWithQuery.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Shipper.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Shipper.componentType
index 7996f0f429..7996f0f429 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Shipper.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Shipper.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/ShipperServices.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/ShipperServices.componentType
index 2906e0d2ed..2906e0d2ed 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/ShipperServices.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/ShipperServices.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Warehouse.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Warehouse.componentType
index c5ae9b76f3..c5ae9b76f3 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Warehouse.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/Warehouse.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/WarehouseServices.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/WarehouseServices.componentType
index c5ae9b76f3..c5ae9b76f3 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/WarehouseServices.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/WarehouseServices.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/WarehouseWithQuery.componentType b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/WarehouseWithQuery.componentType
index 24edf697d5..24edf697d5 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/WarehouseWithQuery.componentType
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/main/resources/supplychain/WarehouseWithQuery.componentType
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java
index ab08fd1982..ab08fd1982 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java
index 454fc6a7f8..454fc6a7f8 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
index b41c00bd0b..b41c00bd0b 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
index d569cd7189..d569cd7189 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
index eba07d7d93..eba07d7d93 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
index 2f367a2f64..2f367a2f64 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
index 64610bfff8..64610bfff8 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
index 7b7d4f1e04..7b7d4f1e04 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
index 20dab1ec66..20dab1ec66 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
index 5de9035ace..5de9035ace 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
index 51d37a4519..51d37a4519 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
index 23e1624be1..23e1624be1 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
index 069a5e538d..069a5e538d 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
index 5ec9f51c71..5ec9f51c71 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
index 3226362335..3226362335 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
index 3153399820..3153399820 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
index 8c50bf89aa..8c50bf89aa 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
index 46d41710c6..46d41710c6 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
index 00c6d69678..00c6d69678 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
index b7f0ad79d8..b7f0ad79d8 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
index ad13e72866..ad13e72866 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
diff --git a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
index 72fd6fd843..72fd6fd843 100644
--- a/tags/java/sca/0.99-incubating/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
+++ b/sca-java-1.x/tags/0.99-incubating/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties