diff options
Diffstat (limited to '')
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/pom.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/pom.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/build-bundles.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/build-bundles.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/pom.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/pom.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite (renamed from branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/pom.xml (renamed from branches/sca-android/itest/osgi-contribution/contribution-test/pom.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java (renamed from branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties (renamed from branches/sca-android/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-android/itest/osgi-contribution/pom.xml (renamed from branches/sca-android/itest/osgi-contribution/pom.xml) | 0 |
82 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml index 82d536cbfe..82d536cbfe 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/pom.xml index edbb66ab09..edbb66ab09 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/pom.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/pom.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java index fba9a109b3..fba9a109b3 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java index 225dce0236..225dce0236 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java index 2b8c973e2c..2b8c973e2c 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java index a1c7fce60a..a1c7fce60a 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java index 4647a716c7..4647a716c7 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java index cc5d44d279..cc5d44d279 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java index 1b7fb15bf1..1b7fb15bf1 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java index e97331c06c..e97331c06c 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java index 1e87d59af1..1e87d59af1 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java index 2d1bb68e5b..2d1bb68e5b 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java index 0f88cca213..0f88cca213 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java index f55a068ede..f55a068ede 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java index 2514928c10..2514928c10 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java index c39a34cb96..c39a34cb96 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java index 600f3f0c74..600f3f0c74 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java index 0ba54b363a..0ba54b363a 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java index 6f1f6b8730..6f1f6b8730 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType index 7edc392f46..7edc392f46 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType index 7edc392f46..7edc392f46 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml index 4779eff514..4779eff514 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml index d505834f15..d505834f15 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml index 6bcf6cef0a..6bcf6cef0a 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml index 210a68011f..210a68011f 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml index e23e1a2ecd..e23e1a2ecd 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType index 9832da880e..9832da880e 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType index 5586179421..5586179421 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType index ccc4f84ee4..ccc4f84ee4 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf index 644b207e70..644b207e70 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf index e649870356..e649870356 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf index 8e8e33ecd1..8e8e33ecd1 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf index 2f4b56835b..2f4b56835b 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf index 5f4a8b94ec..5f4a8b94ec 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf index 57d2ac9e4d..57d2ac9e4d 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf index 2e1399bb3b..2e1399bb3b 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite index bb8fb2b07c..bb8fb2b07c 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/build-bundles.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/build-bundles.xml index 82d536cbfe..82d536cbfe 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/build-bundles.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/build-bundles.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/pom.xml index 0a95927b7f..0a95927b7f 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/pom.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/pom.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java index fba9a109b3..fba9a109b3 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java index 225dce0236..225dce0236 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java index d0b0a13e6d..d0b0a13e6d 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java index a1c7fce60a..a1c7fce60a 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java index 4647a716c7..4647a716c7 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java index d2bf71ed28..d2bf71ed28 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java index 1b7fb15bf1..1b7fb15bf1 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java index e97331c06c..e97331c06c 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java index 1e87d59af1..1e87d59af1 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java index 2556a0cfa0..2556a0cfa0 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java index 0f88cca213..0f88cca213 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java index f55a068ede..f55a068ede 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java index 2514928c10..2514928c10 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java index e180c37e3f..e180c37e3f 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java index 600f3f0c74..600f3f0c74 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java index 0ba54b363a..0ba54b363a 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java index 6f1f6b8730..6f1f6b8730 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType index 7edc392f46..7edc392f46 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType index 7edc392f46..7edc392f46 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml index 828dc6f472..828dc6f472 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml index 9293b1ff52..9293b1ff52 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml index 03077aa4d4..03077aa4d4 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml index 210a68011f..210a68011f 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml index c96deb4e1b..c96deb4e1b 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType index 9832da880e..9832da880e 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType index 5586179421..5586179421 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType index ccc4f84ee4..ccc4f84ee4 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf index 404995a90f..404995a90f 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf index 0441e8c6f0..0441e8c6f0 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf index ac0ca72030..ac0ca72030 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf index 2f4b56835b..2f4b56835b 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf index 61f62fa16e..61f62fa16e 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf index dc4aa2c30e..dc4aa2c30e 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf index d149165366..d149165366 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite index 4a18aed5f3..4a18aed5f3 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/pom.xml index 6853aba2d1..6853aba2d1 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-test/pom.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/pom.xml diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java index 108481fcbd..108481fcbd 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java index 28fe368663..28fe368663 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java index be3b7365e5..be3b7365e5 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java index 03372349f8..03372349f8 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java index a2b3a7bc92..a2b3a7bc92 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties index ea8d272a0c..ea8d272a0c 100644 --- a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties diff --git a/branches/sca-android/itest/osgi-contribution/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/pom.xml index 22a677925e..22a677925e 100644 --- a/branches/sca-android/itest/osgi-contribution/pom.xml +++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/pom.xml |