summaryrefslogtreecommitdiffstats
path: root/branches/sca-android/samples/osgi-supplychain/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-android/samples/osgi-supplychain/src/main')
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java121
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java43
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java33
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java50
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java51
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java47
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java53
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java46
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java44
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java28
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java47
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java45
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java42
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java28
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java47
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java47
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java44
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java28
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/Customer.componentType28
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType28
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType28
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/DSShipper.componentType28
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType28
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/Retailer.componentType28
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/Shipper.componentType28
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/Warehouse.componentType28
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf11
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf10
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf10
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf10
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf10
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml32
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf11
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml32
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf10
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml33
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf11
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml32
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/supplychain.composite61
-rw-r--r--branches/sca-android/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite61
40 files changed, 0 insertions, 1402 deletions
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index 5f40054ada..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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 dont 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-android/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
deleted file mode 100644
index 64814487cb..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ /dev/null
@@ -1,43 +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 org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import supplychain.customer.Customer;
-
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate a Customer service component and invoke it.
- */
-public class SupplyChainClient {
-
- public static final void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("supplychain.composite");
- Customer customer = scaDomain.getService(Customer.class, "CustomerComponent");
-
- System.out.println("Main thread " + Thread.currentThread());
- customer.purchaseGoods();
- System.out.println("Main thread sleeping ...");
- Thread.sleep(1000);
-
- scaDomain.close();
- }
-}
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 225dce0236..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 023d716651..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,50 +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;
-
- @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-android/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a1c7fce60a..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 4647a716c7..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index d0d29f94f8..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,53 +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;
-
-
- @Reference
- public void setWarehouse(Warehouse warehouse) {
- this.warehouse = warehouse;
- }
-
-
- public void submitOrder(String order) {
-
- warehouse.fulfillOrder(order + ", submitted");
-
- }
-
-
-
-
-}
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index 1b7fb15bf1..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e97331c06c..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 4206ce7dc8..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.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.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;
-
- @Reference
- public void setCustomer(Customer customer) {
- this.customer = customer;
- }
-
- public void processShipment(String order) {
- customer.notifyShipment(order + ", shipped");
- }
-
-
-}
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index 0f88cca213..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index f55a068ede..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index 72eec76cc2..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.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 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;
-
-
- @Reference
- public void setShipper(Shipper shipper) {
- this.shipper = shipper;
- }
-
- public void fulfillOrder(String order) {
- shipper.processShipment(order + ", fulfilled");
- }
-
-
-}
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 600f3f0c74..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index b8bca97bd0..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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 componentm (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-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/resources/Customer.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/Customer.componentType
deleted file mode 100644
index 5c61a0961c..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/Customer.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-android/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
deleted file mode 100644
index 87a184d968..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSCustomer.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>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
deleted file mode 100644
index 872ab6601a..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSRetailer.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>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSShipper.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
deleted file mode 100644
index 57fcbbc5d1..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSShipper.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>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
deleted file mode 100644
index 75fa8029f7..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSWarehouse.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>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/Retailer.componentType
deleted file mode 100644
index 15185f2bf9..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/Retailer.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-android/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/Shipper.componentType
deleted file mode 100644
index 675597d80b..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/Shipper.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-android/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
deleted file mode 100644
index 6e1ac3e5a9..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/Warehouse.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-android/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
deleted file mode 100644
index 88d79e5219..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.retailer
-Export-Package: supplychain.customer
-Bundle-Activator: supplychain.customer.OSGiCustomerImpl
-
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
deleted file mode 100644
index d95ef5d582..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.warehouse
-Export-Package: supplychain.retailer
-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
deleted file mode 100644
index de7ac7ec7a..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.customer
-Export-Package: supplychain.shipper
-Bundle-Activator: supplychain.shipper.OSGiShipperImpl
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
deleted file mode 100644
index 21241a6899..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/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: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.shipper
-Export-Package: supplychain.warehouse
-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
deleted file mode 100644
index b5c5a862be..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: ds.supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.retailer
-Export-Package: supplychain.customer
-Service-Component: osgi/ds/Customer.xml
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
deleted file mode 100644
index 5b368afd5b..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.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.
--->
-<component name="CustomerComponent" immediate="true">
- <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
- <service>
- <provide interface="supplychain.customer.Customer" />
- </service>
- <reference
- name="retailer"
- interface="supplychain.retailer.Retailer"
- bind="setRetailer"
- unbind="unsetRetailer"
- policy="dynamic"
- />
-</component>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
deleted file mode 100644
index 47897d16ca..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: ds.supplychain.retailer.Retailer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.warehouse
-Export-Package: supplychain.retailer
-Service-Component: osgi/ds/Retailer.xml
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
deleted file mode 100644
index cae7fdfde2..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.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.
--->
-<component name="RetailerComponent" immediate="true" >
- <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
- <service>
- <provide interface="supplychain.retailer.Retailer" />
- </service>
- <reference
- name="warehouse"
- interface="supplychain.warehouse.Warehouse"
- bind="setWarehouse"
- unbind="unsetWarehouse"
- policy="dynamic"
- />
-</component>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
deleted file mode 100644
index f5333c7caa..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: ds.supplychain.shipper.Shipper
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.customer
-Export-Package: supplychain.shipper
-Service-Component: osgi/ds/Shipper.xml
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
deleted file mode 100644
index d894309b71..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
+++ /dev/null
@@ -1,33 +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.
--->
-<component name="ShipperComponent" immediate="true">
- <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
- <service>
- <provide interface="supplychain.shipper.Shipper"/>
- </service>
- <reference
- name="customer"
- interface="supplychain.customer.Customer"
- bind="setCustomer"
- unbind="unsetCustomer"
- cardinality="0..1"
- policy="dynamic"
- />
-</component>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
deleted file mode 100644
index 6166549e5a..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: ds.supplychain.warehouse.Warehouse
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.shipper
-Export-Package: supplychain.warehouse
-Service-Component: osgi/ds/Warehouse.xml
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
deleted file mode 100644
index fc86a76784..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.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.
--->
-<component name="WarehouseComponent" immediate="true">
- <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
- <service>
- <provide interface="supplychain.warehouse.Warehouse"/>
- </service>
- <reference
- name="shipper"
- interface="supplychain.shipper.Shipper"
- bind="setShipper"
- unbind="unsetShipper"
- policy="dynamic"
- />
-</component>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/supplychain.composite b/branches/sca-android/samples/osgi-supplychain/src/main/resources/supplychain.composite
deleted file mode 100644
index 0bbfed9176..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/supplychain.composite
+++ /dev/null
@@ -1,61 +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="CustomerComponent">
- <tuscany:implementation.osgi
- bundleSymbolicName="supplychain.customer.Customer"
- />
-
- <!--implementation.java class="supplychain.customer.JavaCustomerComponentImpl" -->
- <reference name="retailer" target="RetailerComponent" />
- </component>
-
- <component name="RetailerComponent">
- <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />
- <!--implementation.osgi
- bundleSymbolicName="supplychain.retailer.Retailer"
- /-->
- <reference name="warehouse" target="WarehouseComponent"/>
- </component>
-
- <component name="WarehouseComponent">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
- <!--implementation.osgi
- bundleSymbolicName="supplychain.warehouse.Warehouse"
- /-->
- <reference name="shipper" target="ShipperComponent" />
- </component>
-
- <component name="ShipperComponent">
- <tuscany:implementation.osgi
- bundleSymbolicName="supplychain.shipper.Shipper"
- />
- <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /-->
- <reference name="customer" target="CustomerComponent" />
- </component>
-
-
-</composite>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/branches/sca-android/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
deleted file mode 100644
index d1e11168e2..0000000000
--- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
+++ /dev/null
@@ -1,61 +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="CustomerComponent">
- <tuscany:implementation.osgi
- bundleSymbolicName="ds.supplychain.customer.Customer"
- />
-
- <!--implementation.java class="supplychain.customer.JavaCustomerComponentImpl" -->
- <reference name="retailer" target="RetailerComponent" />
- </component>
-
- <component name="RetailerComponent">
- <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />
- <!--tuscany:implementation.osgi
- bundleSymbolicName="ds.supplychain.retailer.Retailer"
- /-->
- <reference name="warehouse" target="WarehouseComponent"/>
- </component>
-
- <component name="WarehouseComponent">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
- <!--implementation.osgi
- bundleSymbolicName="ds.supplychain.warehouse.Warehouse"
- /-->
- <reference name="shipper" target="ShipperComponent" />
- </component>
-
- <component name="ShipperComponent">
- <tuscany:implementation.osgi
- bundleSymbolicName="ds.supplychain.shipper.Shipper"
- />
- <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /-->
- <reference name="customer" target="CustomerComponent" />
- </component>
-
-
-</composite>