summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java63
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java71
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java32
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java72
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java32
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java32
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java31
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java31
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java69
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java58
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java32
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java32
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java33
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java33
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java33
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java33
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java32
-rw-r--r--sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java32
18 files changed, 0 insertions, 751 deletions
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
deleted file mode 100644
index a858c18a90..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain;
-
-import supplychain.customer.Customer;
-import test.OSGiTestCase;
-
-/**
- * Test case for supplychain - it is invoked with different composite files to test
- * various scenarios.
- */
-public abstract class SupplyChainTestCase extends OSGiTestCase {
-
- public Customer customer;
-
-
- public SupplyChainTestCase(String compositeName, String contributionLocation) {
- super(compositeName, contributionLocation);
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- customer = scaDomain.getService(Customer.class, "CustomerComponent");
- }
-
- public void test() throws Exception {
-
- System.out.println("Main thread " + Thread.currentThread());
- customer.purchaseBooks();
- customer.purchaseGames();
- long timeout = 5000L;
- while (timeout > 0) {
- if (customer.hasOutstandingOrders()) {
- Thread.sleep(100);
- timeout -= 100;
- } else
- break;
- }
- assertFalse(customer.hasOutstandingOrders());
-
- System.out.println("Test complete");
-
- }
-
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
deleted file mode 100644
index a9941aebcd..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain;
-
-import supplychain.customer.Customer;
-import test.OSGiTestCase;
-
-/**
- * OSGi test program - common code for versioned bundles
- */
-public abstract class VersionedSupplyChainTestCase extends OSGiTestCase {
-
- private Customer customer1;
- private Customer customer2;
-
-
- public VersionedSupplyChainTestCase(String compositeName, String contributionLocation) {
- super(compositeName, contributionLocation);
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- customer1 = scaDomain.getService(Customer.class, "CustomerComponent1");
- customer2 = scaDomain.getService(Customer.class, "CustomerComponent2");
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- Thread.sleep(2000);
- }
-
- public void test() throws Exception {
-
- System.out.println("Main thread " + Thread.currentThread());
- customer1.purchaseBooks();
- customer2.purchaseGames();
- long timeout = 5000L;
- while (timeout > 0) {
- if (customer1.hasOutstandingOrders()) {
- Thread.sleep(100);
- timeout -= 100;
- } else if (customer2.hasOutstandingOrders()) {
- Thread.sleep(100);
- timeout -= 100;
- } else
- break;
- }
- assertFalse(customer1.hasOutstandingOrders());
- assertFalse(customer2.hasOutstandingOrders());
-
- System.out.println("Test complete");
-
- }
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
deleted file mode 100644
index 8e939b1a83..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.factory;
-
-
-/**
- * OSGi test program - declarative with scopes other than composites which use OSGi service factories
- */
-public class DSFactoryTestCase extends FactoryTestCase {
-
- public DSFactoryTestCase() {
- super("factory-ds-test.composite", "factory/ds");
- }
-
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
deleted file mode 100644
index 39d90bb75c..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.factory;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with scopes other than composites which use OSGi service factories
- */
-public class FactoryTestCase extends SupplyChainTestCase {
- /**
- * This constant defines the time period (in milliseconds) for which we are prepared to wait for
- * the @OneWay notifyShipment() callback to run.
- */
- private static final long MAX_WAIT_TIME_FOR_CALLBACK = 10000;
-
- public FactoryTestCase() {
- super("factory-test.composite", "factory");
- }
-
- protected FactoryTestCase(String compositeName, String contributionLocation) {
- super(compositeName, contributionLocation);
- }
-
-
- @Override
- public void test() throws Exception {
-
- System.out.println("Main thread " + Thread.currentThread());
- customer.purchaseBooks();
- waitForOrderShipmentNotification(); // TUSCANY-2198 notifyShipment() callback is @OneWay
- assertFalse(customer.hasOutstandingOrders());
-
- customer.purchaseGames();
- waitForOrderShipmentNotification(); // TUSCANY-2198 notifyShipment() callback is @OneWay
- assertFalse(customer.hasOutstandingOrders());
-
- Thread.sleep(2000);
- System.out.println("Test complete");
-
- }
-
- /**
- * Since the notifyShipment() callback on the Customer is @OneWay, we need to allow
- * some time for it to complete as it is runs asynchronously.
- *
- * This is for TUSCANY-2198
- */
- private void waitForOrderShipmentNotification() throws InterruptedException {
- long startTime = System.currentTimeMillis();
- while (customer.hasOutstandingOrders()
- && System.currentTimeMillis() - startTime < MAX_WAIT_TIME_FOR_CALLBACK) {
- Thread.sleep(100);
- }
- }
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
deleted file mode 100644
index 5376687b61..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.interfaces;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with components exposing multiple services with multiple interfaces
- */
-public class DSInterfacesTestCase extends SupplyChainTestCase {
-
- public DSInterfacesTestCase() {
- super("interfaces-ds-test.composite", "interfaces/ds");
- }
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
deleted file mode 100644
index 6d8dc1021e..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.interfaces;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with components exposing multiple services with multiple interfaces
- */
-public class InterfacesTestCase extends SupplyChainTestCase {
-
- public InterfacesTestCase() {
- super("interfaces-test.composite", "interfaces");
- }
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
deleted file mode 100644
index e037ae9675..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.properties;
-
-
-/**
- * OSGi test program - declarative with business properties
- */
-public class DSProperties2TestCase extends Properties2TestCase {
-
- public DSProperties2TestCase() {
- super("properties2-ds-test.composite", "properties/ds");
- }
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
deleted file mode 100644
index eecf67913d..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.properties;
-
-
-/**
- * OSGi test program - declarative with business properties
- */
-public class DSPropertiesTestCase extends PropertiesTestCase {
-
- public DSPropertiesTestCase() {
- super("properties-ds-test.composite", "properties/ds");
- }
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
deleted file mode 100644
index 203bf5123c..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.properties;
-
-
-import stockquote.StockQuote;
-import test.OSGiTestCase;
-
-/**
- * OSGi test program - procedural with business properties
- */
-public class Properties2TestCase extends OSGiTestCase {
-
-
- private StockQuote stockQuoteServiceUSD;
- private StockQuote stockQuoteServiceEURO;
-
- public Properties2TestCase() {
- super("properties2-test.composite", "properties");
- }
-
- protected Properties2TestCase(String compositeName, String contributionLocation) {
- super(compositeName, contributionLocation);
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- stockQuoteServiceUSD = scaDomain.getService(StockQuote.class, "USDStockQuoteComponent");
- stockQuoteServiceEURO = scaDomain.getService(StockQuote.class, "EUROStockQuoteComponent");
- }
-
- public void test() throws Exception {
-
- double stockQuote = stockQuoteServiceUSD.getQuote("IBM");
-
- double expectedValue = 52.81 * 2.0;
-
- System.out.println("IBM: $" + stockQuote);
-
- assertTrue(stockQuote > expectedValue - 0.1 && stockQuote < expectedValue + 0.1);
-
- double stockQuote2 = stockQuoteServiceEURO.getQuote("IBM");
-
- double expectedValue2 = 52.81 * 1.48;
-
- System.out.println("IBM: Euro " + stockQuote2);
-
- assertTrue(stockQuote2 > expectedValue2 - 0.1 && stockQuote2 < expectedValue2 + 0.1);
-
- }
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
deleted file mode 100644
index 429b1f10ef..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.properties;
-
-import stockquote.StockQuote;
-import test.OSGiTestCase;
-
-/**
- * OSGi test program - procedural with business properties
- */
-public class PropertiesTestCase extends OSGiTestCase {
-
-
- private StockQuote stockQuoteService;
-
- public PropertiesTestCase() {
- super("properties-test.composite", "properties");
- }
-
- protected PropertiesTestCase(String compositeName, String contributionLocation) {
- super(compositeName, contributionLocation);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- stockQuoteService = scaDomain.getService(StockQuote.class, "StockQuoteComponent");
- }
-
-
- public void test() throws Exception {
-
- double stockQuote = stockQuoteService.getQuote("IBM");
-
- double expectedValue = 52.81 * 2.0;
-
- System.out.println("IBM: " + stockQuote);
-
- assertTrue(stockQuote > expectedValue - 0.1 && stockQuote < expectedValue + 0.1);
-
- }
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
deleted file mode 100644
index dbc980f8c4..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.services;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with components exposing multiple services
- */
-public class DSServicesTestCase extends SupplyChainTestCase {
-
- public DSServicesTestCase() {
- super("services-ds-test.composite", "services/ds");
- }
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
deleted file mode 100644
index e39295a402..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.services;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with components exposing multiple services
- */
-public class ServicesTestCase extends SupplyChainTestCase {
-
- public ServicesTestCase() {
- super("services-test.composite", "services");
- }
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
deleted file mode 100644
index c2f6bff4f5..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.version;
-
-import supplychain.VersionedSupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with versioning
- */
-public class DSVersionTestCase extends VersionedSupplyChainTestCase {
-
- public DSVersionTestCase() {
- super("version-ds-test.composite", "version/ds");
- }
-
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
deleted file mode 100644
index 17ba7a2f14..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.version;
-
-import supplychain.VersionedSupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with versioning
- */
-public class VersionTestCase extends VersionedSupplyChainTestCase {
-
- public VersionTestCase() {
- super("version-test.composite", "version");
- }
-
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
deleted file mode 100644
index 8c33720018..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.wiring;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with SCA wiring
- */
-public class DSWiring1TestCase extends SupplyChainTestCase {
-
- public DSWiring1TestCase() {
- super("wiring-ds-test1.composite", "wiring/ds");
- }
-
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
deleted file mode 100644
index 0c6edd6691..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.wiring;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with SCA wiring
- */
-public class DSWiring2TestCase extends SupplyChainTestCase {
-
- public DSWiring2TestCase() {
- super("wiring-ds-test2.composite", "wiring/ds");
- }
-
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
deleted file mode 100644
index 0b48ac90ba..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.wiring;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with SCA wiring
- */
-public class Wiring1TestCase extends SupplyChainTestCase {
-
- public Wiring1TestCase() {
- super("wiring-test1.composite", "wiring");
- }
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
deleted file mode 100644
index c84741f34f..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC2/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.wiring;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with SCA wiring
- */
-public class Wiring2TestCase extends SupplyChainTestCase {
-
- public Wiring2TestCase() {
- super("wiring-test2.composite", "wiring");
- }
-
-}