Moving 2.x contribs

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835178 13f79535-47bb-0310-9956-ffa450edef68

265 files changed, 0 insertions, 11433 deletions

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
deleted file mode 100644
index 37e750d7ec..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.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 callback.client;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-/*
- * Callback interface
- */
-public interface CallbackCallback {
-
-    public void callbackMessage(String aString);
-
-    public void callbackIncrement(String aString);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
deleted file mode 100644
index 9c145ff59f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package callback.client;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-/**
- * Callback test client interface
- */
-public interface CallbackClient {
-
-    public void run();
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
deleted file mode 100644
index b1bb8c2aa0..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
+++ /dev/null
@@ -1,141 +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 callback.client;
-
-import junit.framework.Assert;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import callback.service.CallbackService;
-
-@Service(CallbackClient.class)
-/**
- * Callback test client implementation
- */
-public class JavaCallbackClientImpl implements CallbackClient, CallbackCallback {
-
-	@Reference
-    protected CallbackService callbackService;
-	
-    private static String returnMessage = null;
-    private static int callbackCount = 0;
-    private static Object monitor = new Object();
-
-    public void run() {
-
-        // This tests basic callback patterns.
-
-        // Test1 is the basic callback where the target calls back prior to
-        // returning to the client.
-        test1a();
-
-        // Test2 is where the target does not call back to the client.
-        test1b();
-
-        // Test3 is where the target calls back multiple times to the client.
-        test1c();
-
-        return;
-    }
-
-    private void test1a() {
-        callbackService.knockKnock("Knock Knock");
-        int count = 0;
-
-        // 
-        // If we cant get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallbackITest - test1a", "Who's There", this.getReturnMessage());
-
-    }
-
-    private void test1b() {
-        callbackService.noCallback("No Reply Desired");
-        Assert.assertEquals("CallbackITest - test1b", 1, 1);
-
-        return;
-    }
-
-    private void test1c() {
-        callbackService.multiCallback("Call me back 3 times");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (this.getCallbackCount() < 3 && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallbackITest - test1c", 3, this.getCallbackCount());
-        return;
-    }
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    public int getCallbackCount() {
-        return callbackCount;
-    }
-
-    public void incrementCallbackCount() {
-        callbackCount++;
-    }
-
-    public void callbackMessage(String aString) {
-        System.out.println("Entering callback callbackMessage: " + aString);
-        synchronized (monitor) {
-            this.setReturnMessage(aString);
-            monitor.notify();
-        }
-    }
-
-    public void callbackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        synchronized (monitor) {
-            this.incrementCallbackCount();
-            monitor.notify();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
deleted file mode 100644
index 1c65ca573b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
+++ /dev/null
@@ -1,181 +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 callback.client;
-
-import java.util.Hashtable;
-
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-import callback.service.CallbackService;
-
-/**
- * OSGi Callback test client implementation
- */
-public class OSGiCallbackClientImpl implements 
-        CallbackClient, CallbackCallback, BundleActivator {
-
-    protected CallbackService callbackService;
-    
-    private static String returnMessage = null;
-    private static int callbackCount = 0;
-    private static Object monitor = new Object();
-    
-    private BundleContext bundleContext;
-
-    public void run() {
-        
-        // This tests basic callback patterns.
-
-        // Test1 is the basic callback where the target calls back prior to
-        // returning to the client.
-        test1a();
-
-        // Test2 is where the target does not call back to the client.
-        test1b();
-
-        // Test3 is where the target calls back multiple times to the client.
-        test1c();
-
-        return;
-    }
-    
-   
-
-    private void test1a() {
-        callbackService.knockKnock("Knock Knock");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        if (!"Who's There".equals(this.getReturnMessage())) {
-           throw new RuntimeException("CallbackITest - test1a");
-        }
-
-    }
-
-    private void test1b() {
-        callbackService.noCallback("No Reply Desired");
-
-        return;
-    }
-
-    private void test1c() {
-        callbackService.multiCallback("Call me back 3 times");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (this.getCallbackCount() < 3 && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        if (this.getCallbackCount() != 3)
-            throw new RuntimeException("CallbackITest - test1c");
-        return;
-    }
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    public int getCallbackCount() {
-        return callbackCount;
-    }
-
-    public void incrementCallbackCount() {
-        callbackCount++;
-    }
-
-    public void callbackMessage(String aString) {
-        System.out.println("Entering callback callbackMessage: " + aString);
-        synchronized (monitor) {
-            this.setReturnMessage(aString);
-            monitor.notify();
-        }
-    }
-
-    public void callbackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        synchronized (monitor) {
-            this.incrementCallbackCount();
-            monitor.notify();
-        }
-    }
-
-    
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiCallbackClientImpl bundle ");
-        
-        this.bundleContext = bc;
-        
-        Hashtable<String, Object> serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.service.name", "CallbackClient/CallbackClient");
-
-        serviceProps.put("component.name", "CallbackClient");        
-        bundleContext.registerService("callback.client.CallbackClient", this, serviceProps);
-        
-        Hashtable<String, Object> callbackProps = new Hashtable<String, Object>();
-        callbackProps.put("component.service.name", "CallbackClient/callbackService");
-        callbackProps.put("component.name", "CallbackClient");
-        
-        bundleContext.registerService("callback.client.CallbackCallback", this, callbackProps);
-        
-        ServiceReference ref= bundleContext.getServiceReference("callback.service.CallbackService");
-        
-        if (ref != null)
-            callbackService = (callback.service.CallbackService)bundleContext.getService(ref);
-        
-        
-        
-      
-    }
-    
-    public void stop(BundleContext bc)  {
-    }
-    
-  
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
deleted file mode 100644
index 958b0bf266..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
+++ /dev/null
@@ -1,39 +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 callback.service;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-
-import callback.client.CallbackCallback;
-
-@Remotable
-@Callback(CallbackCallback.class)
-/*
- * Callback service interface
- */
-public interface CallbackService {
-
-    public void knockKnock(String aString);
-
-    public void noCallback(String aString);
-
-    public void multiCallback(String aString);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
deleted file mode 100644
index 88fd845acd..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
+++ /dev/null
@@ -1,68 +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 callback.service;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Service;
-
-import callback.client.CallbackCallback;
-
-@Service(CallbackService.class)
-/*
- * Callback service implementation
- */
-public class JavaCallbackServiceImpl implements CallbackService {
-
-    private CallbackCallback callback;
-    
-    @Callback
-    protected void setCallback(CallbackCallback callback) {
-        this.callback = callback;
-    }
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        callback.callbackMessage("Who's There");
-        System.out.println("CallbackServiceImpl response sent");
-        return;
-
-    }
-
-    public void multiCallback(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        callback.callbackIncrement("Who's There 1");
-        System.out.println("CallbackServiceImpl response sent");
-        callback.callbackIncrement("Who's There 2");
-        System.out.println("CallbackServiceImpl response sent");
-        callback.callbackIncrement("Who's There 3");
-        System.out.println("CallbackServiceImpl response sent");
-        return;
-
-    }
-
-    public void noCallback(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        // System.out.println("CallbackServiceImpl No response desired");
-        return;
-
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
deleted file mode 100644
index 21753cc33b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
+++ /dev/null
@@ -1,95 +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 callback.service;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.oasisopen.sca.annotation.Callback;
-
-import callback.client.CallbackCallback;
-
-/*
- * OSGi Callback service implementation
- */
-public class OSGiCallbackServiceImpl implements CallbackService, BundleActivator {
-
-    @Callback
-    protected CallbackCallback callback;
-    
-    
-    private BundleContext bundleContext;
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        callback.callbackMessage("Who's There");
-        System.out.println("CallbackServiceImpl response sent");
-        return;
-
-    }
-
-    public void multiCallback(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        callback.callbackIncrement("Who's There 1");
-        System.out.println("CallbackServiceImpl response sent");
-        callback.callbackIncrement("Who's There 2");
-        System.out.println("CallbackServiceImpl response sent");
-        callback.callbackIncrement("Who's There 3");
-        System.out.println("CallbackServiceImpl response sent");
-        return;
-
-    }
-
-    public void noCallback(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        // System.out.println("CallbackServiceImpl No response desired");
-        return;
-
-    }
-    
-
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiCallbackServiceImpl bundle ");
-        
-        this.bundleContext = bc;
-        
-        Hashtable<String, Object> serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.service.name", "CallbackService/CallbackService");
-        bundleContext.registerService("callback.service.CallbackService", this, serviceProps);
-        
-       
-        ServiceReference ref= bundleContext.getServiceReference("callback.client.CallbackCallback");
-        
-        if (ref != null)
-            callback = (CallbackCallback)bundleContext.getService(ref);
-        
-    }
-    
-    public void stop(BundleContext bc)  {
-    }
-    
-    
-  
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
deleted file mode 100644
index acef7fbf6a..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.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 conversation.client;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.EndsConversation;
-import org.oasisopen.sca.annotation.Remotable;
-
-
-/**
- * The callback interface used when testing conversational callbacks
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-@Conversational
-public interface ConversationalCallback {
-	
-    public void init();
-    
-    public void destroy();
-    
-    public void initializeCount(int count);
-    
-    public void incrementCount();
-    
-    public int retrieveCount();
-    
-    public void businessException() throws Exception;        
-    
-    @EndsConversation
-    public String endConversation();
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
deleted file mode 100644
index 19b2fed53e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.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 conversation.client;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The client for the conversational itest. Is implemented by clients
- * offering both stateless and stateful callbacks
- *
- * @version $Rev$ $Date$
- */
-
-@Remotable
-public interface ConversationalClient { 
-	
-	public int runConversationFromInjectedReference(); 	
-	public int runConversationFromServiceReference();
-	public int runConversationWithUserDefinedConversationId();
-	public String runConversationCheckUserDefinedConversationId();	
-	public int runConversationCheckingScope();
-	public int runConversationWithCallback(); 
-	public int runConversationHavingPassedReference();
-	public String runConversationBusinessException();
-	public String runConversationBusinessExceptionCallback();
-	public int runConversationCallingEndedConversation();
-	public int runConversationCallingEndedConversationCallback();
-	public int runConversationAgeTimeout();
-	public int runConversationIdleTimeout();
-	public int runConversationPrincipleError();	
-    
-    public String getCalls();
-    public String getServiceCalls();
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
deleted file mode 100644
index 5eb16be597..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
+++ /dev/null
@@ -1,105 +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 conversation.client;
-
-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 conversation.client.ConversationalCallback;
-import conversation.client.ConversationalClient;
-import conversation.client.ConversationalClientStatefulImpl;
-import conversation.client.ConversationalClientStatelessImpl;
-
-/*
- * OSGi bundle activator for conversation tests
- */
-public class ConversationalClientActivator implements BundleActivator, ServiceListener {
-
-   
-    private BundleContext bundleContext;
-
-
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiConversationClientActivator ");
-        
-        this.bundleContext = bc;
-        
-        bc.addServiceListener(this);
-        
-        Hashtable<String, Object> serviceProps;
-        
-        serviceProps = new Hashtable<String, Object>();
-         
-        serviceProps.put("component.name", "ConversationalStatelessClientStatelessService");
-        Object statelessClientFactory1 = 
-            new ConversationalClientServiceFactory(ConversationalClientStatelessImpl.class, bundleContext, 1);
-        bundleContext.registerService(
-                new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()},
-                statelessClientFactory1, 
-                serviceProps);
-      
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalStatelessClientStatefulService");       
-        Object statelessClientFactory2 = 
-            new ConversationalClientServiceFactory(ConversationalClientStatelessImpl.class, bundleContext, 2);
-        bundleContext.registerService(
-                new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()},
-                statelessClientFactory2,
-                serviceProps);
-        
-            
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalStatefulClientStatelessService");
-        Object statefulClientFactory1 = 
-            new ConversationalClientServiceFactory(ConversationalClientStatefulImpl.class, bundleContext, 3);
-        bundleContext.registerService(
-                new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()},
-                statefulClientFactory1, 
-                serviceProps);
-        
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalStatefulClientStatefulService");
-        Object statefulClientFactory2 = 
-            new ConversationalClientServiceFactory(ConversationalClientStatefulImpl.class, bundleContext, 4);
-        bundleContext.registerService(
-                new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()},
-                statefulClientFactory2, 
-                serviceProps);
-      
-        
-    }
-    
-    
-    
-    public void stop(BundleContext bc)  {
-    }
-
-    public void serviceChanged(ServiceEvent event) {
-        
-        if (event.getType() == ServiceEvent.REGISTERED) {
-            
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
deleted file mode 100644
index 8479624546..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
+++ /dev/null
@@ -1,135 +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 conversation.client;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-
-import conversation.client.ConversationalClientStatefulImpl;
-import conversation.client.ConversationalClientStatelessImpl;
-import conversation.referenceclient.ConversationalReferenceClient;
-import conversation.service.ConversationalService;
-
-public class ConversationalClientServiceFactory implements ServiceFactory {
-    
-    private Class<?> clazz;
-    private BundleContext bundleContext;
-    private int serviceNum;
-    
-    public ConversationalClientServiceFactory(Class<?> clazz, BundleContext bundleContext, int serviceNum) {
-        this.clazz = clazz;
-        this.bundleContext = bundleContext;
-        this.serviceNum = serviceNum;
-    }
-
-    public Object getService(Bundle bundle, ServiceRegistration reg) {
-
-
-        try {
-            Object instance = clazz.newInstance();
-            
-            ConversationalClientStatelessImpl statelessClient = null;
-            ConversationalClientStatefulImpl statefulClient = null;
-            
-            if (serviceNum == 1 || serviceNum == 2) {
-                
-                ServiceReference ref = bundleContext.getServiceReference(ConversationalReferenceClient.class.getName());
-                statelessClient  = (ConversationalClientStatelessImpl)instance;
-                statelessClient.conversationalReferenceClient = 
-                    (ConversationalReferenceClient)bundleContext.getService(ref);
-            }
-            if (serviceNum == 1) {
-                
-                ServiceReference ref = getServiceReference(ConversationalService.class.getName(), 
-                    "(component.name=ConversationalServiceStateless)");
-                statelessClient.conversationalService = (ConversationalService)bundleContext.getService(ref);
-                
-            }
-            
-            if (serviceNum == 2) {
-                
-                ServiceReference ref = getServiceReference(ConversationalService.class.getName(), 
-                    "(component.name=ConversationalServiceStateful)");
-                statelessClient.conversationalService = (ConversationalService)bundleContext.getService(ref);
-                
-            }
-            
-
-            if (serviceNum == 3 || serviceNum == 4) {
-                
-                ServiceReference ref = bundleContext.getServiceReference(ConversationalReferenceClient.class.getName());
-                statefulClient  = (ConversationalClientStatefulImpl)instance;
-                statefulClient.conversationalReferenceClient = 
-                    (ConversationalReferenceClient)bundleContext.getService(ref);
-            }
-            if (serviceNum == 3) {
-                
-                ServiceReference ref = getServiceReference(ConversationalService.class.getName(), 
-                    "(component.name=ConversationalServiceStateless)");
-                statefulClient.conversationalService = (ConversationalService)bundleContext.getService(ref);
-                
-            }
-            
-            if (serviceNum == 4) {
-                
-                ServiceReference ref = getServiceReference(ConversationalService.class.getName(), 
-                    "(component.name=ConversationalServiceStateful)");
-                statefulClient.conversationalService = (ConversationalService)bundleContext.getService(ref);
-                
-            }
-            
-            return instance;
-        } catch (Exception e) {
-            
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public void ungetService(Bundle bundle, ServiceRegistration reg, Object obj) {
-    	
-    }
-    
-    private ServiceReference getServiceReference(String name, String filter) throws Exception {
-        
-        ServiceReference refs[] = bundleContext.getServiceReferences(name, filter);
-        ServiceReference ref = refs[0];
-        int ranking = 0;
-        if (ref.getProperty(Constants.SERVICE_RANKING) instanceof Integer)
-            ranking = (Integer)ref.getProperty(Constants.SERVICE_RANKING);
-        for (int i = 1; i < refs.length; i++) {
-            int thisranking = 0;
-            if (refs[i].getProperty(Constants.SERVICE_RANKING) instanceof Integer) {
-                thisranking = (Integer)refs[i].getProperty(Constants.SERVICE_RANKING);
-            }
-            if (thisranking > ranking) {
-                ref = refs[i];
-                ranking = thisranking;
-            }
-        }
-        
-        return ref;
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
deleted file mode 100644
index ed1f12de44..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
+++ /dev/null
@@ -1,254 +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 conversation.client;
-
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.ConversationAttributes;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import conversation.referenceclient.ConversationalReferenceClient;
-import conversation.service.ConversationalService;
-
-/**
- * The client for the conversational itest which presents a stateful
- * callback interface
- *
- * @version $Rev$ $Date$
- */
-
-@Service(interfaces={ConversationalClient.class})
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
-                        maxIdleTime="5 minutes",
-                        singlePrincipal=false)
-public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback {
-    
-    @Context
-    protected ComponentContext componentContext;
-    
-    protected ConversationalService conversationalService;
-    
-    protected ConversationalReferenceClient conversationalReferenceClient;
-      
-    private int clientCount = 0;
-    private int callbackCount = 0;  
-    
-    
-    // a static member variable that records the number of times this service is called
-    public static StringBuffer calls = new StringBuffer();        
-	
-    // From ConversationalClient
-	public int runConversationFromInjectedReference(){
-	    calls.append("runConversationFromInjectedReference,");	    
-	    conversationalService.initializeCount(1);
-	    conversationalService.incrementCount();
-	    clientCount = conversationalService.retrieveCount();
-	    conversationalService.endConversation();
-	    
-	    return clientCount;
-	}
-    public int runConversationFromServiceReference(){
-        calls.append("runConversationFromServiceReference,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }	
-    public int runConversationWithUserDefinedConversationId(){
-        calls.append("runConversationWithUserDefinedConversationId,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");
-        serviceReference.setConversationID("MyConversation1");
-        
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }    
-    public String runConversationCheckUserDefinedConversationId(){
-        calls.append("runConversationCheckUserDefinedConversationId,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");
-        serviceReference.setConversationID("MyConversation2");
-        
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        return callableReference.endConversation();
-              
-    }      
-    public int runConversationCheckingScope(){
-        calls.append("runConversationCheckingScope,");
-        // run a conversation
-        return runConversationFromInjectedReference();
-        
-        // test will then use a static method to find out how many times 
-        // init/destroy were called
-    }    
-	public int runConversationWithCallback(){
-	    calls.append("runConversationWithCallback,");
-	    callbackCount = 2;
-        conversationalService.initializeCountCallback(1);
-        conversationalService.incrementCountCallback();
-        clientCount = conversationalService.retrieveCountCallback();
-        conversationalService.endConversationCallback();
-        
-        return clientCount;
-    } 
-    public int runConversationHavingPassedReference(){
-        calls.append("runConversationHavingPassedReference,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");       
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        conversationalReferenceClient.incrementCount(serviceReference);
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        serviceReference.getConversation().end();
-        
-        return clientCount;
-    }
-    public String runConversationBusinessException(){
-        calls.append("runConversationbusinessException,");      
-        try {
-            conversationalService.initializeCount(1);
-            conversationalService.businessException();
-            clientCount = conversationalService.retrieveCount();
-            conversationalService.endConversation();
-        } catch(Exception ex) {
-            return ex.getMessage();
-        }
-         
-        return "No Exception Returned";
-    }
-    
-    public String runConversationBusinessExceptionCallback(){
-        calls.append("runConversationbusinessExceptionCallback,");
-        try {
-            conversationalService.initializeCountCallback(1);
-            conversationalService.businessExceptionCallback();
-            clientCount = conversationalService.retrieveCountCallback();
-            conversationalService.endConversationCallback();
-        } catch(Exception ex) {
-            return ex.getMessage();
-        }
-         
-        return "No Exception Returned";
-    }   
-    
-    public int runConversationCallingEndedConversation(){
-        calls.append("runConversationCallingEndedConversation,");
-        conversationalService.initializeCount(1);
-        conversationalService.endConversation();
-        return conversationalService.retrieveCount();
-    }   
-    
-    public int runConversationCallingEndedConversationCallback(){
-        calls.append("runConversationCallingEndedConversationCallback,");
-        conversationalService.initializeCountCallback(1);
-        conversationalService.endConversationCallback();
-        return conversationalService.retrieveCountCallback();
-    }  
-    
-    public int runConversationAgeTimeout(){
-        calls.append("runConversationAgeTimeout,");
-        // done in other testing
-        return clientCount;
-    }
-    public int runConversationIdleTimeout(){
-        calls.append("runConversationIdleTimeout,");
-        // done in other testing
-        return clientCount;
-    }
-    public int runConversationPrincipleError(){
-        calls.append("runConversationPrincipleError,");
-        // TODO - when policy framework is done
-        return clientCount;
-    }
-    
-    
-    // From ConversationalCallback
-    @Init
-    public void init(){
-        calls.append("init,");
-    }
-    
-    @Destroy
-    public void destroy(){
-        calls.append("destroy,"); 
-    }
-    
-    public void initializeCount(int count){
-        calls.append("initializeCount,");
-        callbackCount += count;
-    }
-    
-    public void incrementCount(){
-        calls.append("incrementCount,");
-        callbackCount++;
-    }
-    
-    public int retrieveCount(){
-        calls.append("retrieveCount,");
-        return  callbackCount;
-    }
-    
-    public void businessException() throws Exception {
-        throw new Exception("Business Exception");
-    }     
-    
-    public String endConversation(){
-        calls.append("endConversation,");
-        callbackCount = 0;
-        return null;
-    }
-    
-    public String getCalls() {
-        return calls.toString();
-    }
-
-    public String getServiceCalls() {
-        return conversationalService.getCalls().toString();
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
deleted file mode 100644
index e0f8c51262..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
+++ /dev/null
@@ -1,253 +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 conversation.client;
-
-
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import conversation.referenceclient.ConversationalReferenceClient;
-import conversation.service.ConversationalService;
-
-/**
- * The client for the conversational itest which presents a stateful
- * callback interface
- *
- * @version $Rev$ $Date$
- */
-
-@Service(interfaces={ConversationalClient.class})
-@Scope("STATELESS")
-public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback {
-   
-    @Context
-    protected ComponentContext componentContext;
-    
-    @Reference 
-    protected ConversationalService conversationalService;
-    
-    @Reference
-    protected ConversationalReferenceClient conversationalReferenceClient;
-    
-    private int clientCount = 0;
-    private int callbackCount = 0;
-    
-    // a static member variable that records the number of times this service is called
-    public static StringBuffer calls = new StringBuffer();    
-	
-    // From ConversationalClient
-    public int runConversationFromInjectedReference(){
-        calls.append("runConversationFromInjectedReference,");
-        conversationalService.initializeCount(1);
-        conversationalService.incrementCount();
-        clientCount = conversationalService.retrieveCount();
-        conversationalService.endConversation();
-        
-        return clientCount;
-    }
-    public int runConversationFromServiceReference(){
-        calls.append("runConversationFromServiceReference,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");       
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }   
-    public int runConversationWithUserDefinedConversationId(){
-        calls.append("runConversationWithUserDefinedConversationId,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");       
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }    
-    public String runConversationCheckUserDefinedConversationId(){
-        calls.append("runConversationCheckUserDefinedConversationId,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");
-        serviceReference.setConversationID("MyConversation2");
-        
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        return callableReference.endConversation();
-              
-    }     
-    public int runConversationCheckingScope(){
-        calls.append("runConversationCheckingScope,");
-        // run a conversation
-        return runConversationFromInjectedReference();
-        
-        // test will then use a static method to find out how many times 
-        // init/destroy were called
-    }
-    public int runConversationWithCallback(){
-        calls.append("runConversationWithCallback,");
-        conversationalService.initializeCountCallback(1);
-        conversationalService.incrementCountCallback();
-        clientCount = conversationalService.retrieveCountCallback();
-        conversationalService.endConversationCallback();
-        
-        return clientCount;
-    } 
-    
-    public int runConversationHavingPassedReference(){
-        calls.append("runConversationHavingPassedReference,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");       
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        conversationalReferenceClient.incrementCount(serviceReference);
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }	
-    
-	public String runConversationBusinessException(){
-	    calls.append("runConversationbusinessException,");	    
-	    try {
-            conversationalService.initializeCount(1);
-            conversationalService.businessException();
-            clientCount = conversationalService.retrieveCount();
-            conversationalService.endConversation();
-	    } catch(Exception ex) {
-	        return ex.getMessage();
-	    }
-         
-        return "No Exception Returned";
-    }
-	
-    public String runConversationBusinessExceptionCallback(){
-        calls.append("runConversationbusinessExceptionCallback,");
-        try {
-            conversationalService.initializeCountCallback(1);
-            conversationalService.businessExceptionCallback();
-            clientCount = conversationalService.retrieveCountCallback();
-            conversationalService.endConversationCallback();
-        } catch(Exception ex) {
-            return ex.getMessage();
-        }
-         
-        return "No Exception Returned";
-    }	
-	
-    public int runConversationCallingEndedConversation(){
-        calls.append("runConversationCallingEndedConversation,");
-        conversationalService.initializeCount(1);
-        conversationalService.endConversation();
-        return conversationalService.retrieveCount();
-    }   
-    
-    public int runConversationCallingEndedConversationCallback(){
-        calls.append("runConversationCallingEndedConversationCallback,");
-        conversationalService.initializeCountCallback(1);
-        conversationalService.endConversationCallback();
-        return conversationalService.retrieveCountCallback();
-    }   
-    
-    public int runConversationAgeTimeout(){
-        calls.append("runConversationAgeTimeout,");
-        // done in other testing
-        return clientCount;
-    }
-    public int runConversationIdleTimeout(){
-        calls.append("runConversationIdleTimeout,");
-        // done in other testing
-        return clientCount;
-    }
-    public int runConversationPrincipleError(){
-        calls.append("runConversationPrincipleError,");
-        // TODO - when policy framework is done
-        return clientCount;
-    }
-    
-    
-    // From ConversationalCallback
-    @Init
-    public void init(){
-        calls.append("init,");
-
-    }
-    
-    @Destroy
-    public void destroy(){
-        calls.append("destroy,");
-        
-    }
-    
-    public void initializeCount(int count){
-        calls.append("initializeCount,");
-        callbackCount = 0;
-    }
-    
-    public void incrementCount(){
-        calls.append("incrementCount,");
-        callbackCount++;
-    }
-    
-    public int retrieveCount(){
-        calls.append("retrieveCount,");
-        return  callbackCount;
-    }
-    
-    public void businessException() throws Exception {
-        throw new Exception("Business Exception");
-    }     
-    
-    public String endConversation(){
-        calls.append("endConversation,");
-        return null;
-    }
-    
-    public String getCalls() {
-        return calls.toString();
-    }
-    
-    public String getServiceCalls() {
-        return conversationalService.getCalls().toString();
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
deleted file mode 100644
index 9b8049164a..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
+++ /dev/null
@@ -1,38 +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 conversation.referenceclient;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.annotation.Remotable;
-
-import conversation.service.ConversationalService;
-
-/**
- * The client that calls into an existing conversation by accepting
- * a reference to that conversation
- *
- * @version $Rev$ $Date$
- */
-
-@Remotable
-public interface ConversationalReferenceClient { 
-	
-    public void incrementCount(CallableReference<ConversationalService> conversationalService);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
deleted file mode 100644
index ff6f16cba3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
+++ /dev/null
@@ -1,66 +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 conversation.referenceclient;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-
-/*
- * OSGi bundle activator for conversation tests
- */
-public class ConversationalReferenceClientActivator implements BundleActivator, ServiceListener {
-
-   
-    private BundleContext bundleContext;
-
-
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiConversationReferenceClientActivator ");
-        
-        this.bundleContext = bc;
-        
-        bc.addServiceListener(this);
-        
-        Hashtable<String, Object> serviceProps;
-        
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalReferenceClient");
-        ConversationalReferenceClientImpl refClient = new ConversationalReferenceClientImpl();
-        bundleContext.registerService(ConversationalReferenceClient.class.getName(), refClient, serviceProps);
-        
-    }
-    
-    
-    
-    public void stop(BundleContext bc)  {
-    }
-
-    public void serviceChanged(ServiceEvent event) {
-        
-        if (event.getType() == ServiceEvent.REGISTERED) {
-            
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
deleted file mode 100644
index d6d6bcf4b1..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.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 conversation.referenceclient;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.Service;
-
-import conversation.service.ConversationalService;
-
-/**
- * A client component that accepts a reference to an ongoing conversation
- * and takes part in that conversation
- *
- * @version $Rev$ $Date$
- */
-
-@Service(interfaces={ConversationalReferenceClient.class})
-@AllowsPassByReference
-public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{
-   
-    public void incrementCount(CallableReference<ConversationalService> conversationalService){
-        ConversationalService callableReference = conversationalService.getService();
-        
-        callableReference.incrementCount();        
-    }
-
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
deleted file mode 100644
index 1966bc76a4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
+++ /dev/null
@@ -1,65 +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 conversation.service;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.EndsConversation;
-import org.oasisopen.sca.annotation.Remotable;
-
-import conversation.client.ConversationalCallback;
-
-
-/**
- * The service interface used when testing conversations
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-@Conversational
-@Callback(ConversationalCallback.class)
-public interface ConversationalService {
-	
-    public void init();
-    
-    public void destroy();
-    
-    public void initializeCount(int count);
-    
-    public void incrementCount();
-    
-    public int retrieveCount();
-    
-    public void businessException() throws Exception;        
-    
-    public void initializeCountCallback(int count);
-    
-    public void incrementCountCallback();
-    
-    public int retrieveCountCallback();
-    
-    public void businessExceptionCallback() throws Exception;    
-    
-    @EndsConversation
-    public String endConversation();
-    
-    public String endConversationCallback();
-
-    public String getCalls();
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
deleted file mode 100644
index 903f8bf229..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
+++ /dev/null
@@ -1,76 +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 conversation.service;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-
-
-/*
- * OSGi bundle activator for conversation tests
- */
-public class ConversationalServiceActivator implements BundleActivator, ServiceListener {
-
-   
-    private BundleContext bundleContext;
-
-
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiConversationServiceActivator ");
-        
-        this.bundleContext = bc;
-        
-        bc.addServiceListener(this);
-        
-        Hashtable<String, Object> serviceProps;
-        
-        serviceProps = new Hashtable<String, Object>();
-       
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalServiceStateful");
-        Object statefulService = 
-            new ConversationalServiceFactory(ConversationalServiceStatefulImpl.class);
-        bundleContext.registerService(ConversationalService.class.getName(), statefulService, serviceProps);
-        
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalServiceStateless");
-        ConversationalServiceStatelessImpl statelessService = new ConversationalServiceStatelessImpl();
-        bundleContext.registerService(ConversationalService.class.getName(), statelessService, serviceProps);
-        
-        
-    }
-    
-    
-    
-    public void stop(BundleContext bc)  {
-    }
-
-    public void serviceChanged(ServiceEvent event) {
-        
-        if (event.getType() == ServiceEvent.REGISTERED) {
-            
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
deleted file mode 100644
index fe8bd23f07..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.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 conversation.service;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-
-public class ConversationalServiceFactory implements ServiceFactory {
-    
-    private Class<?> clazz;
-    
-    public ConversationalServiceFactory(Class<?> clazz) {
-        this.clazz = clazz;
-    }
-
-    public Object getService(Bundle bundle, ServiceRegistration reg) {
-
-        try {
-            return clazz.newInstance();
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-       
-    }
-
-    public void ungetService(Bundle bundle, ServiceRegistration reg, Object obj) {
-    	
-    }
-    
-   
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
deleted file mode 100644
index 96b23e771c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.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 conversation.service;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.ConversationAttributes;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import conversation.client.ConversationalCallback;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev$ $Date$
- */
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
-                        maxIdleTime="5 minutes",
-                        singlePrincipal=false)
-public class ConversationalServiceStatefulImpl implements ConversationalService {
-
-    @ConversationID
-    protected String conversationId;
-    
-    @Callback
-    protected ConversationalCallback conversationalCallback; 
-    
-    // local count - accumulates during the conversation
-    private int count = 0;
-          
-    // a static member variable that records the number of times this service is called
-    public static StringBuffer calls = new StringBuffer();
-   
-    @Init
-    public void init(){
-        calls.append("init,");
-    }
-    
-    @Destroy
-    public void destroy(){
-        calls.append("destroy,");
-    }
-    
-    public void initializeCount(int count){
-        calls.append("initializeCount,");       
-        this.count = count;
-    }
-    
-    public void incrementCount(){
-        calls.append("incrementCount,");        
-        count++;
-    }
-    
-    public int retrieveCount(){
-        calls.append("retrieveCount,"); 
-        return count;
-    }
-    
-    public void businessException() throws Exception {
-        throw new Exception("Business Exception");
-    }     
-    
-    public void initializeCountCallback(int count){
-        calls.append("initializeCountCallback,"); 
-        this.count = count;
-        conversationalCallback.initializeCount(count);
-    }
-    
-    public void incrementCountCallback(){
-        calls.append("incrementCountCallback,"); 
-        count++;
-        conversationalCallback.incrementCount();
-    }
-    
-    public int retrieveCountCallback(){
-        calls.append("retrieveCountCallback,"); 
-        return conversationalCallback.retrieveCount();
-    }
-    
-    public void businessExceptionCallback() throws Exception {
-        calls.append("businessExceptionCallback,");        
-        conversationalCallback.businessException();
-    }    
-    
-    public String endConversation(){
-        calls.append("endConversation,"); 
-        count = 0;
-        return conversationId;
-    }
-    
-    public String endConversationCallback(){
-        calls.append("endConversationCallback,"); 
-        return conversationalCallback.endConversation();
-    }
-    
-    public String getCalls() {
-        return calls.toString();
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
deleted file mode 100644
index 9147c0ffa2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
+++ /dev/null
@@ -1,127 +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 conversation.service;
-
-import java.util.HashMap;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import conversation.client.ConversationalCallback;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev$ $Date$
- */
-@Service(ConversationalService.class)
-@Scope("STATELESS")
-public class ConversationalServiceStatelessImpl implements ConversationalService {
-    
-    @ConversationID
-    protected String conversationId;
-    
-    @Callback
-    protected ConversationalCallback conversationalCallback; 
-    
-    // static area in which to hold conversational data
-    private static HashMap<String, Integer> conversationalState = new HashMap<String, Integer>();
-   
-    // a static member variable that records the number of times this service is called
-    public static StringBuffer calls = new StringBuffer();
-   
-    @Init
-    public void init(){
-        calls.append("init,");
-    }
-    
-    @Destroy
-    public void destroy(){
-        calls.append("destroy,");
-    }
-    
-    public void initializeCount(int count){
-        calls.append("initializeCount,");
-        Integer conversationalCount = new Integer(count); 
-        conversationalState.put(conversationId, conversationalCount);
-    }
-    
-    public void incrementCount(){
-        calls.append("incrementCount,");
-        Integer conversationalCount = conversationalState.get(conversationId);
-        conversationalCount++;
-        conversationalState.put(conversationId, conversationalCount);
-    }
-    
-    public int retrieveCount(){
-        calls.append("retrieveCount,");
-        Integer count = conversationalState.get(conversationId);
-        if (count != null){
-            return count.intValue();
-        } else {
-            return -999;
-        }
-    }
-    
-    public void businessException() throws Exception {
-        throw new Exception("Business Exception");
-    }    
-    
-    public void initializeCountCallback(int count){
-        calls.append("initializeCountCallback,");
-        initializeCount(count);
-        conversationalCallback.initializeCount(count);
-    }
-    
-    public void incrementCountCallback(){
-        calls.append("incrementCountCallback,");
-        incrementCount();
-        conversationalCallback.incrementCount();
-    }
-    
-    public int retrieveCountCallback(){
-        calls.append("retrieveCountCallback,");
-        return conversationalCallback.retrieveCount();
-    }
-    
-    public void businessExceptionCallback() throws Exception {
-        calls.append("businessExceptionCallback,");        
-        conversationalCallback.businessException();
-    }
-    
-    public String endConversation(){
-        calls.append("endConversation,");
-        conversationalState.remove(conversationId);
-        return conversationId;
-    }
-    
-    public String endConversationCallback(){
-        calls.append("endConversationCallback,");       
-        return conversationalCallback.endConversation();
-    }   
-    
-    public String getCalls() {
-        return calls.toString();
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
deleted file mode 100644
index c55cb68d03..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
+++ /dev/null
@@ -1,36 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Greetings {
-    
-    
-    public String[] getGreetingsFromJava(String[] s);
-    
-    public String[] getGreetingsFromOSGi(String[] s);
-    
-    public String[] getModifiedGreetingsFromJava(String[] s);
-    
-    public String[] getModifiedGreetingsFromOSGi(String[] s);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
deleted file mode 100644
index 0940f9baf4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
+++ /dev/null
@@ -1,29 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-    
-    public String getGreetings(String s);
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
deleted file mode 100644
index 50d8c26388..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
+++ /dev/null
@@ -1,73 +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 helloworld;
-
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(Greetings.class)
-@Scope("COMPOSITE")
-public class JavaGreetingsComponent implements Greetings {
-
-    private Greetings greetingsService;
-    
-    @Reference
-    public void setGreetingsService(Greetings greetingsService) {
-    	this.greetingsService = greetingsService;
-    }
-    
-   
-    public String[] getGreetingsFromJava(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = "Hello " + s[i] + "(From Java)";
-        }
-            
-        return greetingsService.getGreetingsFromJava(s);
-    }
-    
-    public String[] getGreetingsFromOSGi(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = s[i] + "(From Java)";
-        }
-            
-        return s;
-    }
-    
-    @AllowsPassByReference
-    public String[] getModifiedGreetingsFromJava(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = "Hello " + s[i] + "(From Java)";
-        }
-            
-        return greetingsService.getModifiedGreetingsFromJava(s);
-    }
-    
-    @AllowsPassByReference
-    public String[] getModifiedGreetingsFromOSGi(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = s[i] + "(From Java)";
-        }
-            
-        return s;
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
deleted file mode 100644
index a7bcb2ba06..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
+++ /dev/null
@@ -1,41 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class JavaHelloWorldComponent implements HelloWorld {
-
-    public helloworld.ws.HelloWorld helloWorldWS;
-    
-    @Reference
-    public void setHelloWorldWS(helloworld.ws.HelloWorld helloWorldWS) {
-    	this.helloWorldWS = helloWorldWS;
-    }
-    
-    public String getGreetings(String s) {
-        return helloWorldWS.getGreetings(s);
-    }
-    
-   
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
deleted file mode 100644
index 9b3907c752..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
+++ /dev/null
@@ -1,112 +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 helloworld;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.BundleActivator;
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-
-
-public class OSGiGreetingsImpl implements Greetings, ServiceListener, BundleActivator {
-
-    private Greetings greetingsService;
-    
-    private BundleContext bundleContext;
-    
-    public String[] getGreetingsFromOSGi(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = "Hello " + s[i] + "(From OSGi)";
-        }
-            
-        return greetingsService.getGreetingsFromOSGi(s);
-    }
-    
-    public String[] getGreetingsFromJava(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = s[i] + "(From OSGi)";
-        }
-            
-        return s;
-    }
-    
-    @AllowsPassByReference
-    public String[] getModifiedGreetingsFromOSGi(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = "Hello " + s[i] + "(From OSGi)";
-        }
-            
-        return greetingsService.getModifiedGreetingsFromOSGi(s);
-    }
-    
-    @AllowsPassByReference
-    public String[] getModifiedGreetingsFromJava(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = s[i] + "(From OSGi)";
-        }
-            
-        return s;
-    }
-
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started OsgiGreetingsImpl bundle ");
-    	
-    	this.bundleContext = bc;
-    	
-        Hashtable<String, Object> serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.service.name", "OSGiGreetingsComponent/Greetings");
-        bundleContext.registerService("helloworld.Greetings", this, serviceProps);
-        
-        
-        ServiceReference ref = bundleContext.getServiceReference("helloworld.Greetings");
-        if (ref != null)
-            greetingsService = (helloworld.Greetings)bundleContext.getService(ref);
-        else {
-            try {
-                String filter = "(objectclass=helloworld.Greetings)";
-                this.bundleContext.addServiceListener(this, filter);                
-
-            } catch (InvalidSyntaxException e) {
-                e.printStackTrace();
-            }
-        }
-      
-    }
-    
-    public void stop(BundleContext bc)  {
-    }
-    
-	public void serviceChanged(ServiceEvent event) {
-		try {
-			if (event.getType() == ServiceEvent.REGISTERED) {
-			    ServiceReference ref = event.getServiceReference();
-			    greetingsService =  (helloworld.Greetings) bundleContext.getService(ref);
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
deleted file mode 100644
index 0588da9a85..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
+++ /dev/null
@@ -1,81 +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 helloworld;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.BundleActivator;
-
-
-public class OSGiHelloWorldImpl implements HelloWorld, ServiceListener, BundleActivator {
-
-    public helloworld.ws.HelloWorld helloWorldWS;
-    
-    private BundleContext bundleContext;
-    
-    public String getGreetings(String s) {
-        return helloWorldWS.getGreetings(s);
-    }
-    
-
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started OsgiHelloWorldImpl bundle ");
-    	
-    	this.bundleContext = bc;
-    	
-        Hashtable<String, Object> serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "HelloWorldComponent");
-        bundleContext.registerService("helloworld.HelloWorld", this, serviceProps);
-        
-        ServiceReference ref = bundleContext.getServiceReference("helloworld.ws.HelloWorld");
-        if (ref != null)
-            helloWorldWS = (helloworld.ws.HelloWorld)bundleContext.getService(ref);
-        else {
-            try {
-            	String filter = "(objectclass=helloworld.ws.HelloWorld)";
-            	this.bundleContext.addServiceListener(this, filter);				
-
-            } catch (InvalidSyntaxException e) {
-            	e.printStackTrace();
-            }
-        }
-        
-    }
-    
-    public void stop(BundleContext bc)  {
-    }
-    
-	public void serviceChanged(ServiceEvent event) {
-		try {
-			if (event.getType() == ServiceEvent.REGISTERED) {
-			    ServiceReference ref = event.getServiceReference();
-			    helloWorldWS =  (helloworld.ws.HelloWorld) bundleContext.getService(ref);
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
deleted file mode 100644
index f48c91d518..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld.sdo;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    
-    public String getGreetings(Name name);
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
deleted file mode 100644
index e52565aedb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.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 helloworld.sdo;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldServiceComponent implements HelloWorldService {
-
-    public String getGreetings(Name name) {
-        return "Hello " + name.getFirst() + " " + name.getLast();
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
deleted file mode 100644
index 6548b409fb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
+++ /dev/null
@@ -1,30 +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 helloworld.sdo.client;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the helloworld client
- */
-@Remotable
-public interface HelloWorldClient {
-    
-    public String getGreetings(String firstName, String lastName);
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
deleted file mode 100644
index 1aabf4d10c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.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 helloworld.sdo.client;
-
-import helloworld.sdo.HelloWorldService;
-import helloworld.sdo.HelloworldFactory;
-import helloworld.sdo.Name;
-
-/**
- * The HelloWorld client implementation
- */
-public class HelloWorldClientComponent implements HelloWorldClient {
-   
-    HelloWorldService helloWorldService;
-    
-    public String getGreetings(String firstName, String lastName) {
-        Name name = HelloworldFactory.INSTANCE.createName();
-        name.setFirst(firstName);
-        name.setLast(lastName);
-        return helloWorldService.getGreetings(name);
-    }
-
-    public HelloWorldService getHelloWorldService() {
-        return helloWorldService;
-    }
-
-    public void setHelloWorldService(HelloWorldService helloWorldService) {
-        this.helloWorldService = helloWorldService;
-    }
-    
-    public void unsetHelloWorldService(HelloWorldService helloWorldService) {
-        this.helloWorldService = null;
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
deleted file mode 100644
index 99a3d0087c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
+++ /dev/null
@@ -1,29 +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 helloworld.ws;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-    
-    public String getGreetings(String s);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
deleted file mode 100644
index 4a3cd4aed2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.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 helloworld.ws;
-
-public class HelloWorldService implements HelloWorld {
-
-    public String getGreetings(String s) {
-        return "Hello " + s;
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
deleted file mode 100644
index 305b3610d4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
+++ /dev/null
@@ -1,86 +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 stockquote;
-
-import java.util.Dictionary;
-
-import org.osgi.service.component.ComponentContext;
-import org.oasisopen.sca.annotation.Property;
-
-/**
- * Declarative Stock quote with configurable properties.
- */
-public class OSGiStockQuoteComponentImpl implements StockQuote {
-    
-    @Property
-    public double exchangeRate;
-    
-    private String currency;
-    
-    
-    public double configExchangeRate;
-    public String configCurrency;
-    
-    @Property
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-    
-    public double getQuote(String ticker) throws Exception {
-        
-        if (exchangeRate == 2.0 && !"USD".equals(currency)) {
-            throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + 
-                    exchangeRate + " currency=" + currency);
-        }
-        if (exchangeRate == 1.48 && !"EURO".equals(currency)) {
-            throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + 
-                    exchangeRate + " currency=" + currency);
-        }
-        
-        if (configExchangeRate == 2.0 && !"USD".equals(configCurrency)) {
-            throw new RuntimeException("ConfigAdmin Property exchangeRate not set correctly, exchangeRate= " + 
-                    configExchangeRate + " currency=" + configCurrency);
-        }
-        if (configExchangeRate == 1.48 && !"EURO".equals(configCurrency)) {
-            throw new RuntimeException("Property configExchangeRate not set correctly, exchangeRate= " + 
-                    configExchangeRate + " currency=" + configCurrency);
-        }
-        
-        return 52.81 * exchangeRate;
-        
-    }
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiStockQuoteComponentImpl bundle ");
-        Dictionary props = context.getProperties();
-        Object prop = props.get("currency");
-        if (prop instanceof String[]&& ((String [])prop).length > 0)
-            configCurrency = ((String [])prop)[0];
-        prop = props.get("exchangeRate");
-        if (prop instanceof Double[]&& ((Double [])prop).length > 0)
-            configExchangeRate = (double)((Double [])prop)[0];
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiStockQuoteComponentImpl bundle ");
-    }
-
-    
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
deleted file mode 100644
index e2d25bf47d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
+++ /dev/null
@@ -1,65 +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 stockquote;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * 
- * OSGi service factory where service has configurable properties
- * Only property injection is tested. ConfigurationAdmin is not used.
- *
- */
-public class OSGiStockQuoteFactoryImpl implements BundleActivator, ServiceFactory {
-    
-   
-    private BundleContext bundleContext;
-    
-
-    public void start(BundleContext bc) throws Exception {
-        
-        bundleContext = bc;
-        
-        Hashtable<String, Object> props = new Hashtable<String, Object>();
-        bc.registerService(StockQuote.class.getName(), this, props);
-        
-    }
-
-    public void stop(BundleContext bc) throws Exception {
-    }
-
-
-    public Object getService(Bundle bundle, ServiceRegistration registration) {
-        return new OSGiStockQuoteImpl(bundleContext);
-    }
-
-
-    public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
-        
-    }
-
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
deleted file mode 100644
index 4cd4fb36a5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
+++ /dev/null
@@ -1,119 +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 stockquote;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.oasisopen.sca.annotation.Property;
-
-/**
- * 
- * Stock quote with configurable properties.
- *
- */
-public class OSGiStockQuoteImpl implements StockQuote, BundleActivator {
-    
-    public String pid;
-    
-    @Property
-    public double exchangeRate;
-    
-    private String currency;
-    
-    private BundleContext bundleContext;
-    
-    public OSGiStockQuoteImpl() {     
-        this.pid = "stockQuote";
-    }
-    
-    protected OSGiStockQuoteImpl(BundleContext bc) {
-        this.bundleContext = bc;
-    }
-    
-    @Property
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-    
-     
-    private void checkProperties() throws Exception {
-               
-        if (exchangeRate == 2.0 && !"USD".equals(currency)) {
-            throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + 
-                    exchangeRate + " currency=" + currency);
-        }
-        
-        if (exchangeRate == 1.48 && !"EURO".equals(currency)) {
-            throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + 
-                    exchangeRate + " currency=" + currency);
-        }
-        
-        ServiceReference configAdminReference = bundleContext.getServiceReference("org.osgi.service.cm.ConfigurationAdmin");
-        if (configAdminReference != null && pid != null ) {
-            
-            ConfigurationAdmin cm = (ConfigurationAdmin)bundleContext.getService(configAdminReference);
-            
-            Configuration config = cm.getConfiguration("stockQuote", null);
-            
-            Dictionary props = config.getProperties();
-            
-            if (exchangeRate != (double)(Double)props.get("exchangeRate")) {
-                throw new Exception("Config Property exchangeRate not set correctly, expected " 
-                        + props.get("exchangeRate") + " got " + exchangeRate);
-            }
-            
-            if (!currency.equals(props.get("currency"))) {
-                throw new Exception("Config Property currency not set correctly, expected " 
-                        + props.get("currency") + " got " + currency);
-            }
-        }
-        
-    }
-    
-    public double getQuote(String ticker) throws Exception {
-        
-        checkProperties();
-       
-        return 52.81 * exchangeRate;
-        
-    }
-
-    public void start(BundleContext bc) throws Exception {
-        
-        bundleContext = bc;
-        
-        Hashtable<String, Object> props = new Hashtable<String, Object>();
-        props.put("service.pid", "stockQuote");
-        
-        bc.registerService(StockQuote.class.getName(), this, props);
-        
-    }
-
-    public void stop(BundleContext bc) throws Exception {
-    }
-
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
deleted file mode 100644
index a47f68c579..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package stockquote;
-
-/**
- * 
- * Stock Quote interface
- *
- */
-public interface StockQuote {
-    
-    public double getQuote(String ticker) throws Exception ;
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index 25d7bcf2ff..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
+++ /dev/null
@@ -1,163 +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.ArrayList;
-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;
-
-
-/**
- * This class implements the Customer service component.
- */
-public  class OSGiBundleImpl implements ServiceListener, BundleActivator {
-    
-
-    String name;
-    
-    String[] references;
-    Class<?>[] referenceClasses;
-    Field[] referenceFields;
-    String[] referenceFilters;
-    
-    Class myClass;
-    ArrayList<String> serviceNames = new ArrayList<String>();
-    ArrayList<Object> serviceObjs = new ArrayList<Object>();
-    ArrayList<Hashtable<String, Object>> serviceProperties = new ArrayList<Hashtable<String, Object>>();
-    
-    
-	private BundleContext bundleContext;
-    
-    public OSGiBundleImpl() {}
-    
-    public OSGiBundleImpl(String[] references, String[] filters) {
-        
-        myClass = this.getClass();
-        this.name = this.getClass().getSimpleName();
-        this.references = references == null?new String[0] : references;
-        
-       
-        try {
-            referenceClasses = new Class[references.length];
-            referenceFields = new Field[references.length];
-            referenceFilters = new String[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();
-                
-                if (filters != null && filters.length > i)
-                    referenceFilters[i] = filters[i];
-            }
-            
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        
-    }
-    
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started bundle " + name);
-    	
-    	this.bundleContext = bc;
-        
-        boolean useSingleRegisterService = serviceNames.size() > 1;
-        for (int i = 1; i < serviceNames.size(); i++) {
-            if (serviceObjs.get(i) != serviceObjs.get(0) || 
-                    serviceProperties.get(i) != serviceProperties.get(0)) {
-                useSingleRegisterService = false;
-                break;
-            }
-        }
-        if (useSingleRegisterService) {
-            bundleContext.registerService(serviceNames.toArray(new String[serviceNames.size()]), 
-                    serviceObjs.get(0), serviceProperties.get(0));
-        }
-        else {
-            for (int i = 0; i < serviceNames.size(); i++) {
-                bundleContext.registerService(serviceNames.get(i), serviceObjs.get(i), serviceProperties.get(i));
-            }
-        }
-        
-        started(bc);
-    	
-        for (int i = 0; i < references.length; i++) {
-
-            try {
-                if (referenceFields[i].get(this) != null)
-                    continue;
-                
-    	        ServiceReference[] refs = bundleContext.getServiceReferences(referenceClasses[i].getName(), referenceFilters[i]);
-	            if (refs != null && refs.length > 0) {
-                    Object obj = bundleContext.getService(refs[0]);
-                    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 bundle " + name);
-
-    }
-    
-    protected void started(BundleContext bc)  {
-        
-    }
-
-	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();
-		}
-	}
-    
-
-    public void registerService(Object serviceObject, String serviceName, Hashtable<String, Object> props) {
-        serviceObjs.add(serviceObject);
-        serviceNames.add(serviceName);
-        serviceProperties.add(props == null? new Hashtable<String, Object>() : props);
-    }
-}
- 
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index ecbad11fa0..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
+++ /dev/null
@@ -1,39 +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.oasisopen.sca.annotation.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-    
-    public void purchaseBooks();
-    
-    public void purchaseGames();
-    
-    public void purchaseGoods();
-    
-    @OneWay
-    public void notifyShipment(String order);
-    
-    public boolean hasOutstandingOrders();
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 03040d81d1..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,88 +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 java.util.ArrayList;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component.
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private Retailer retailer1;
-	
-    private Retailer retailer2;
-    
-    private Retailer retailer3;
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    @Reference
-    public void setRetailer1(Retailer retailer1) {
-        this.retailer1 = retailer1;
-    }
-    
-    @Reference
-    public void setRetailer2(Retailer retailer2) {
-        this.retailer2 = retailer2;
-    }
-    
-    @Reference
-    public void setRetailer3(Retailer retailer3) {
-        this.retailer3 = retailer3;
-    }
-    
-    public void purchaseBooks() {
-    	System.out.println("JavaCustomerComponentImpl.purchaseBooks");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)");
-        retailer1.submitOrder("Order");
-    }
-    
-    public void purchaseGames() {
-        System.out.println("JavaCustomerComponentImpl.purchaseGames");
-        outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)");
-        
-        retailer2.submitOrder("Order");
-    }
-    
-    public void purchaseGoods() {
-        retailer3.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrders.remove(order);
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);       
-    }
-
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-    
-    
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a879505610..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ /dev/null
@@ -1,106 +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 java.util.ArrayList;
-
-import org.osgi.service.component.ComponentContext;
-
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiCustomerComponentImpl implements Customer {
-    
-
-    private Retailer retailer1;
-    private Retailer retailer2;
-    private Retailer retailer3;
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    public OSGiCustomerComponentImpl() {
-        System.out.println("Created OSGiCustomerComponentImpl " + this);
-    }
-    
-    protected void setRetailer1(Retailer retailer1) {
-    	this.retailer1 = retailer1;
-    }
-    
-    protected void unsetRetailer1(Retailer retailer1) {
-    	// this.retailer1 = null;
-    }
-    
-    
-    protected void setRetailer2(Retailer retailer2) {
-    	this.retailer2 = retailer2;
-    }
-    
-    protected void unsetRetailer2(Retailer retailer2) {
-    	// this.retailer2 = null;
-    }
-    
-    protected void setRetailer3(Retailer retailer3) {
-        this.retailer3 = retailer3;
-    }
-    
-    protected void unsetRetailer3(Retailer retailer3) {
-        // this.retailer3 = null;
-    }
-    
-
-    public void purchaseBooks() {
-    	System.out.println("OSGiCustomerComponentImpl.purchaseBooks, retailer1 is " + retailer1);
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)");
-        retailer1.submitOrder("Order");
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerComponentImpl.purchaseGames, retailer2 is " + retailer2);
-        outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)");
-        
-        retailer2.submitOrder("Order");
-    }
-    
-    public void purchaseGoods() {
-    	System.out.println("OSGiCustomerComponentImpl.purchaseGames, retailer3 is " + retailer3);
-    	retailer3.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrders.remove(order);
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiCustomerComponentImpl bundle ");
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiCustomerComponentImpl bundle ");
-    }
-
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
deleted file mode 100644
index c8cb522cf4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
+++ /dev/null
@@ -1,65 +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.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiCustomerFactoryImpl implements BundleActivator, ServiceFactory {
-    
-    private BundleContext bundleContext;
-    
-    public OSGiCustomerFactoryImpl() {
-    }
-    
-    
-    public void start(BundleContext bc)  {
-        
-        this.bundleContext = bc;
-        bc.registerService(Customer.class.getName(), this, null);
-    }
-    
-    
-    
-   
-    public void stop(BundleContext context) throws Exception {
-        
-    }
-
-
-    public Object getService(Bundle bundle, ServiceRegistration registration) {
-        
-        OSGiCustomerImpl customer = new OSGiCustomerImpl(false);
-        customer.start(bundleContext);
-        return customer;
-        
-    }
-
-    public void ungetService(Bundle bundle, ServiceRegistration registration, Object obj) {       
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 8ef4a2d8d8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ /dev/null
@@ -1,92 +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 java.util.ArrayList;
-
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component.
- */
-@AllowsPassByReference
-public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
-    
-    private ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    private Retailer retailer1;
-    private Retailer retailer2;
-    private Retailer retailer3;
-    
-    public OSGiCustomerImpl() {
-        super(  new String[]{"retailer1", "retailer2", "retailer3"},
-                new String[]{"(retailerName=amazon.com)", 
-                             "(retailerName=play.com)",
-                             "(retailerName=ebay.com)"
-                             });
-        registerService(this, "supplychain.customer.Customer", null);
-                
-    }
-    
-    public OSGiCustomerImpl(boolean ignore) { // Used only to test service factories
-        super(  new String[]{"retailer1", "retailer2", "retailer3"},
-                new String[]{"(retailerName=amazon.com)", 
-                             "(retailerName=play.com)",
-                             "(retailerName=ebay.com)"
-                             });
-               
-    }
-   
-    public void purchaseBooks() {
-    	System.out.println("OSGiCustomerImpl.purchaseBooks, retailer is " + retailer1);
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)");
-        
-        retailer1.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerImpl.purchaseGames, retailer is " + retailer2);
-        outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)");
-        
-        retailer2.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGoods() {
-        retailer3.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        
-        outstandingOrders.remove(order);
-        
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
deleted file mode 100644
index 593e55f3f5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
+++ /dev/null
@@ -1,100 +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 java.util.ArrayList;
-
-import org.osgi.service.component.ComponentContext;
-
-
-import supplychain.retailer.Retailer;
-import supplychain.retailer.RetailerQuery;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiCustomerWithQueryComponentImpl implements Customer {
-    
-
-    private Retailer retailer;
-    private RetailerQuery retailerQuery;
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    public OSGiCustomerWithQueryComponentImpl() {
-        System.out.println("Created OSGiCustomerWithQueryComponentImpl " + this);
-    }
-    
-    protected void setRetailer(Retailer retailer) {
-    	this.retailer = retailer;
-    }
-    
-    protected void unsetRetailer(Retailer retailer) {
-    	// this.retailer = null;
-    }
-    
-    
-    protected void setRetailerQuery(RetailerQuery retailerQuery) {
-        this.retailerQuery = retailerQuery;
-    }
-    
-    protected void unsetRetailerQuery(RetailerQuery retailerQuery) {
-        // this.retailerQuery = null;
-    }
-    
-    public void purchaseBooks() {
-    	System.out.println("OSGiCustomerWithQueryComponentImpl.purchaseBooks");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)");
-        
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerWithQueryComponentImpl.purchaseGames");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)");
-        
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-    }
-    
-    public void purchaseGoods() {
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrders.remove(order);
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiCustomerWithQueryComponentImpl bundle ");
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiCustomerWithQueryComponentImpl bundle ");
-    }
-
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
deleted file mode 100644
index 18483817ad..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
+++ /dev/null
@@ -1,82 +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 java.util.ArrayList;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-import supplychain.retailer.RetailerQuery;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiCustomerWithQueryImpl extends OSGiBundleImpl implements Customer {
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    private Retailer retailer;
-    private RetailerQuery retailerQuery;
-    
-    public OSGiCustomerWithQueryImpl() {
-        super(  new String[]{"retailer", "retailerQuery"},
-                new String[]{"(component.service.name=RetailerComponent/Retailer)",
-                             "(component.service.name=RetailerComponent/RetailerQuery)"
-                });
-        registerService(this, "supplychain.customer.Customer", null);
-                
-    }
-   
-    public void purchaseBooks() {
-    	System.out.println("OSGiCustomerWithQueryImpl.purchaseBooks");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)");
-        
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerWithQueryImpl.purchaseGames");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)");
-        
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGoods() {
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        
-        outstandingOrders.remove(order);
-        
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
deleted file mode 100644
index f3ea404997..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
+++ /dev/null
@@ -1,30 +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.oasisopen.sca.annotation.Scope;
-
-
-/**
- * This class implements the Customer service component.
- */
-@Scope("STATELESS")
-public class OSGiStatelessCustomerComponentImpl extends OSGiCustomerComponentImpl {
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
deleted file mode 100644
index eda77b0c5d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
+++ /dev/null
@@ -1,35 +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.oasisopen.sca.annotation.Scope;
-
-
-/**
- * This class implements the Customer service component.
- */
-@Scope("STATELESS")
-public class OSGiStatelessCustomerImpl extends OSGiCustomerImpl {
-    
-    public OSGiStatelessCustomerImpl(boolean ignore) { 
-        super(ignore);
-    }
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
deleted file mode 100644
index 599ab51a50..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
+++ /dev/null
@@ -1,98 +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 java.util.ArrayList;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiVersionedCustomerImpl extends OSGiBundleImpl implements Customer {
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    private Retailer retailer1;
-    private Retailer retailer2;
-    private Retailer retailer3;
-    private int version;
-    
-    public OSGiVersionedCustomerImpl() {
-        super(  new String[]{"retailer1", "retailer2", "retailer3"},
-                new String[]{"(retailerName=amazon.com)", 
-                             "(retailerName=play.com)",
-                             "(retailerName=ebay.com)"
-                             });
-               
-    }
-    
-    protected void started(BundleContext bc)  {
-        
-        String jarFile = bc.getBundle().getLocation();
-        if (jarFile.endsWith("1.jar")) version = 1;
-        else if (jarFile.endsWith("2.jar")) version = 2;
-        else version = 3;
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("component.name", "CustomerComponent" + version);
-        bc.registerService("supplychain.customer.Customer", this, props1);
-               
-    }
-   
-    public void purchaseBooks() {
-    	System.out.println("OSGiVersionedCustomerImpl.purchaseBooks , retailer is " + retailer1);
-        outstandingOrders.add("Order, submitted (amazon.com v" + version + 
-                "), fulfilled, shipped (ParcelForce)");
-        
-        retailer1.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerImpl.purchaseGames");
-        outstandingOrders.add("Order, submitted (play.com v" + version + 
-                "), fulfilled, shipped (ParcelForce)");
-        
-        retailer2.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGoods() {
-        retailer3.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        
-        outstandingOrders.remove(order);
-        
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index b9adacca55..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,67 +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.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Customer service component.
- */
-@Service(Retailer.class)
-@Scope("COMPOSITE")
-public class JavaRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    private String retailerName;
-    
-    public JavaRetailerComponentImpl() {
-    	System.out.println("Created RetailerComponentImpl");
-    }
-    
-    @Reference
-    public void setWarehouse(Warehouse warehouse) {
-    	System.out.println("retailer setWarehouse " + warehouse);
-    	
-        this.warehouse = warehouse;
-    }
-    
-    @Property
-    public void setRetailerName(String retailerName) {
-    	this.retailerName = retailerName;
-    }
-    
-    
-    public void submitOrder(String order) {
-    	
-    	System.out.println("JavaRetailerComponentImpl.submitOrder " + warehouse);
-        warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")");
-        
-    }
-
-    
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index aca5943552..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ /dev/null
@@ -1,64 +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.osgi.service.component.ComponentContext;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    private String retailerName;
-    
-    
-    protected void setWarehouse(Warehouse warehouse) {
-    	this.warehouse = warehouse;
-    }
-    
-    protected void unsetWarehouse(Warehouse warehouse) {
-    	// this.warehouse = null;
-    }
-    
-    public void submitOrder(String order) {
-    	
-    	System.out.println("OSGiRetailerComponentImpl.submitOrder , warehouse is " + warehouse);
-        warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")");
-        
-    }
-
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiRetailerComponentImpl bundle ");
-        
-        Object prop = context.getProperties().get("retailerName");
-	    if (prop instanceof String[])
-	        retailerName = ((String [])prop)[0];
-        
-        
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiRetailerComponentImpl bundle ");
-    }
-
-	
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e71c624f49..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package supplychain.retailer;
-
-
-import java.util.Hashtable;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component.
- */
-public class OSGiRetailerImpl extends OSGiBundleImpl {
-    
-    protected Warehouse warehouse;
-    
-    public OSGiRetailerImpl() {
-
-        super(new String[]{"warehouse"}, 
-                new String[]{"(component.service.name=WarehouseComponent1/Warehouse)"});
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("retailerName", "amazon.com");
-        registerService(new OSGiRetailerServiceImpl(this, "amazon.com"),
-                "supplychain.retailer.Retailer", props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("retailerName", "play.com");
-        registerService(
-                new OSGiRetailerServiceImpl(this, "play.com"),
-                "supplychain.retailer.Retailer", props2);
-        
-        Hashtable<String, Object> props3 = new Hashtable<String, Object>();
-        props3.put("retailerName", "ebay.com");
-        registerService(
-                new OSGiRetailerServiceImpl(this, "ebay.com"),
-                "supplychain.retailer.Retailer", props3);
-    }
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
deleted file mode 100644
index a036ecfc76..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.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.retailer;
-
-
-/**
- * This class implements the Retailer service.
- */
-public class OSGiRetailerServiceImpl implements Retailer {
-
-    private OSGiRetailerImpl retailerImpl;
-
-    private String retailerName;
-
-    OSGiRetailerServiceImpl(OSGiRetailerImpl retailerImpl, String retailerName) {
-        this.retailerImpl = retailerImpl;
-        this.retailerName = retailerName;
-        
-    }
-
-    public void submitOrder(String order) {
-
-        System.out.println("Retailer.submitOrder, warehouse is " + retailerImpl.warehouse);
-        retailerImpl.warehouse.fulfillOrder(order + ", submitted ("
-                + retailerName + ")");
-
-    }
-
-}
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
deleted file mode 100644
index db877bb366..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
+++ /dev/null
@@ -1,78 +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.osgi.service.component.ComponentContext;
-
-import supplychain.warehouse.Warehouse;
-import supplychain.warehouse.WarehouseQuery;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiRetailerWithQueryComponentImpl implements Retailer, RetailerQuery {
-    
-    private Warehouse warehouse;
-    private WarehouseQuery warehouseQuery;
-    private String retailerName;
-    
-    
-    protected void setWarehouse(Warehouse warehouse) {
-    	this.warehouse = warehouse;
-    }
-    
-    protected void unsetWarehouse(Warehouse warehouse) {
-    	// this.warehouse = null;
-    }
-    
-    protected void setWarehouseQuery(WarehouseQuery warehouseQuery) {
-        this.warehouseQuery = warehouseQuery;
-    }
-    
-    protected void unsetWarehouseQuery(WarehouseQuery warehouse) {
-        // this.warehouseQuery = null;
-    }
-    
-    public void submitOrder(String order) {
-    	
-    	System.out.println("OSGiRetailerComponentImpl.submitOrder , warehouse is " + warehouse);
-        warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")");
-        
-    }
-    
-    public boolean isAvailable(String order) {
-        return warehouseQuery.isAvailable(order);
-    }
-
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiRetailerComponentImpl bundle ");
-        
-        Object prop = context.getProperties().get("retailerName");
-	    if (prop instanceof String[])
-	        retailerName = ((String [])prop)[0];
-        
-        
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiRetailerComponentImpl bundle ");
-    }
-
-	
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
deleted file mode 100644
index ee1f575e70..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
+++ /dev/null
@@ -1,64 +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 java.util.Hashtable;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-import supplychain.warehouse.WarehouseQuery;
-
-/**
- * This class implements the Retailer service component with query.
- */
-public class OSGiRetailerWithQueryImpl extends OSGiBundleImpl implements Retailer, RetailerQuery {
-    
-    private Warehouse warehouse;
-    private WarehouseQuery warehouseQuery;
-    
-    public OSGiRetailerWithQueryImpl() {
-
-        super(new String[]{"warehouse", "warehouseQuery"}, null);
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("retailerName", "amazon.com");
-        registerService(this,
-                "supplychain.retailer.Retailer", props1);
-        
-        registerService(this,
-                "supplychain.retailer.RetailerQuery", props1);
-        
-    }
-    
-    public void submitOrder(String order) {
-
-        System.out.println("Retailer.submitOrder, warehouse is " + warehouse);
-        warehouse.fulfillOrder(order + ", submitted ("
-                + "amazon.com" + ")");
-
-    }
-
-    public boolean isAvailable(String order) {
-        return warehouseQuery.isAvailable(order);
-    }
-
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
deleted file mode 100644
index 09e60ca626..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
+++ /dev/null
@@ -1,75 +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 java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component.
- */
-public class OSGiVersionedRetailerImpl extends OSGiBundleImpl {
-    
-    protected Warehouse warehouse;
-    
-    private int version;
-    
-    public OSGiVersionedRetailerImpl() {
-
-        super(new String[]{"warehouse"}, null);
-        
-        
-    }
-    
-    protected void started(BundleContext bc)  {
-        String jarFile = bc.getBundle().getLocation();
-        if (jarFile.endsWith("1.jar")) version = 1;
-        else if (jarFile.endsWith("2.jar")) version = 2;
-        else version = 3;
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("retailerName", "amazon.com");
-        bc.registerService("supplychain.retailer.Retailer", 
-                new OSGiVersionedRetailerServiceImpl(this, "amazon.com", version),
-                props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("retailerName", "play.com");
-        bc.registerService(
-                "supplychain.retailer.Retailer", 
-                new OSGiVersionedRetailerServiceImpl(this, "play.com", version),
-                props2);
-        
-        try {
-            ServiceReference[] refs = bc.getServiceReferences(Warehouse.class.getName(), 
-                    "(component.service.name=WarehouseComponent" + version + "/Warehouse)");
-            if (refs != null && refs.length > 0) {
-                warehouse = (Warehouse) bc.getService(refs[0]);
-            }
-        } catch (InvalidSyntaxException e) {
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
deleted file mode 100644
index 7dd70889c7..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.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.retailer;
-
-
-/**
- * This class implements the Retailer service.
- */
-public class OSGiVersionedRetailerServiceImpl implements Retailer {
-
-    private OSGiVersionedRetailerImpl retailerImpl;
-
-    private String retailerName;
-    
-    private int version;
-
-    OSGiVersionedRetailerServiceImpl(OSGiVersionedRetailerImpl retailerImpl, String retailerName, int version) {
-        this.retailerImpl = retailerImpl;
-        this.retailerName = retailerName;
-        this.version = version;
-    }
-
-    public void submitOrder(String order) {
-
-        System.out.println("Retailer.submitOrder, warehouse is " + retailerImpl.warehouse);
-        retailerImpl.warehouse.fulfillOrder(order + ", submitted ("
-                + retailerName + " v" + version + ")");
-
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/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/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
deleted file mode 100644
index 354f40a064..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.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 RetailerQuery service.
- */
-public interface RetailerQuery {
-    
-    public boolean isAvailable(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 3da2fb8e39..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package supplychain.shipper;
-
-
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component.
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-    
-    private Customer customer;
-    
-    private String shipperName;
-    
-    @Reference
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
-    
-    @Property
-    public void setShipperName(String shipperName) {
-        this.shipperName = shipperName;
-    }
-    
-    
-    
-    public void processShipment(String order) {
-    	System.out.println("JavaShipperComponentImpl.processShipment");
-        customer.notifyShipment(order + ", shipped (" + shipperName + ")");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index ff40a7ae36..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ /dev/null
@@ -1,62 +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.osgi.service.component.ComponentContext;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component.
- */
-public class OSGiShipperComponentImpl implements Shipper {
-
-    private Customer customer;
-    private String shipperName;
-    
-    protected void setCustomer(Customer customer) {
-    	this.customer = customer;
-    }
-    
-    protected void unsetCustomer(Customer customer) {
-    	// this.customer = null;
-    }
-    
-    public void processShipment(String order) {
-    	System.out.println("OSGiShipperComponentImpl.processShipment, customer is " + customer);
-        customer.notifyShipment(order + ", shipped (" + shipperName + ")");
-    }
-    
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiShipperComponentImpl bundle ");
-        
-        Object prop = context.getProperties().get("shipperName");
-	    if (prop instanceof String[])
-	    	shipperName = ((String [])prop)[0];
-        
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiShipperComponentImpl bundle ");
-    }
-
-	
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
deleted file mode 100644
index ef989d6fcf..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
+++ /dev/null
@@ -1,78 +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 java.util.Hashtable;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-
-/**
- * This class implements the Shipper service component.
- */
-public class OSGiShipperFactoryImpl implements BundleActivator, ServiceFactory {
-    
-    private BundleContext bundleContext;
-    
-    public OSGiShipperFactoryImpl() {
-
-    }
-    
-
-    public void start(BundleContext bc)  {
-        
-        this.bundleContext = bc;
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("shipperName", "RoyalMail");
-        bc.registerService(Shipper.class.getName(), this, props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("shipperName", "ParcelForce");
-        bc.registerService(Shipper.class.getName(), this, props2);
-    }
-    
-    
-    
-   
-    public void stop(BundleContext context) throws Exception {
-        
-    }
-
-    
-    public Object getService(Bundle bundle, ServiceRegistration reg) {
-        OSGiShipperImpl shipper = new OSGiShipperImpl(false);
-        shipper.start(bundleContext);
-        OSGiStatelessShipperServiceImpl shipperService = new OSGiStatelessShipperServiceImpl(shipper, 
-                (String)reg.getReference().getProperty("shipperName"));
-        return shipperService;
-    }
-
-    public void ungetService(Bundle arg0, ServiceRegistration arg1, Object arg2) {
-        
-    }
-    
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index effae8c246..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.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.shipper;
-
-
-import java.util.Hashtable;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component.
- */
-public class OSGiShipperImpl extends OSGiBundleImpl {
-    
-    protected Customer customer;
-
-    
-    public OSGiShipperImpl() {
-
-        super(new String[]{"customer"}, null);
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("shipperName", "RoyalMail");
-        registerService(new OSGiShipperServiceImpl(this, "RoyalMail"),
-                "supplychain.shipper.Shipper", props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("shipperName", "ParcelForce");
-        registerService(
-                new OSGiShipperServiceImpl(this, "ParcelForce"),
-                "supplychain.shipper.Shipper", props2);
-    }
-    
-    // Used only by service factories
-    public OSGiShipperImpl(boolean ignore) {
-
-        super(new String[]{"customer"}, null);
-    }
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
deleted file mode 100644
index 4effadf208..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.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.shipper;
-
-
-/**
- * This class implements the Shipper service.
- */
-public class OSGiShipperServiceImpl implements Shipper {
-
-    private OSGiShipperImpl shipperImpl;
-
-    private String shipperName;
-
-    OSGiShipperServiceImpl(OSGiShipperImpl shipperImpl, String shipperName) {
-        this.shipperImpl = shipperImpl;
-        this.shipperName = shipperName;
-    }
-
-    public void processShipment(String order) {
-
-        System.out.println("Shipper.submitOrder, warehouse is " + shipperImpl.customer);
-        shipperImpl.customer.notifyShipment(order + ", shipped (" + shipperName + ")");
-
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
deleted file mode 100644
index 90f709bf95..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
+++ /dev/null
@@ -1,30 +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.oasisopen.sca.annotation.Scope;
-
-
-/**
- * This class implements the Shipper service component.
- */
-@Scope("STATELESS")
-public class OSGiStatelessShipperComponentImpl extends OSGiShipperComponentImpl {
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
deleted file mode 100644
index d265f42c1b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
+++ /dev/null
@@ -1,35 +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.oasisopen.sca.annotation.Scope;
-
-
-/**
- * This class implements the Shipper service.
- */
-@Scope("STATELESS")
-public class OSGiStatelessShipperServiceImpl extends OSGiShipperServiceImpl {
-
-    public OSGiStatelessShipperServiceImpl(OSGiShipperImpl shipperImpl, String shipperName) {
-       super(shipperImpl, shipperName);
-    }
-
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
deleted file mode 100644
index 6ebd1f2894..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
+++ /dev/null
@@ -1,78 +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 java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component.
- */
-public class OSGiVersionedShipperImpl extends OSGiBundleImpl {
-    
-    protected Customer customer;
-    
-    private int version;
-
-    
-    public OSGiVersionedShipperImpl() {
-
-        super(new String[]{"customer"}, null);
-    }
-    
-    protected void started(BundleContext bc) {
-        
-        String jarFile = bc.getBundle().getLocation();
-        if (jarFile.endsWith("1.jar")) version = 1;
-        else if (jarFile.endsWith("2.jar")) version = 2;
-        
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("shipperName", "RoyalMail");
-        props1.put("component.service.name", "ShipperComponent"+version+"/ShipperService1");
-        bc.registerService("supplychain.shipper.Shipper", 
-                new OSGiVersionedShipperServiceImpl(this, "RoyalMail", version),
-                props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("shipperName", "ParcelForce");
-        props2.put("component.service.name", "ShipperComponent"+version+"/ShipperService2");
-        bc.registerService("supplychain.shipper.Shipper", 
-                new OSGiVersionedShipperServiceImpl(this, "ParcelForce", version),
-                props2);
-        
-        try {
-            ServiceReference[] refs = bc.getServiceReferences(Customer.class.getName(), 
-                    "(component.service.name=CustomerComponent" + version + "/CustomerService)");
-            if (refs != null && refs.length > 0) {
-                customer = (Customer) bc.getService(refs[0]);
-            }
-        } catch (InvalidSyntaxException e) {
-        }
-    }
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
deleted file mode 100644
index b66961b1c2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.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.shipper;
-
-
-/**
- * This class implements the Shipper service.
- */
-public class OSGiVersionedShipperServiceImpl implements Shipper {
-
-    private OSGiVersionedShipperImpl shipperImpl;
-
-    private String shipperName;
-    
-    private int version;
-
-    OSGiVersionedShipperServiceImpl(OSGiVersionedShipperImpl shipperImpl, String shipperName, int version) {
-        this.shipperImpl = shipperImpl;
-        this.shipperName = shipperName;
-        this.version = version;
-    }
-
-    public void processShipment(String order) {
-
-        System.out.println("Shipper.processShipment, version " + version + " customer is " + shipperImpl.customer);
-        shipperImpl.customer.notifyShipment(order + ", shipped (" + shipperName + ")");
-
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/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/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index 9f636957ac..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ /dev/null
@@ -1,48 +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.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component.
- */
-@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) {
-    	System.out.println("JavaWarehouseComponentImpl.fulfillOrder : shipper is " + shipper);
-        
-        shipper.processShipment(order + ", fulfilled");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
deleted file mode 100644
index e32028dd30..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.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.warehouse;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component.
- */
-@Service(interfaces={Warehouse.class, WarehouseQuery.class})
-@Scope("COMPOSITE")
-public class JavaWarehouseWithQueryComponentImpl implements Warehouse, WarehouseQuery {
-    
-    private Shipper shipper;
-    
-    @Reference
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-    	System.out.println("JavaWarehouseComponentImpl.fulfillOrder : shipper is " + shipper);
-        
-        shipper.processShipment(order + ", fulfilled");
-    }
-
-    public boolean isAvailable(String order) {
-        return true;
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 7c9e102fd2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.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.warehouse;
-
-
-import org.osgi.service.component.ComponentContext;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component.
- */
-
-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) {
-    	System.out.println("OSGiWarehouseComponentImpl.fulfillOrder : shipper is " + shipper);
-        
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiWarehouseComponentImpl ");
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiWarehouseComponentImpl ");
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index bb04ff42e0..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ /dev/null
@@ -1,68 +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 java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component.
- */
-
-public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse {
-    
-    protected Shipper shipper;
-    private OSGiWarehouseServiceImpl warehouseService1;
-    private OSGiWarehouseServiceImpl warehouseService2;
-    
-    public OSGiWarehouseImpl() {
-    	super(new String[]{"shipper"}, null);
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("component.name", "WarehouseComponent1");
-        warehouseService1 = new OSGiWarehouseServiceImpl(this, 2);
-        registerService(warehouseService1,
-                "supplychain.warehouse.Warehouse", props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("component.name", "WarehouseComponent2");
-        warehouseService2 = new OSGiWarehouseServiceImpl(this, 1);
-        registerService(warehouseService2,
-                "supplychain.warehouse.Warehouse", props2);
-    }
-    
-    protected void started(BundleContext bc) {
-        warehouseService1.started(bc);
-        warehouseService2.started(bc);
-    }
-    
-    public void fulfillOrder(String order) {
-    	System.out.println("OSGiWarehouseImpl.fulfillOrder : shipper is " + shipper);
-        	
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
deleted file mode 100644
index 3317816557..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
+++ /dev/null
@@ -1,62 +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.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-import supplychain.shipper.Shipper;
-
-
-/**
- * This class implements the Warehouse service.
- */
-public class OSGiWarehouseServiceImpl implements Warehouse {
-
-    private OSGiWarehouseImpl warehouseImpl;
-    private Shipper shipper;
-    private int shipperNum;
-
-
-    OSGiWarehouseServiceImpl(OSGiWarehouseImpl warehouseImpl, int shipperNum) {
-        this.warehouseImpl = warehouseImpl;
-        this.shipperNum = shipperNum;
-    }
-    
-    
-    protected void started(BundleContext bc) {
-        try {
-            ServiceReference[] refs = bc.getServiceReferences(Shipper.class.getName(), 
-                    "(component.service.name=ShipperComponent" + shipperNum + "/Shipper)");
-            if (refs != null && refs.length > 0) {
-                shipper = (Shipper) bc.getService(refs[0]);
-            }
-        } catch (InvalidSyntaxException e) {
-        }
-    }
-
-    public void fulfillOrder(String order) {
-        System.out.println("OSGiWarehouseImpl.fulfillOrder : shipper is " + warehouseImpl.shipper);
-            
-        shipper.processShipment(order + ", fulfilled");
-        
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/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/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
deleted file mode 100644
index 6d1ad76796..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.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 RetailerQuery service.
- */
-public interface WarehouseQuery {
-    
-    public boolean isAvailable(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
deleted file mode 100644
index 71e248590b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
+++ /dev/null
@@ -1,31 +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="CallbackClient">

-        <interface.java interface="callback.client.CallbackClient"/>

-    </service>

-    

-    

-    <reference name="callbackService" >

-        <interface.java interface="callback.service.CallbackService" 

-                        callbackInterface="callback.client.CallbackCallback" />

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
deleted file mode 100644
index 7c1125bbb5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="CallbackService">

-        <interface.java interface="callback.service.CallbackService" 

-                        callbackInterface="callback.client.CallbackCallback"/>

-    </service>

-    

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
deleted file mode 100644
index 8456b878f2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
+++ /dev/null
@@ -1,39 +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"

-    targetNamespace="http://callback"

-    name="CallbackTest">

-           

-    <component name="CallbackClient">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0" 

-            bundleSymbolicName="callback.CallbackClient">

-            

-            <properties referenceCallback="callbackService">

-               <property name="component.name">CallbackClient</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="callbackService" target="CallbackService"/>

-    </component> 

-    

-    <component name="CallbackService">

-      <implementation.java class="callback.service.JavaCallbackServiceImpl"/>

-    </component>  

-  

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
deleted file mode 100644
index d5a47c6403..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
+++ /dev/null
@@ -1,41 +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"

-    targetNamespace="http://callback"

-    name="CallbackTest">

-           

-    <component name="CallbackClient">

-        <implementation.java class="callback.client.JavaCallbackClientImpl"/>

-        <reference name="callbackService" target="CallbackService"/>

-    </component> 

-    

-   

-    <component name="CallbackService">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="callback.CallbackService"

-        >

-        <properties serviceCallback="CallbackService">

-            <property name="component.name">CallbackClient</property>

-        </properties>

-        

-        </implementation.osgi >   

-    </component> 

-  

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
deleted file mode 100644
index e6391d2159..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
+++ /dev/null
@@ -1,38 +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"

-    targetNamespace="http://callback"

-    name="CallbackTest">

-           

-    <component name="CallbackClient">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="callback.CallbackClient"

-        />

-        <reference name="callbackService" target="CallbackService"/>

-    </component> 

-    

-   

-    <component name="CallbackService">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="callback.CallbackService"

-        />

-    </component> 

-  

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
deleted file mode 100644
index c79ede815b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
+++ /dev/null
@@ -1,37 +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="ConversationalClient">

-        <interface.java interface="conversation.client.ConversationalClient"/>

-    </service>

-    

-    

-    <reference name="conversationalReferenceClient" >

-        <interface.java interface="conversation.referenceclient.ConversationalReferenceClient" />

-    </reference>

-    

-    <reference name="conversationalService" >

-        <interface.java interface="conversation.service.ConversationalService" 

-                        callbackInterface="conversation.client.ConversationalCallback" />

-    </reference>

-    

-   

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
deleted file mode 100644
index 04cc73b85c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.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="ConversationalReferenceClient">

-        <interface.java interface="conversation.referenceclient.ConversationalReferenceClient"/>

-    </service>

-    

-   

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
deleted file mode 100644
index 9ece700efe..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-

-    <service name="ConversationalService">

-        <interface.java interface="conversation.service.ConversationalService"

-                        callbackInterface="conversation.client.ConversationalCallback" />

-    </service>

-    

-   

-    

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
deleted file mode 100644
index 52bc43478d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
+++ /dev/null
@@ -1,162 +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"

-    targetNamespace="http://conversations"

-    name="ConversationalITest">

-           

-    <component name="ConversationalStatelessClientStatelessService">

-        <!-- <implementation.java class="conversation.ConversationalClientStatelessImpl"/> -->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalClient"

-            classes="conversation.client.ConversationalClientStatelessImpl">

-            

-            <properties service="ConversationalClient">

-               <property name="component.name">ConversationalStatelessClientStatelessService</property>

-            </properties>

-            <properties reference="conversationalReferenceClient">

-               <property name="component.name">ConversationalReferenceClient</property>

-            </properties>

-            <properties reference="conversationalService">

-               <property name="component.name">ConversationalServiceStateless</property>

-            </properties>

-            <properties serviceCallback="$callback$.conversationalService">

-               <property name="component.name">ConversationalStatelessClientStatelessService</property>

-            </properties>

-            

-        </implementation.osgi>

-        

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>        

-        <reference name="conversationalService" target="ConversationalServiceStateless/ConversationalService"/>

-    </component>   

-    

-    <component name="ConversationalStatelessClientStatefulService">

-        <!--<implementation.java class="conversation.ConversationalClientStatelessImpl"/>-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalClient"

-            classes="conversation.client.ConversationalClientStatelessImpl">

-            

-            <properties service="ConversationalClient">

-               <property name="component.name">ConversationalStatelessClientStatefulService</property>

-            </properties>

-            <properties reference="conversationalReferenceClient">

-               <property name="component.name">ConversationalReferenceClient</property>

-            </properties>

-            <properties reference="conversationalService">

-               <property name="component.name">ConversationalServiceStateful</property>

-            </properties>

-            <properties serviceCallback="$callback$.conversationalService">

-               <property name="component.name">ConversationalStatelessClientStatefulService</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful/ConversationalService"/>

-    </component>     

-    

-    <component name="ConversationalStatefulClientStatelessService">

-        <!--<implementation.java class="conversation.ConversationalClientStatefulImpl"/>-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalClient"

-            classes="conversation.client.ConversationalClientStatefulImpl">

-            

-            <properties service="ConversationalClient">

-               <property name="component.name">ConversationalStatefulClientStatelessService</property>

-            </properties>

-            <properties reference="conversationalReferenceClient">

-               <property name="component.name">ConversationalReferenceClient</property>

-            </properties>

-            <properties reference="conversationalService">

-               <property name="component.name">ConversationalServiceStateless</property>

-            </properties>

-            <properties serviceCallback="$callback$.conversationalService">

-               <property name="component.name">ConversationalStatefulClientStatelessService</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateless/ConversationalService"/>

-    </component>   

-    

-    <component name="ConversationalStatefulClientStatefulService">

-        <!--<implementation.java class="conversation.ConversationalClientStatefulImpl"/>-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalClient"

-            classes="conversation.client.ConversationalClientStatefulImpl">

-            

-            <properties service="ConversationalClient">

-               <property name="component.name">ConversationalStatefulClientStatefulService</property>

-            </properties>

-            <properties reference="conversationalReferenceClient">

-               <property name="component.name">ConversationalReferenceClient</property>

-            </properties>

-            <properties reference="conversationalService">

-               <property name="component.name">ConversationalServiceStateful</property>

-            </properties>

-            <properties serviceCallback="$callback$.conversationalService">

-               <property name="component.name">ConversationalStatefulClientStatefulService</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful/ConversationalService"/>

-    </component>   

-    

-    <component name="ConversationalReferenceClient">

-        <!--<implementation.java class="conversation.ConversationalReferenceClientImpl"/>-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalReferenceClient"

-            classes="conversation.referenceclient.ConversationalReferenceClientImpl"

-        />

-        

-    </component>    

-        

-    <component name="ConversationalServiceStateful">

-        <!--<implementation.java class="conversation.ConversationalServiceStatefulImpl"/>-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalService"

-            classes="conversation.service.ConversationalServiceStatefulImpl">

-            

-            <properties service="ConversationalService">

-               <property name="component.name">ConversationalServiceStateful</property>

-            </properties>

-        </implementation.osgi>

-        

-    </component>       

-   

-    <component name="ConversationalServiceStateless">

-        <!--<implementation.java class="conversation.ConversationalServiceStatelessImpl"/>-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalService"

-            classes="conversation.service.ConversationalServiceStatelessImpl">

-            

-            <properties service="ConversationalService">

-               <property name="component.name">ConversationalServiceStateless</property>

-            </properties>

-        </implementation.osgi>

-        

-    </component> 

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
+++ /dev/null
@@ -1,34 +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="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/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="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
+++ /dev/null
@@ -1,34 +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="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/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="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
deleted file mode 100644
index 0b8d2e5851..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
+++ /dev/null
@@ -1,130 +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:xsd="http://www.w3.org/2001/XMLSchema"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.factory.supplychain.customer.Customer"

-                classes="supplychain.customer.OSGiStatelessCustomerComponentImpl" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent1"/>

-        

-        <reference name="retailer2" target="RetailerComponent2" />

-        

-        <reference name="retailer3" target="RetailerComponent3" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-

-

-

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.factory.supplychain.shipper.Shipper"

-            classes="supplychain.shipper.OSGiStatelessShipperComponentImpl" >

-            

-            <properties service="Shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.factory.supplychain.shipper.Shipper"

-            classes="supplychain.shipper.OSGiStatelessShipperComponentImpl" >

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
deleted file mode 100644
index 87370a6df4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
+++ /dev/null
@@ -1,116 +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:xsd="http://www.w3.org/2001/XMLSchema"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="factory.supplychain.customer.Customer"

-                classes="supplychain.customer.OSGiStatelessCustomerImpl" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent1"/>

-        

-        <reference name="retailer2" target="RetailerComponent2" />

-        

-        <reference name="retailer3" target="RetailerComponent3" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="factory.supplychain.retailer.Retailer">

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-

-

-

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="factory.supplychain.shipper.Shipper"

-            classes="supplychain.shipper.OSGiStatelessShipperServiceImpl" >

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-    </component>

-    

-     

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
deleted file mode 100644
index 127349eacf..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
+++ /dev/null
@@ -1,30 +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="Greetings">
-        <interface.java interface="helloworld.Greetings"/>
-    </service>
-    
-    
-    <reference name="greetingsService" >
-        <interface.java interface="helloworld.Greetings" />
-    </reference>
-      
-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
deleted file mode 100644
index 7e3810c458..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
+++ /dev/null
@@ -1,31 +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="OSGiHelloWorld">
-        <interface.java interface="helloworld.HelloWorld"/>
-    </service>
-    
-    
-    <reference name="helloWorldWS" >
-        <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" / -->
-        <interface.java interface="helloworld.ws.HelloWorld" />
-    </reference>
-      
-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
deleted file mode 100644
index fb9a112d18..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
+++ /dev/null
@@ -1,31 +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="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailerQuery">

-            <interface.java interface="supplychain.retailer.RetailerQuery"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
deleted file mode 100644
index ee732b5efc..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
+++ /dev/null
@@ -1,35 +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" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerQuery">

-        <interface.java interface="supplychain.retailer.RetailerQuery"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <reference name="warehouseQuery">

-            <interface.java interface="supplychain.warehouse.WarehouseQuery"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
deleted file mode 100644
index b1723660d7..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
+++ /dev/null
@@ -1,31 +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="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    <service name="WarehouseQuery">

-        <interface.java interface="supplychain.warehouse.WarehouseQuery"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
deleted file mode 100644
index fb9a112d18..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
+++ /dev/null
@@ -1,31 +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="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailerQuery">

-            <interface.java interface="supplychain.retailer.RetailerQuery"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
deleted file mode 100644
index ee732b5efc..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
+++ /dev/null
@@ -1,35 +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" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerQuery">

-        <interface.java interface="supplychain.retailer.RetailerQuery"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <reference name="warehouseQuery">

-            <interface.java interface="supplychain.warehouse.WarehouseQuery"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
deleted file mode 100644
index b1723660d7..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
+++ /dev/null
@@ -1,31 +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="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    <service name="WarehouseQuery">

-        <interface.java interface="supplychain.warehouse.WarehouseQuery"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
deleted file mode 100644
index 5172cbe21e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
+++ /dev/null
@@ -1,57 +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:xsd="http://www.w3.org/2001/XMLSchema"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-    

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.interfaces.supplychain.customer.Customer"

-        />

-        <reference name="retailer" target="RetailerComponent/Retailer"/>

-        <reference name="retailerQuery" target="RetailerComponent/RetailerQuery"/>

-        

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.interfaces.supplychain.retailer.Retailer"

-        />

-        <reference name="warehouse" target="WarehouseComponent/Warehouse"/>

-        <reference name="warehouseQuery" target="WarehouseComponent/WarehouseQuery"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseWithQueryComponentImpl" />

-       

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.interfaces.supplychain.shipper.Shipper"

-        />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-   

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
deleted file mode 100644
index b7591e732d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
+++ /dev/null
@@ -1,57 +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:xsd="http://www.w3.org/2001/XMLSchema"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-    

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="interfaces.supplychain.customer.Customer"

-        />

-        <reference name="retailer" target="RetailerComponent/Retailer"/>

-        <reference name="retailerQuery" target="RetailerComponent/RetailerQuery"/>

-        

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="interfaces.supplychain.retailer.Retailer"

-        />

-        <reference name="warehouse" target="WarehouseComponent/Warehouse"/>

-        <reference name="warehouseQuery" target="WarehouseComponent/WarehouseQuery"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseWithQueryComponentImpl" />

-       

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="interfaces.supplychain.shipper.Shipper"

-        />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-   

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
deleted file mode 100644
index cf8717fcf5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: CallbackClient

-Bundle-SymbolicName: callback.CallbackClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, callback.service

-Export-Package: callback.client

-Bundle-Activator: callback.client.OSGiCallbackClientImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
deleted file mode 100644
index 785212fa6d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: CallbackService

-Bundle-SymbolicName: callback.CallbackService

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, callback.client

-Export-Package: callback.service

-Bundle-Activator: callback.service.OSGiCallbackServiceImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
deleted file mode 100644
index 510b3cdcce..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: ConversationTest

-Bundle-SymbolicName: conversation.ConversationalClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.oasisopen.sca, org.oasisopen.sca.annotation,

-                conversation.service, conversation.referenceclient

-Export-Package: conversation.client

-Bundle-Activator: conversation.client.ConversationalClientActivator

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
deleted file mode 100644
index a8270363d2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: ConversationTest

-Bundle-SymbolicName: conversation.ConversationalReferenceClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.oasisopen.sca, org.oasisopen.sca.annotation,

-                conversation.service

-Export-Package: conversation.referenceclient

-Bundle-Activator: conversation.referenceclient.ConversationalReferenceClientActivator

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
deleted file mode 100644
index 6062757a32..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: ConversationTest

-Bundle-SymbolicName: conversation.ConversationalService

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.oasisopen.sca, org.oasisopen.sca.annotation,

-                conversation.client

-Export-Package: conversation.service

-Bundle-Activator: conversation.service.ConversationalServiceActivator

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
deleted file mode 100644
index 26f32fe617..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: factory.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.OSGiCustomerFactoryImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
deleted file mode 100644
index 1b9e0e847e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: factory.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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
deleted file mode 100644
index 6066a38f29..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: factory.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.OSGiShipperFactoryImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
deleted file mode 100644
index 777edd3f7d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.factory.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/factory/ds/Customer.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
deleted file mode 100644
index d8adaa2ba3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
+++ /dev/null
@@ -1,41 +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" >
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service servicefactory="true" >
-         <provide interface="supplychain.customer.Customer" />
-    </service>
-    <reference 
-        name="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
deleted file mode 100644
index e0bd9d8c10..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.factory.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/factory/ds/Retailer1.xml, osgi/factory/ds/Retailer2.xml 

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
deleted file mode 100644
index 6005ae785c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.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="RetailerComponent1"  >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service servicefactory="true">
-         <provide interface="supplychain.retailer.Retailer" />
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <property name="retailerName">amazon.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
deleted file mode 100644
index 6f0b79ebc2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.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="RetailerComponent2" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service servicefactory="true">
-         <provide interface="supplychain.retailer.Retailer" />
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
deleted file mode 100644
index d4b461460e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.factory.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/factory/ds/Shipper1.xml, osgi/factory/ds/Shipper2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
deleted file mode 100644
index bb15e6e3aa..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
+++ /dev/null
@@ -1,34 +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="ShipperComponent1"  >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service servicefactory="true">
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
deleted file mode 100644
index 7591201b8c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
+++ /dev/null
@@ -1,34 +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="ShipperComponent2">
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service servicefactory="true">
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
deleted file mode 100644
index 0e844fab99..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.factory.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/factory/ds/Warehouse.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
deleted file mode 100644
index fc86a76784..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
deleted file mode 100644
index a8a87c5c8c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: interfaces.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.OSGiCustomerWithQueryImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
deleted file mode 100644
index 05bbf4db88..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: interfaces.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.OSGiRetailerWithQueryImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
deleted file mode 100644
index a12d1a21ea..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: interfaces.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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
deleted file mode 100644
index 2214db11a6..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.interfaces.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/interfaces/ds/Customer.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
deleted file mode 100644
index 8d44067992..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
+++ /dev/null
@@ -1,43 +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.OSGiCustomerWithQueryComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer"/>
-    </service>
-    <reference 
-        name="retailer"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer"
-        unbind="unsetRetailer"
-        target="(component.service.name=RetailerComponent/Retailer)"
-        policy="dynamic"
-    />
-    
-    <reference 
-        name="retailerQuery"
-        interface="supplychain.retailer.RetailerQuery" 
-        bind="setRetailerQuery"
-        unbind="unsetRetailerQuery"
-        target="(component.service.name=RetailerComponent/RetailerQuery)"
-        policy="dynamic"
-    />
-    
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
deleted file mode 100644
index 60c0fb3fd3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.interfaces.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/interfaces/ds/Retailer.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
deleted file mode 100644
index ca1392d2b8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
+++ /dev/null
@@ -1,39 +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.OSGiRetailerWithQueryComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-         <provide interface="supplychain.retailer.RetailerQuery"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <reference 
-        name="supplychain.warehouse.WarehouseQuery" 
-        interface="supplychain.warehouse.WarehouseQuery" 
-        bind="setWarehouseQuery"
-        unbind="unsetWarehouseQuery"
-    />
-    <property name="retailerName">amazon.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
deleted file mode 100644
index 7c9f67c36d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.interfaces.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/interfaces/ds/Shipper.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
deleted file mode 100644
index 760c761666..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
+++ /dev/null
@@ -1,34 +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"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
deleted file mode 100644
index 7d56770311..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Greetings

-Bundle-SymbolicName: passbyref.helloworld.Greetings

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework

-Export-Package: helloworld

-Bundle-Activator: helloworld.OSGiGreetingsImpl

-

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
deleted file mode 100644
index 321bdc713f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: stockquote.ManagedStockQuoteFactory

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.cm

-Export-Package: stockquote

-Bundle-Activator: stockquote.OSGiManagedStockQuoteFactoryImpl

-

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
deleted file mode 100644
index 66f98011cb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: stockquote.StockQuote

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.cm

-Export-Package: stockquote

-Bundle-Activator: stockquote.OSGiStockQuoteImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
deleted file mode 100644
index 6874a66db9..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: stockquote.StockQuoteFactory

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.cm

-Export-Package: stockquote

-Bundle-Activator: stockquote.OSGiStockQuoteFactoryImpl

-

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
deleted file mode 100644
index 47d290eb1a..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: ds.stockquote.StockQuote

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.component, org.osgi.service.cm

-Export-Package: stockquote

-Service-Component: osgi/properties/ds/StockQuote.xml

-

-

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
deleted file mode 100644
index c7f13a50a7..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.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.    
--->
-<component name="StockQuoteComponent" immediate="true">
-    <implementation class="stockquote.OSGiStockQuoteComponentImpl" />
-    <service>
-         <provide interface="stockquote.StockQuote"/>
-    </service>
-    <property name="currency">GBP</property>
-    <property name="exchangeRate" type="Double">1.0</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
deleted file mode 100644
index f4c102c4f0..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: ds.stockquote.StockQuoteFactory

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.component, org.osgi.service.cm

-Export-Package: stockquote

-Service-Component: osgi/properties/ds/StockQuoteFactory.xml

-

-

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
deleted file mode 100644
index cbebf7eec2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.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.    
--->
-<component name="StockQuoteComponent" >
-    <implementation class="stockquote.OSGiStockQuoteComponentImpl" />
-    <service servicefactory="true" >
-         <provide interface="stockquote.StockQuote" />
-    </service>
-    <property name="currency">GBP</property>
-    <property name="exchangeRate" type="Double">1.0</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
deleted file mode 100644
index 19b41cf4a4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: HelloWorldClient

-Bundle-SymbolicName: ds.helloworld.sdo.HelloWorldClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.component, 

- org.oasisopen.sca, org.oasisopen.sca.annotation,

- commonj.sdo, commonj.sdo.helper, 

- org.apache.tuscany.sdo.helper, org.apache.tuscany.sdo.impl, org.apache.tuscany.sdo.model, org.apache.tuscany.sdo.model.impl,

- org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl,

- helloworld.sdo

-Export-Package: helloworld.sdo.client

-Service-Component: osgi/sdo/ds/HelloWorldClient.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
deleted file mode 100644
index cb6345432f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.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="HelloWorldClientComponent" immediate="true">
-    <implementation class="helloworld.sdo.client.HelloWorldClientComponent" />
-    <service>
-         <provide interface="helloworld.sdo.client.HelloWorldClient"/>
-    </service>
-    <reference 
-        name="helloWorldService"
-        interface="helloworld.sdo.HelloWorldService" 
-        bind="setHelloWorldService"
-        unbind="unsetHelloWorldService"
-        target="(component.service.name=JavaHelloWorldServiceComponent/HelloWorldService)"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
deleted file mode 100644
index d730273c0e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: HelloWorldService

-Bundle-SymbolicName: ds.helloworld.sdo.HelloWorldService

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.component,

- org.oasisopen.sca, org.oasisopen.sca.annotation,

- commonj.sdo, commonj.sdo.helper, 

- org.apache.tuscany.sdo.helper, org.apache.tuscany.sdo.impl, org.apache.tuscany.sdo.model, org.apache.tuscany.sdo.model.impl,

- org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl

-Export-Package: helloworld.sdo

-Service-Component: osgi/sdo/ds/HelloWorldService.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
deleted file mode 100644
index d968d1ffc5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
+++ /dev/null
@@ -1,25 +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="HelloWorldServiceComponent" immediate="true">
-    <implementation class="helloworld.sdo.HelloWorldServiceComponent" />
-    <service>
-         <provide interface="helloworld.sdo.HelloWorldService"/>
-    </service>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
deleted file mode 100644
index fc762df8d5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: services.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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
deleted file mode 100644
index 02e42bc010..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: services.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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
deleted file mode 100644
index 390367b99b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: services.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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
deleted file mode 100644
index 4715cbd976..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: services.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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
deleted file mode 100644
index 932fb8a483..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.services.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/services/ds/Customer.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
deleted file mode 100644
index b10d0416dc..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
+++ /dev/null
@@ -1,41 +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="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
deleted file mode 100644
index c799f31606..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.services.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/services/ds/Retailer1.xml, osgi/services/ds/Retailer2.xml 

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
deleted file mode 100644
index db68d7e333..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.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="RetailerComponent1" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <property name="retailerName">amazon.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
deleted file mode 100644
index 1aea3cf669..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.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="RetailerComponent2" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
deleted file mode 100644
index 106bd1b6aa..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.services.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/services/ds/Shipper1.xml, osgi/services/ds/Shipper2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
deleted file mode 100644
index 1e3c915a59..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
+++ /dev/null
@@ -1,34 +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="ShipperComponent1"  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"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
deleted file mode 100644
index d7d0b41f5e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
+++ /dev/null
@@ -1,34 +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="ShipperComponent2"  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"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
deleted file mode 100644
index 81c51e6804..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.services.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/services/ds/Warehouse1.xml, osgi/services/ds/Warehouse2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.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="WarehouseComponent1"  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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.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="WarehouseComponent2"  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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
deleted file mode 100644
index 335bc419c1..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: version.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.retailer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.customer;version="1.0.0"

-Bundle-Activator: supplychain.customer.OSGiVersionedCustomerImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
deleted file mode 100644
index a68b9d6dbb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: version.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)"

-Export-Package: supplychain.customer;version="2.0.0"

-Bundle-Activator: supplychain.customer.OSGiVersionedCustomerImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
deleted file mode 100644
index 02f79c15f3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: version.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer;version="1.0.0"

-Bundle-Activator: supplychain.retailer.OSGiVersionedRetailerImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
deleted file mode 100644
index 8428b08d96..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: version.supplychain.retailer.Retailer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer;version="2.0.0"

-Bundle-Activator: supplychain.retailer.OSGiVersionedRetailerImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
deleted file mode 100644
index c81bf00d00..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: version.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.customer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.shipper;version="1.0.0"

-Bundle-Activator: supplychain.shipper.OSGiVersionedShipperImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
deleted file mode 100644
index 61c161617c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: version.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.OSGiVersionedShipperImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
deleted file mode 100644
index fd6a26a65f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: version.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.shipper;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.warehouse;version="1.0.0"

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
deleted file mode 100644
index 0168bc2435..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: version.supplychain.warehouse.Warehouse

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.shipper;version="2.0.0"

-Export-Package: supplychain.warehouse;version="2.0.0"

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
deleted file mode 100644
index 6674cdd7f2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.version.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.customer;version="1.0.0"

-Service-Component: osgi/version/ds/CustomerV1.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
deleted file mode 100644
index 72df35ef41..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.version.supplychain.customer.Customer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.customer;version="2.0.0"

-Service-Component: osgi/version/ds/CustomerV2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
deleted file mode 100644
index 724c8132df..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
+++ /dev/null
@@ -1,41 +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="CustomerComponent1" immediate="true">
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer"/>
-    </service>
-    <reference 
-        name="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
deleted file mode 100644
index 1e5035d949..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
+++ /dev/null
@@ -1,41 +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="CustomerComponent2" immediate="true">
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer"/>
-    </service>
-    <reference 
-        name="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
deleted file mode 100644
index 85bfd86422..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.version.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;version="1.0.0"

-Service-Component: osgi/version/ds/Retailer1V1.xml, osgi/version/ds/Retailer2V1.xml 

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
deleted file mode 100644
index 6e51b3d6f2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
+++ /dev/null
@@ -1,34 +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="RetailerComponent1.Retailer1" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent1/Warehouse)"
-    />
-    <property name="retailerName">amazon.com</property>
-    <property name="version">1</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
deleted file mode 100644
index 9a87758ec2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
+++ /dev/null
@@ -1,34 +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="RetailerComponent2.Retailer1" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent2/Warehouse)"
-    />
-    <property name="retailerName">amazon.com</property>
-    <property name="version">2</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
deleted file mode 100644
index e134bd1061..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.version.supplychain.retailer.Retailer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer;version="2.0.0"

-Service-Component: osgi/version/ds/Retailer1V2.xml, osgi/version/ds/Retailer2V2.xml 

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
deleted file mode 100644
index c19895bab1..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.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="RetailerComponent1.Retailer2" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent1/Warehouse)"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
deleted file mode 100644
index 707609d2c4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.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="RetailerComponent2.Retailer2" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent2/Warehouse)"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
deleted file mode 100644
index e084e5831a..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.version.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.shipper;version="1.0.0"

-Service-Component: osgi/version/ds/Shipper1V1.xml, osgi/version/ds/Shipper2V1.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
deleted file mode 100644
index d96f6481fb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
+++ /dev/null
@@ -1,35 +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="ShipperComponent1.ShipperService1"  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"
-        target="(component.name=CustomerComponent1)"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
deleted file mode 100644
index 10ef690c9b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
+++ /dev/null
@@ -1,35 +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="ShipperComponent2.ShipperService1"  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"
-        target="(component.name=CustomerComponent2)"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
deleted file mode 100644
index 003f9dca5a..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.version.supplychain.shipper.Shipper

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.shipper;version="2.0.0"

-Service-Component: osgi/version/ds/Shipper1V2.xml, osgi/version/ds/Shipper2V2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
deleted file mode 100644
index fefdea106d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
+++ /dev/null
@@ -1,35 +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="ShipperComponent1.ShipperService2"  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"
-        target="(component.name=CustomerComponent1)"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
deleted file mode 100644
index f6b847ed59..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
+++ /dev/null
@@ -1,35 +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="ShipperComponent2.ShipperService2"  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"
-        target="(component.name=CustomerComponent2)"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
deleted file mode 100644
index 5cff2f573e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.version.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.shipper;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.warehouse;version="1.0.0"

-Service-Component: osgi/version/ds/Warehouse1V1.xml, osgi/version/ds/Warehouse2V2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.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="WarehouseComponent1"  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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.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="WarehouseComponent2"  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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
deleted file mode 100644
index 0fec68a725..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.version.supplychain.warehouse.Warehouse

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.shipper;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.warehouse;version="2.0.0"

-Service-Component: osgi/version/ds/Warehouse1V1.xml, osgi/version/ds/Warehouse2V2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.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="WarehouseComponent1"  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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.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="WarehouseComponent2"  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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
deleted file mode 100644
index 678014d48d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: wiring.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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
deleted file mode 100644
index f0090fb52b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: wiring.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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
deleted file mode 100644
index 0b50923a05..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: wiring.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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
deleted file mode 100644
index 1000a5f974..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: wiring.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/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
deleted file mode 100644
index 4e392a9ff1..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.wiring.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/wiring/ds/Customer.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
deleted file mode 100644
index b10d0416dc..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
+++ /dev/null
@@ -1,41 +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="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
deleted file mode 100644
index 788ec4f19a..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.wiring.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/wiring/ds/Retailer1.xml, osgi/wiring/ds/Retailer2.xml 

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
deleted file mode 100644
index 1ba16d0693..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.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="RetailerComponent1" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent1/Warehouse)"
-    />
-    <property name="retailerName">amazon.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
deleted file mode 100644
index a55ebd02a8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.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="RetailerComponent2" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent1/Warehouse)"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
deleted file mode 100644
index e7459360e6..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.wiring.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/wiring/ds/Shipper1.xml, osgi/wiring/ds/Shipper2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
deleted file mode 100644
index d518ecab62..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
+++ /dev/null
@@ -1,35 +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="ShipperComponent1"  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"
-        target="(component.service.name=CustomerComponent/Customer)"
-        policy="dynamic"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
deleted file mode 100644
index d7d0b41f5e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
+++ /dev/null
@@ -1,34 +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="ShipperComponent2"  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"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
deleted file mode 100644
index 880304187b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.wiring.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/wiring/ds/Warehouse1.xml, osgi/wiring/ds/Warehouse2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
deleted file mode 100644
index d72db04425..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.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="WarehouseComponent1"  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"
-        target="(shipperName=ParcelForce)"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
deleted file mode 100644
index f9c1218f82..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.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="WarehouseComponent2"  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"
-        target="(shipperName=RoyalMail)"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
deleted file mode 100644
index d8e4c1cb7e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: HelloWorld

-Bundle-SymbolicName: helloworld.HelloWorld

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component ,

- helloworld.ws

-Export-Package: helloworld

-Bundle-Activator: helloworld.OSGiHelloWorldImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
deleted file mode 100644
index a6de268bf6..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
+++ /dev/null
@@ -1,30 +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="Greetings">

-        <interface.java interface="helloworld.Greetings"/>

-    </service>

-    

-    

-    <reference name="greetingsService" >

-        <interface.java interface="helloworld.Greetings" />

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
deleted file mode 100644
index 660e277693..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
+++ /dev/null
@@ -1,39 +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"

-           name="HelloWorld">

-

-    <component name="JavaGreetingsComponent">

-        <implementation.java class="helloworld.JavaGreetingsComponent"/>

-        

-        <reference name="greetingsService" target="OSGiGreetingsComponent" />

-    </component>

-

-    <component name="OSGiGreetingsComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="passbyref.helloworld.Greetings"

-            classes="helloworld.OSGiGreetingsImpl"

-        />

-        <reference name="greetingsService" target="JavaGreetingsComponent" />

-    </component>

-

-    

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuote.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" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="StockQuoteService">

-        <interface.java interface="stockquote.StockQuote"/>

-    </service>

-    

-    <property name="currency" type="xsd:string" >GBP</property> 

-    <property name="exchangeRate" type="xsd:double" >1.0</property> 

-    

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.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" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="StockQuoteService">

-        <interface.java interface="stockquote.StockQuote"/>

-    </service>

-    

-    <property name="currency" type="xsd:string" >GBP</property> 

-    <property name="exchangeRate" type="xsd:double" >1.0</property> 

-    

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.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" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="StockQuoteService">

-        <interface.java interface="stockquote.StockQuote"/>

-    </service>

-    

-    <property name="currency" type="xsd:string" >GBP</property> 

-    <property name="exchangeRate" type="xsd:double" >1.0</property> 

-    

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.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" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="StockQuoteService">

-        <interface.java interface="stockquote.StockQuote"/>

-    </service>

-    

-    <property name="currency" type="xsd:string" >GBP</property> 

-    <property name="exchangeRate" type="xsd:double" >1.0</property> 

-    

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
deleted file mode 100644
index 02ae93aec2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
+++ /dev/null
@@ -1,39 +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:xsd="http://www.w3.org/2001/XMLSchema"

-           name="StockQuoteComposite">

-

-    <component name="StockQuoteComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.stockquote.StockQuote"

-            classes="stockquote.OSGiStockQuoteComponentImpl">

-            

-            <properties service="StockQuoteService">

-                <property name="service.pid">stockQuote</property>

-            </properties>

-        </implementation.osgi>

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
deleted file mode 100644
index c94504f07d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
+++ /dev/null
@@ -1,54 +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:xsd="http://www.w3.org/2001/XMLSchema"

-           name="StockQuoteComposite">

-

-    <component name="USDStockQuoteComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.stockquote.StockQuoteFactory"

-            classes="stockquote.OSGiStockQuoteComponentImpl">

-            

-            <properties service="StockQuoteService">

-                <property name="service.pid">stockQuote</property>

-            </properties>

-        </implementation.osgi>

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-    

-     <component name="EUROStockQuoteComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.stockquote.StockQuoteFactory"

-            classes="stockquote.OSGiStockQuoteComponentImpl">

-            

-            <properties service="StockQuoteService">

-                <property name="service.pid">stockQuote</property>

-            </properties>

-        </implementation.osgi>

-        

-        <property name="currency" type="xsd:string" >EURO</property> 

-        <property name="exchangeRate" type="xsd:double" >1.48</property> 

-            

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
deleted file mode 100644
index fea03404fd..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
+++ /dev/null
@@ -1,39 +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:xsd="http://www.w3.org/2001/XMLSchema"

-           name="StockQuoteComposite">

-

-    <component name="StockQuoteComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="stockquote.StockQuote"

-            classes="stockquote.OSGiStockQuoteImpl">

-            

-            <properties service="StockQuoteService">

-                <property name="service.pid">stockQuote</property>

-            </properties>

-        </implementation.osgi>

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
deleted file mode 100644
index 3c425fcbc9..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
+++ /dev/null
@@ -1,50 +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:xsd="http://www.w3.org/2001/XMLSchema"

-           name="StockQuoteComposite">

-

-    <component name="USDStockQuoteComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="stockquote.StockQuoteFactory"

-            classes="stockquote.OSGiStockQuoteImpl">

-            

-        </implementation.osgi>

-       

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-    

-    <component name="EUROStockQuoteComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="stockquote.StockQuoteFactory"

-            classes="stockquote.OSGiStockQuoteImpl">

-            

-        </implementation.osgi>

-        

-        

-        <property name="currency" type="xsd:string" >EURO</property> 

-        <property name="exchangeRate" type="xsd:double" >1.48</property> 

-            

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
deleted file mode 100644
index f6c04de980..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
+++ /dev/null
@@ -1,30 +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="HelloWorldClient">

-        <interface.java interface="helloworld.sdo.client.HelloWorldClient"/>

-    </service>

-        

-    <reference name="helloWorldService" >

-        <interface.java interface="helloworld.sdo.HelloWorldService" />

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
deleted file mode 100644
index 87918132e6..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
+++ /dev/null
@@ -1,25 +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="HelloWorldService">

-        <interface.java interface="helloworld.sdo.HelloWorldService"/>

-    </service>

-    

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
deleted file mode 100644
index 9b00787162..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://helloworld"
-              xmlns:helloworld="http://helloworld">
-   <deployable composite="helloworld:helloworldsdo"/>
-   
-   <import.java package="helloworld.sdo"/>
-</contribution>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl b/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
deleted file mode 100644
index 2ecc0bea43..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
+++ /dev/null
@@ -1,88 +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.    

--->

-<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld"

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld"

-            xmlns="http://www.w3.org/2001/XMLSchema">

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="tns:Name" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <complexType name="Name">

-                <sequence>

-                    <element name="first" type="xsd:string" />

-                    <element name="last" type="xsd:string" />

-                </sequence>

-            </complexType>

-

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest" />

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse" />

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction="" />

-            <wsdl:input name="getGreetingsRequest">

-                <wsdlsoap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

-                <wsdlsoap:body use="literal" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldService" />

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
deleted file mode 100644
index af79dc4bdf..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
+++ /dev/null
@@ -1,47 +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" targetNamespace="http://helloworld"

-    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:hw="http://helloworld"

-    name="helloworldsdo">

-    

-    <component name="JavaHelloWorldServiceComponent">

-        <implementation.java class="helloworld.sdo.HelloWorldServiceComponent" />

-    </component>

-    

-    <component name="JavaHelloWorldClientComponent">

-        <implementation.java class="helloworld.sdo.client.HelloWorldClientComponent" />

-        <reference name="helloWorldService" target="OSGiHelloWorldServiceComponent" />

-    </component>

-    

-    <component name="OSGiHelloWorldServiceComponent">       

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.helloworld.sdo.HelloWorldService"

-        />

-    </component>

-    

-    <component name="OSGiHelloWorldClientComponent">       

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.helloworld.sdo.HelloWorldClient"

-        />

-        

-        <reference name="helloWorldService" target="JavaHelloWorldServiceComponent" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Customer.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Customer.componentType
+++ /dev/null
@@ -1,34 +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="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
+++ /dev/null
@@ -1,30 +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" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/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="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
+++ /dev/null
@@ -1,34 +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="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
+++ /dev/null
@@ -1,30 +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" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/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="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
deleted file mode 100644
index c144a1bc18..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
+++ /dev/null
@@ -1,90 +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:xsd="http://www.w3.org/2001/XMLSchema"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.services.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>            

-            

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent/RetailerService3" />

-    </component>

-    

-    <component name="RetailerComponent">

-        <!-- implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" -->

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.services.supplychain.retailer.Retailer" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>    

-    </component>

-    

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent/ShipperService2"  />

-    </component>

-    

-

-    <component name="ShipperComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.services.supplychain.shipper.Shipper" >

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-         </implementation.osgi>

-        <reference name="customer" target="CustomerComponent" />

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/services-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/services-test.composite
deleted file mode 100644
index 64f3b30f88..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/services-test.composite
+++ /dev/null
@@ -1,89 +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:xsd="http://www.w3.org/2001/XMLSchema"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="services.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>            

-            

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent/RetailerService3" />

-    </component>

-    

-    <component name="RetailerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="services.supplychain.retailer.Retailer" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>    

-    </component>

-    

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent/ShipperService2"  />

-    </component>

-    

-

-    <component name="ShipperComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="services.supplychain.shipper.Shipper"  >

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-         </implementation.osgi>

-        <reference name="customer" target="CustomerComponent" />

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
deleted file mode 100644
index 0b0aa0912b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.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" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="StockQuoteService">
-        <interface.java interface="stockquote.StockQuote"/>
-    </service>
-    
-    <property name="currency" type="xsd:string" >GBP</property> 
-    <property name="exchangeRate" type="xsd:double" >1.0</property> 
-    
-</componentType>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
+++ /dev/null
@@ -1,34 +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="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
+++ /dev/null
@@ -1,34 +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="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
+++ /dev/null
@@ -1,30 +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" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
+++ /dev/null
@@ -1,30 +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" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse1.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="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse2.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="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
+++ /dev/null
@@ -1,34 +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="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
+++ /dev/null
@@ -1,34 +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="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
+++ /dev/null
@@ -1,30 +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" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
+++ /dev/null
@@ -1,30 +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" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.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="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.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="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
deleted file mode 100644
index 877d0de1c9..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
+++ /dev/null
@@ -1,184 +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:xsd="http://www.w3.org/2001/XMLSchema"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.version.supplychain.customer.Customer"

-                bundleVersion="1.0.0" >

-                

-            <properties service="CustomerService">

-                <property name="component.name">CustomerComponent1</property>

-            </properties>

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent1/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent1/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent1/RetailerService3" />

-    </component>

-    

-    

-    

-    <component name="CustomerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.version.supplychain.customer.Customer"

-                bundleVersion="2.0.0" >

-                

-            <properties service="CustomerService">

-                <property name="component.name">CustomerComponent2</property>

-            </properties>

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent2/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent2/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent2/RetailerService3" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.version.supplychain.retailer.Retailer"

-                bundleVersion="1.0.0" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.service.name">WarehouseComponent1/Warehouse</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>    

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.version.supplychain.retailer.Retailer"

-                bundleVersion="2.0.0" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-             <properties reference="warehouse">

-                <property name="component.service.name">WarehouseComponent2/Warehouse</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent2"/>

-    </component>

-

-   

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1/ShipperService2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2/ShipperService2"  />

-    </component>

-

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.version.supplychain.shipper.Shipper"

-                bundleVersion="1.0.0">

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-                <property name="component.name">ShipperComponent1.ShipperService1</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-                <property name="component.name">ShipperComponent1.ShipperService2</property>

-            </properties>

-            <properties reference="customer">

-                <property name="component.name">CustomerComponent1</property>

-            </properties>

-         </implementation.osgi>

-         

-        <reference name="customer" target="CustomerComponent1" />

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.version.supplychain.shipper.Shipper"

-                bundleVersion="2.0.0">

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-                <property name="component.name">ShipperComponent2.ShipperService1</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-                <property name="component.name">ShipperComponent2.ShipperService2</property>

-            </properties>

-            <properties reference="customer">

-                <property name="component.name">CustomerComponent2</property>

-            </properties>

-         </implementation.osgi>

-         

-        <reference name="customer" target="CustomerComponent2" />

-        

-    </component>

-    

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/version-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/version-test.composite
deleted file mode 100644
index bbb397ee70..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/version-test.composite
+++ /dev/null
@@ -1,170 +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:xsd="http://www.w3.org/2001/XMLSchema"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="version.supplychain.customer.Customer"

-                bundleVersion="1.0.0" >

-                

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent1/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent1/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent1/RetailerService3" />

-    </component>

-    

-    

-    

-    <component name="CustomerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="version.supplychain.customer.Customer"

-                bundleVersion="2.0.0" >

-                

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent2/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent2/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent2/RetailerService3" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="version.supplychain.retailer.Retailer"

-                bundleVersion="1.0.0" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>    

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="version.supplychain.retailer.Retailer"

-                bundleVersion="2.0.0"  >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.service.name">WarehouseComponent2/Warehouse</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent2"/>

-    </component>

-

-   

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1/ShipperService2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2/ShipperService2"  />

-    </component>

-

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="version.supplychain.shipper.Shipper"

-                bundleVersion="1.0.0" >

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-            <properties reference="customer">

-                <property name="component.name">CustomerComponent1</property>

-            </properties>

-         </implementation.osgi>

-         

-        <reference name="customer" target="CustomerComponent1" />

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="version.supplychain.shipper.Shipper"

-                bundleVersion="2.0.0">

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-            <properties reference="customer">

-                <property name="component.name">CustomerComponent2</property>

-            </properties>

-         </implementation.osgi>

-         

-        <reference name="customer" target="CustomerComponent2" />

-        

-    </component>

-    

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
+++ /dev/null
@@ -1,34 +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="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/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="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
+++ /dev/null
@@ -1,34 +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="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/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="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
deleted file mode 100644
index 617200d8dd..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
+++ /dev/null
@@ -1,136 +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:xsd="http://www.w3.org/2001/XMLSchema"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent1/Retailer" />

-        

-        <reference name="retailer2" target="RetailerComponent2/Retailer" />

-        

-        <reference name="retailer3" target="RetailerComponent3" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    

-    <component name="RetailerComponent3">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent2</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent2"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-

-

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper" >

-            

-            <properties service="Shipper">

-                <property name="component.name">ShipperComponent1</property>

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper"  >

-            

-            <properties service="Shipper">

-                <property name="component.name">ShipperComponent2</property>

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
deleted file mode 100644
index 213cde2c1d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
+++ /dev/null
@@ -1,151 +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:xsd="http://www.w3.org/2001/XMLSchema"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent1/Retailer" />

-        

-        <reference name="retailer2" target="RetailerComponent2/Retailer" />

-        

-        <reference name="retailer3" target="RetailerComponent3/Retailer" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-            

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-    

-    <component name="WarehouseComponent1">

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.warehouse.Warehouse" >

-                

-            <properties reference="shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-

-

-    <component name="WarehouseComponent2">

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.warehouse.Warehouse" >

-                

-            <properties reference="shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-    

-   

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
deleted file mode 100644
index 0dca0da75e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
+++ /dev/null
@@ -1,127 +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:xsd="http://www.w3.org/2001/XMLSchema"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.customer.Customer"

-                classes="supplychain.customer.OSGiCustomerImpl" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent1/Retailer" />

-        

-        <reference name="retailer2" target="RetailerComponent2/Retailer" />

-        

-        <reference name="retailer3" target="RetailerComponent3/Retailer" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent2"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-

-

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-    

-   

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
deleted file mode 100644
index 953045fefa..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
+++ /dev/null
@@ -1,151 +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:xsd="http://www.w3.org/2001/XMLSchema"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent1/Retailer" />

-        

-        <reference name="retailer2" target="RetailerComponent2/Retailer" />

-        

-        <reference name="retailer3" target="RetailerComponent3/Retailer" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-            

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-    

-    <component name="WarehouseComponent1">

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.warehouse.Warehouse" >

-                

-            <properties reference="shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-

-

-    <component name="WarehouseComponent2">

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.warehouse.Warehouse" >

-                

-            <properties reference="shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-    

-   

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
deleted file mode 100644
index c621d9aca0..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
+++ /dev/null
@@ -1,31 +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="OSGiHelloWorld">

-        <interface.java interface="helloworld.HelloWorld"/>

-    </service>

-    

-    

-    <reference name="helloWorldWS" >

-        <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" / -->

-        <interface.java interface="helloworld.ws.HelloWorld" />

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
deleted file mode 100644
index 6d3f853382..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
+++ /dev/null
@@ -1,80 +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.    

--->

-<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-	name="helloworld">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-            

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

-                <wsdlsoap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

-                <wsdlsoap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService"/>

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
deleted file mode 100644
index d545c844d2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
+++ /dev/null
@@ -1,51 +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"

-           name="HelloWorld">

-

-    <service name="helloWorld" promote="HelloWorldService">

-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-        <!-- interface.java interface="helloworld.ws.HelloWorld" / -->

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>

-    </service>

-

-    <component name="HelloWorldService">

-        <implementation.java class="helloworld.ws.HelloWorldService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <!--implementation.java class="helloworld.HelloWorldComponent"/-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="helloworld.HelloWorld"

-        />

-        

-        <service name="OSGiHelloWorld"/>

-        

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-        <!-- interface.java interface="helloworld.ws.HelloWorld" / -->

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>

-    </reference>

-

-</composite>