summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src')
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java121
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java33
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java55
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java51
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java47
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java57
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java46
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java44
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java28
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java52
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java45
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java42
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java28
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java51
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java47
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java44
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java28
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType28
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType28
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml32
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml29
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml27
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml24
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml28
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType28
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType28
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType28
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf13
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf13
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf10
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf1
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf10
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf13
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf10
-rw-r--r--branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite67
35 files changed, 0 insertions, 1236 deletions
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index fba9a109b3..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain;
-
-
-import java.lang.reflect.Field;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-
-
-/**
- * Common code for all OSGi bundles which don't use declarative services.
- * Registers services and sets references.
- */
-public class OSGiBundleImpl implements ServiceListener, BundleActivator {
-
-
- String name;
- String serviceName;
- String[] references;
- Class<?>[] referenceClasses;
- Field[] referenceFields;
-
- Class myClass;
-
- private BundleContext bundleContext;
-
- public OSGiBundleImpl(String serviceName, String... references) {
-
- myClass = this.getClass();
- this.name = this.getClass().getSimpleName();
- this.serviceName = serviceName;
- this.references = references;
-
- try {
- referenceClasses = new Class[references.length];
- referenceFields = new Field[references.length];
- for (int i = 0; i < references.length; i++) {
- referenceFields[i] = this.getClass().getDeclaredField(references[i]);
- referenceFields[i].setAccessible(true);
- referenceClasses[i] = referenceFields[i].getType();
- }
-
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
-
- }
-
- public void start(BundleContext bc) {
-
- System.out.println("Started OSGi bundle with activator " + name);
-
- this.bundleContext = bc;
-
- bundleContext.registerService(serviceName, this, new Hashtable());
-
- for (int i = 0; i < references.length; i++) {
-
- try {
-
- ServiceReference ref = bundleContext.getServiceReference(referenceClasses[i].getName());
- if (ref != null) {
- Object obj = bundleContext.getService(ref);
- referenceFields[i].set(this, referenceClasses[i].cast(obj));
- } else {
- String filter = "(objectclass=" + referenceClasses[i].getName() + ")";
- this.bundleContext.addServiceListener(this, filter);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- public void stop(BundleContext bc) {
- System.out.println("Stop OSGi bundle with activator " + name);
-
- }
-
-
- public void serviceChanged(ServiceEvent event) {
- try {
- if (event.getType() == ServiceEvent.REGISTERED) {
-
- ServiceReference ref = event.getServiceReference();
- Object obj = bundleContext.getService(ref);
- for (int i = 0; i < references.length; i++) {
- if (referenceClasses[i].isAssignableFrom(obj.getClass())) {
- referenceFields[i].set(this, referenceClasses[i].cast(obj));
- }
- }
- }
- } catch (Throwable e) {
- e.printStackTrace();
- }
- }
-
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 225dce0236..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.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.customer;
-
-import org.osoa.sca.annotations.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-
- public void purchaseGoods();
-
- @OneWay
- public void notifyShipment(String order);
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 2b8c973e2c..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.customer;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-
- private Retailer retailer;
-
- public JavaCustomerComponentImpl() {
- System.out.println("Created " + this.getClass().getCanonicalName() +
- "(v2) using classloader " + this.getClass().getClassLoader());
- }
-
- @Reference
- public void setRetailer(Retailer retailer) {
- this.retailer = retailer;
- }
-
- public void purchaseGoods() {
- retailer.submitOrder("Order");
- }
-
- public void notifyShipment(String order) {
- System.out.print("Work thread " + Thread.currentThread() + " - ");
- System.out.println(order);
- }
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a1c7fce60a..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.customer;
-
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi declarative services implementation).
- */
-public class OSGiCustomerComponentImpl implements Customer {
-
-
- private Retailer retailer;
-
-
- protected void setRetailer(Retailer retailer) {
- this.retailer = retailer;
- }
-
- protected void unsetRetailer(Retailer retailer) {
- this.retailer = null;
- }
-
- public void purchaseGoods() {
- retailer.submitOrder("Order");
- }
-
- public void notifyShipment(String order) {
- System.out.print("Work thread " + Thread.currentThread() + " - ");
- System.out.println(order);
- }
-
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 4647a716c7..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.customer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi procedural services implementation).
- */
-public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
-
- private Retailer retailer;
-
- public OSGiCustomerImpl() {
- super("supplychain.customer.Customer", "retailer");
-
- }
-
- public void purchaseGoods() {
- retailer.submitOrder("Order");
- }
-
- public void notifyShipment(String order) {
- System.out.print("Work thread " + Thread.currentThread() + " - ");
- System.out.println(order);
- }
-
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index cc5d44d279..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.retailer;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (POJO implementation).
- */
-@Service(Retailer.class)
-@Scope("STATELESS")
-public class JavaRetailerComponentImpl implements Retailer {
-
- private Warehouse warehouse;
-
- public JavaRetailerComponentImpl() {
- System.out.println("Created " + this.getClass().getCanonicalName() +
- "(v2) using classloader " + this.getClass().getClassLoader());
- }
-
- @Reference
- public void setWarehouse(Warehouse warehouse) {
- this.warehouse = warehouse;
- }
-
-
- public void submitOrder(String order) {
-
- warehouse.fulfillOrder(order + ", submitted");
-
- }
-
-
-
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index 1b7fb15bf1..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.retailer;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi declarative services implementation).
- */
-public class OSGiRetailerComponentImpl implements Retailer {
-
- private Warehouse warehouse;
-
-
- protected void setWarehouse(Warehouse warehouse) {
- this.warehouse = warehouse;
- }
-
- protected void unsetWarehouse(Warehouse warehouse) {
- this.warehouse = null;
- }
-
- public void submitOrder(String order) {
-
- warehouse.fulfillOrder(order + ", submitted");
-
- }
-
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e97331c06c..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.retailer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi procedural services implementation).
- */
-public class OSGiRetailerImpl extends OSGiBundleImpl implements Retailer {
-
- private Warehouse warehouse;
-
- public OSGiRetailerImpl() {
-
- super("supplychain.retailer.Retailer", "warehouse");
- }
-
- public void submitOrder(String order) {
- warehouse.fulfillOrder(order + ", submitted");
-
- }
-
-
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.retailer;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-
- public void submitOrder(String order);
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 2d1bb68e5b..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.shipper;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (POJO implementation).
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-
- private Customer customer;
-
- public JavaShipperComponentImpl() {
- System.out.println("Created " + this.getClass().getCanonicalName() +
- "(v2) using classloader " + this.getClass().getClassLoader());
- }
-
- @Reference
- public void setCustomer(Customer customer) {
- this.customer = customer;
- }
-
- public void processShipment(String order) {
- customer.notifyShipment(order + ", shipped");
- }
-
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index 0f88cca213..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.shipper;
-
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi declarative services implementation).
- */
-public class OSGiShipperComponentImpl implements Shipper {
-
- private Customer customer;
-
-
- protected void setCustomer(Customer customer) {
- this.customer = customer;
- }
-
- protected void unsetCustomer(Customer customer) {
- this.customer = null;
- }
-
- public void processShipment(String order) {
- customer.notifyShipment(order + ", shipped");
- }
-
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index f55a068ede..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.shipper;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi procedural services implementation).
- */
-public class OSGiShipperImpl extends OSGiBundleImpl implements Shipper {
-
- private Customer customer;
-
- public OSGiShipperImpl() {
- super("supplychain.shipper.Shipper", "customer");
- }
-
-
- public void processShipment(String order) {
- customer.notifyShipment(order + ", shipped");
- }
-
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.shipper;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-
- public void processShipment(String order);
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index c39a34cb96..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.warehouse;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (POJO implementation).
- */
-@Service(Warehouse.class)
-@Scope("STATELESS")
-public class JavaWarehouseComponentImpl implements Warehouse {
-
- private Shipper shipper;
-
- public JavaWarehouseComponentImpl() {
- System.out.println("Created " + this.getClass().getCanonicalName() +
- "(v2) using classloader " + this.getClass().getClassLoader());
- }
-
- @Reference
- public void setShipper(Shipper shipper) {
- this.shipper = shipper;
- }
-
- public void fulfillOrder(String order) {
- shipper.processShipment(order + ", fulfilled");
- }
-
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 600f3f0c74..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.warehouse;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (OSGi declarative services implementation).
- */
-
-public class OSGiWarehouseComponentImpl implements Warehouse {
-
- private Shipper shipper;
-
-
- protected void setShipper(Shipper shipper) {
- this.shipper = shipper;
- }
-
- protected void unsetShipper(Shipper shipper) {
- this.shipper = null;
- }
-
- public void fulfillOrder(String order) {
- shipper.processShipment(order + ", fulfilled");
-
- }
-
-
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index 0ba54b363a..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.warehouse;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (OSGi procedural services implementation).
- */
-
-public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse {
-
- private Shipper shipper;
-
- public OSGiWarehouseImpl() {
- super("supplychain.warehouse.Warehouse", "shipper");
- }
-
-
- public void fulfillOrder(String order) {
- shipper.processShipment(order + ", fulfilled");
-
- }
-
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.warehouse;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-
- public void fulfillOrder(String order);
-
-}
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <service name="supplychain.customer.Customer">
- <interface.java interface="supplychain.customer.Customer"/>
- </service>
- <reference name="retailer">
- <interface.java interface="supplychain.retailer.Retailer"/>
- </reference>
-
-</componentType> \ No newline at end of file
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <service name="supplychain.customer.Customer">
- <interface.java interface="supplychain.customer.Customer"/>
- </service>
- <reference name="retailer">
- <interface.java interface="supplychain.retailer.Retailer"/>
- </reference>
-
-</componentType> \ No newline at end of file
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
deleted file mode 100644
index 4779eff514..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://supplychain"
- xmlns:supplychain="http://supplychain">
- <deployable composite="supplychain:supplychain"/>
-
- <export.java package="supplychain.customer"/>
- <import.java package="supplychain.retailer"/>
-
- <import namespace="RetailerV2" location="RetailerV2" />
- <import namespace="ShipperV2" location="ShipperV2" />
- <import namespace="WarehouseV2" location="WarehouseV2" />
- <export namespace="CustomerV2" />
-</contribution>
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
deleted file mode 100644
index d505834f15..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://supplychain"
- xmlns:supplychain="http://supplychain">
- <export namespace="RetailerV2" />
-
-
- <export.java package="supplychain.retailer"/>
- <import.java package="supplychain.warehouse"/>
-
-</contribution>
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
deleted file mode 100644
index 6bcf6cef0a..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://supplychain"
- xmlns:supplychain="http://supplychain">
- <export namespace="ShipperV2" />
-
- <export.java package="supplychain.shipper"/>
- <import.java package="supplychain.customer"/>
-</contribution>
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
deleted file mode 100644
index 210a68011f..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://supplychain"
- xmlns:supplychain="http://supplychain">
- <deployable composite="supplychain:supplychain"/>
-</contribution>
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
deleted file mode 100644
index e23e1a2ecd..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://supplychain"
- xmlns:supplychain="http://supplychain">
- <export namespace="WarehouseV2" />
-
-
- <export.java package="supplychain.warehouse"/>
- <import.java package="supplychain.shipper"/>
-</contribution>
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
deleted file mode 100644
index 9832da880e..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <service name="supplychain.retailer.Retailer">
- <interface.java interface="supplychain.retailer.Retailer"/>
- </service>
- <reference name="warehouse">
- <interface.java interface="supplychain.warehouse.Warehouse"/>
- </reference>
-
-</componentType> \ No newline at end of file
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
deleted file mode 100644
index 5586179421..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <service name="supplychain.shipper.Shipper">
- <interface.java interface="supplychain.shipper.Shipper"/>
- </service>
- <reference name="customer">
- <interface.java interface="supplychain.customer.Customer"/>
- </reference>
-
-</componentType> \ No newline at end of file
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
deleted file mode 100644
index ccc4f84ee4..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <service name="supplychain.warehouse.Warehouse">
- <interface.java interface="supplychain.warehouse.Warehouse"/>
- </service>
-
- <reference name="shipper">
- <interface.java interface="supplychain.shipper.Shipper"/>
- </reference>
-</componentType> \ No newline at end of file
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
deleted file mode 100644
index 644b207e70..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: supplychain.customer.Customer
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.retailer;version="[2.0.0,3.0.0)",
- supplychain.shipper;version="[2.0.0,3.0.0)",
- supplychain.warehouse;version="[2.0.0,3.0.0)"
-Export-Package: supplychain.customer;version="2.0.0"
-Bundle-Activator: supplychain.customer.OSGiCustomerImpl
-
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
deleted file mode 100644
index e649870356..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: supplychain.customer.Customer
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.retailer,
- supplychain.shipper,
- supplychain.warehouse
-Export-Package: supplychain.customer;version="2.0.0"
-Bundle-Activator: supplychain.customer.OSGiCustomerImpl
-
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
deleted file mode 100644
index 8e8e33ecd1..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: supplychain.retailer.Retailer
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.warehouse;version="[2.0.0,3.0.0)"
-Export-Package: supplychain.retailer;version="2.0.0"
-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
deleted file mode 100644
index 2f4b56835b..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
+++ /dev/null
@@ -1 +0,0 @@
-Manifest-Version: 1.0
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
deleted file mode 100644
index 5f4a8b94ec..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: supplychain.shipper.Shipper
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.customer;version="[2.0.0,3.0.0)"
-Export-Package: supplychain.shipper;version="2.0.0"
-Bundle-Activator: supplychain.shipper.OSGiShipperImpl
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
deleted file mode 100644
index 57d2ac9e4d..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SupplyChain
-Bundle-SymbolicName: supplychain.SupplyChain
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework
-Export-Package: supplychain.customer;version="2.0.0",
- supplychain.retailer;version="2.0.0",
- supplychain.warehouse;version="2.0.0",
- supplychain.shipper;version="2.0.0"
-Bundle-ClassPath: .,CustomerV2.jar,RetailerV2.jar,WarehouseV2.jar,ShipperV2.jar
-
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
deleted file mode 100644
index 2e1399bb3b..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: supplychain.warehouse.Warehouse
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.shipper;version="[2.0.0,3.0.0)"
-Export-Package: supplychain.warehouse;version="2.0.0"
-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
diff --git a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
deleted file mode 100644
index bb8fb2b07c..0000000000
--- a/branches/sca-java-1.4/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://supplychain"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponentV2">
- <tuscany:implementation.osgi
- bundle="Customer"
- bundleSymbolicName="supplychain.customer.Customer"
- bundleVersion="2.0.0"
- />
-
- <!--implementation.java class="supplychain.customer.JavaCustomerComponentImpl" /-->
- <reference name="retailer" target="RetailerComponentV2" />
- </component>
-
- <component name="RetailerComponentV2">
- <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />
- <!--implementation.osgi
- bundle="Retailer"
- bundleLocation="file:target/Retailer.jar"
- /-->
- <reference name="warehouse" target="WarehouseComponentV2"/>
- </component>
-
- <component name="WarehouseComponentV2">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
- <!--implementation.osgi
- bundle="Warehouse"
- bundleLocation="file:target/Warehouse.jar"
- /-->
- <reference name="shipper" target="ShipperComponentV2" />
- </component>
-
- <component name="ShipperComponentV2">
- <tuscany:implementation.osgi
- bundle="Shipper"
- bundleSymbolicName="supplychain.shipper.Shipper"
- bundleVersion="2.0.0"
- />
- <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /-->
- <reference name="customer" target="CustomerComponentV2" />
- </component>
-
-
-</composite>