Renamed modules to match the structure in r643746 and make it possible to create a patch on top of that revision.

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

88 files changed, 0 insertions, 715 deletions

diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java b/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
deleted file mode 100644
index 982b2a0492..0000000000
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package org.apache.tuscany.sca.core.work;

-

-/*

- * JCA work wrapper.

- */

-public class Jsr237Work<T extends Runnable> implements commonj.work.Work {

-

-    // Work that is being executed.

-    private T work;

-

-    /*

-     * Initializes the work instance.

-     */

-    public Jsr237Work(T work) {

-        this.work = work;

-    }

-

-    /*

-     * Returns the completed work.

-     */

-    public T getWork() {

-        return work;

-    }

-

-    /*

-     * Release the work.

-     */

-    public void release() {

-    }

-

-    /*

-     * Work attributes are not daemon.

-     */

-    public boolean isDaemon() {

-        return false;

-    }

-

-    /*

-     * Runs the work.

-     */

-    public void run() {

-        work.run();

-    }

-}
\ No newline at end of file
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java b/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
deleted file mode 100644
index ec47d8ac07..0000000000
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
+++ /dev/null
@@ -1,182 +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 org.apache.tuscany.sca.core.work;

-

-/*import javax.naming.InitialContext;

-import javax.naming.NamingException;*/

-

-import org.apache.tuscany.sca.work.NotificationListener;

-import org.apache.tuscany.sca.work.WorkScheduler;

-import org.apache.tuscany.sca.work.WorkSchedulerException;

-

-import commonj.work.WorkEvent;

-import commonj.work.WorkListener;

-import commonj.work.WorkManager;

-

-/**

- * A work scheduler implementation based on a JSR 237 work manager.

- * <p/>

- * <p/>

- * This needs a JSR 237 work manager implementation available for scheduling work. Instances can be configured with a

- * work manager implementation that is injected in. It is the responsibility of the runtime environment to make a work

- * manager implementation available. For example, if the managed environment supports work manager the runtime can use

- * the appropriate lookup mechanism to inject the work manager implementation. </p>

- */

-public class Jsr237WorkScheduler implements WorkScheduler {

-

-    /**

-     * Underlying JSR-237 work manager

-     */

-    private WorkManager jsr237WorkManager;

-

-    /**

-     * Initializes the JSR 237 work manager.

-     *

-     * @param jsr237WorkManager JSR 237 work manager.

-     */

-    public Jsr237WorkScheduler() {

-        

-    	/*

-    	try {

-            InitialContext ctx  = new InitialContext();

-            jsr237WorkManager = (WorkManager) ctx.lookup("java:comp/env/wm/TuscanyWorkManager");

-        } catch (NamingException e) {

-            // ignore

-        }*/

-        

-        if (jsr237WorkManager == null) {

-            jsr237WorkManager = new ThreadPoolWorkManager(10);

-        }

-    }

-

-    /**

-     * Schedules a unit of work for future execution. The notification listener is used to register interest in

-     * callbacks regarding the status of the work.

-     *

-     * @param work The unit of work that needs to be asynchronously executed.

-     */

-    public <T extends Runnable> void scheduleWork(T work) {

-        scheduleWork(work, null);

-    }

-

-    /**

-     * Schedules a unit of work for future execution. The notification listener is used to register interest in

-     * callbacks regarding the status of the work.

-     *

-     * @param work     The unit of work that needs to be asynchronously executed.

-     * @param listener Notification listener for callbacks.

-     */

-    public <T extends Runnable> void scheduleWork(T work, NotificationListener<T> listener) {

-

-        if (work == null) {

-            throw new IllegalArgumentException("Work cannot be null");

-        }

-

-        Jsr237Work<T> jsr237Work = new Jsr237Work<T>(work);

-        try {

-            if (listener == null) {

-                jsr237WorkManager.schedule(jsr237Work);

-            } else {

-                Jsr237WorkListener<T> jsr237WorkListener = new Jsr237WorkListener<T>(listener, work);

-                jsr237WorkManager.schedule(jsr237Work, jsr237WorkListener);

-            }

-        } catch (IllegalArgumentException ex) {

-            if (listener != null) {

-                listener.workRejected(work);

-            } else {

-                throw new WorkSchedulerException(ex);

-            }

-        } catch (Exception ex) {

-            throw new WorkSchedulerException(ex);

-        }

-

-    }

-

-    public void destroy() {

-        if (jsr237WorkManager instanceof ThreadPoolWorkManager) {

-            ((ThreadPoolWorkManager)jsr237WorkManager).destroy();

-        }

-    }

-

-    /*

-     * WorkListener for keeping track of work status callbacks.

-     *

-     */

-    private class Jsr237WorkListener<T extends Runnable> implements WorkListener {

-

-        // Notification listener

-        private NotificationListener<T> listener;

-

-        // Work

-        private T work;

-

-        /*

-        * Initializes the notification listener.

-        */

-        public Jsr237WorkListener(NotificationListener<T> listener, T work) {

-            this.listener = listener;

-            this.work = work;

-        }

-

-        /*

-         * Callback when the work is accepted.

-         */

-        public void workAccepted(WorkEvent workEvent) {

-            T work = getWork();

-            listener.workAccepted(work);

-        }

-

-        /*

-         * Callback when the work is rejected.

-         */

-        public void workRejected(WorkEvent workEvent) {

-            T work = getWork();

-            listener.workRejected(work);

-        }

-

-        /*

-         * Callback when the work is started.

-         */

-        public void workStarted(WorkEvent workEvent) {

-            T work = getWork();

-            listener.workStarted(work);

-        }

-

-        /*

-         * Callback when the work is completed.

-         */

-        public void workCompleted(WorkEvent workEvent) {

-            T work = getWork();

-            Exception exception = workEvent.getException();

-            if (exception != null) {

-                listener.workFailed(work, exception);

-            } else {

-                listener.workCompleted(work);

-            }

-        }

-

-        /*

-        * Gets the underlying work from the work event.

-        */

-        private T getWork() {

-            return work;

-        }

-

-    }

-}

diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
deleted file mode 100644
index 5731ac5697..0000000000
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ /dev/null
@@ -1,228 +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 org.apache.tuscany.sca.core.work;

-

-//import java.rmi.server.UID;

-import java.util.Collection;

-import java.util.Map;

-import java.util.concurrent.ConcurrentHashMap;

-import java.util.concurrent.ExecutorService;

-import java.util.concurrent.Executors;

-import java.util.concurrent.RejectedExecutionException;

-import java.util.concurrent.ThreadFactory;

-

-import org.osoa.sca.annotations.Destroy;

-

-import commonj.work.Work;

-import commonj.work.WorkEvent;

-import commonj.work.WorkException;

-import commonj.work.WorkItem;

-import commonj.work.WorkListener;

-import commonj.work.WorkManager;

-

-/**

- * A thread-pool based implementation for the JSR-237 work manager.

- * <p/>

- * <p/>

- * This implementation supports only local work.

- * <p/>

- * TODO Elaborate the implementation. </p>

- */

-public class ThreadPoolWorkManager implements WorkManager {

-

-    // Map of work items currently handled by the work manager

-    private Map<WorkItemImpl, WorkListener> workItems = new ConcurrentHashMap<WorkItemImpl, WorkListener>();

-

-    // Thread-pool

-    private ExecutorService executor;

-

-    /**

-     * Initializes the thread-pool.

-     *

-     * @param threadPoolSize Thread-pool size.

-     */

-    public ThreadPoolWorkManager(int threadPoolSize) {

-        

-        // Creates a new Executor, use a custom ThreadFactory that

-        // creates daemon threads.

-        executor = Executors.newFixedThreadPool(threadPoolSize, new ThreadFactory() {

-            public Thread newThread(Runnable r) {

-                Thread thread = new Thread(r);

-                thread.setDaemon(true);

-                return thread;

-            }

-        });

-    }

-

-    /**

-     * Schedules a unit of work asynchronously.

-     *

-     * @param work Work that needs to be scheduled.

-     * @return Work Work item representing the asynchronous work

-     */

-    public WorkItem schedule(Work work) throws IllegalArgumentException {

-        return schedule(work, null);

-    }

-

-    /**

-     * Schedules a unit of work asynchronously.

-     *

-     * @param work         Work that needs to be scheduled.

-     * @param workListener Work listener for callbacks.

-     * @return Work Work item representing the asynchronous work

-     */

-    public WorkItem schedule(Work work, WorkListener workListener) throws IllegalArgumentException {

-

-        WorkItemImpl workItem = new WorkItemImpl(null/*new UID().toString()*/, work);

-        if (workListener != null) {

-            workItems.put(workItem, workListener);

-        }

-        workAccepted(workItem, work);

-        if (scheduleWork(work, workItem)) {

-            return workItem;

-        } else {

-            workItem.setStatus(WorkEvent.WORK_REJECTED);

-            if (workListener != null) {

-                workListener.workRejected(new WorkEventImpl(workItem));

-            }

-            throw new IllegalArgumentException("Unable to schedule work");

-        }

-    }

-

-    /**

-     * Wait for all the specified units of work to finish.

-     *

-     * @param works   Units of the work that need to finish.

-     * @param timeout Timeout for waiting for the units of work to finish.

-     */

-    public boolean waitForAll(Collection works, long timeout) {

-        throw new UnsupportedOperationException("waitForAll not supported");

-    }

-

-    /**

-     * Wait for any of the specified units of work to finish.

-     *

-     * @param works   Units of the work that need to finish.

-     * @param timeout Timeout for waiting for the units of work to finish.

-     */

-    public Collection waitForAny(Collection works, long timeout) {

-        throw new UnsupportedOperationException("waitForAny not supported");

-    }

-

-    /**

-     * Method provided for subclasses to indicate a work acceptance.

-     *

-     * @param workItem Work item representing the work that was accepted.

-     * @param work     Work that was accepted.

-     */

-    private void workAccepted(final WorkItemImpl workItem, final Work work) {

-        WorkListener listener = workItems.get(workItem);

-        if (listener != null) {

-            workItem.setStatus(WorkEvent.WORK_ACCEPTED);

-            WorkEvent event = new WorkEventImpl(workItem);

-            listener.workAccepted(event);

-        }

-    }

-

-    /*

-     * Method to indicate a work start.

-     */

-    private void workStarted(final WorkItemImpl workItem, final Work work) {

-        WorkListener listener = workItems.get(workItem);

-        if (listener != null) {

-            workItem.setStatus(WorkEvent.WORK_STARTED);

-            WorkEvent event = new WorkEventImpl(workItem);

-            listener.workStarted(event);

-        }

-    }

-

-    /*

-     * Method to indicate a work completion.

-     */

-    private void workCompleted(final WorkItemImpl workItem, final Work work) {

-        workCompleted(workItem, work, null);

-    }

-

-    /*

-     * Method to indicate a work completion.

-     */

-    private void workCompleted(final WorkItemImpl workItem, final Work work, final WorkException exception) {

-        WorkListener listener = workItems.get(workItem);

-        if (listener != null) {

-            workItem.setStatus(WorkEvent.WORK_COMPLETED);

-            workItem.setResult(work);

-            workItem.setException(exception);

-            WorkEvent event = new WorkEventImpl(workItem);

-            listener.workCompleted(event);

-            workItems.remove(workItem);

-        }

-    }

-

-    /*

-     * Schedules the work using the ThreadPool.

-     */

-    private boolean scheduleWork(final Work work, final WorkItemImpl workItem) {

-        try {

-            executor.execute(new DecoratingWork(workItem, work));

-            return true;

-        } catch (RejectedExecutionException ex) {

-            return false;

-        }

-    }

-

-    /*

-     * Class that decorates the original worker so that it can get callbacks when work is done.

-     */

-    private final class DecoratingWork implements Runnable {

-

-        // Work item for this work.

-        private WorkItemImpl workItem;

-

-        // The original work.

-        private Work decoratedWork;

-

-        /*

-         * Initializes the work item and underlying work.

-         */

-        private DecoratingWork(final WorkItemImpl workItem, final Work decoratedWork) {

-            this.workItem = workItem;

-            this.decoratedWork = decoratedWork;

-        }

-

-        /*

-         * Overrides the run method.

-         */

-        public void run() {

-            workStarted(workItem, decoratedWork);

-            try {

-                decoratedWork.run();

-                workCompleted(workItem, decoratedWork);

-            } catch (Throwable th) {

-                workCompleted(workItem, decoratedWork, new WorkException(th.getMessage(), th));

-            }

-        }

-

-    }

-

-    @Destroy

-    public void destroy() {

-        executor.shutdown();

-    }

-

-}

diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java b/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
deleted file mode 100644
index 761f682c75..0000000000
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
+++ /dev/null
@@ -1,74 +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 org.apache.tuscany.sca.core.work;

-

-

-import commonj.work.WorkEvent;

-import commonj.work.WorkException;

-import commonj.work.WorkItem;

-

-/**

- * Default immutable implementation of the <code>WorkEvent</code> class.

- */

-class WorkEventImpl implements WorkEvent {

-    

-    // Work item for this event

-    private WorkItem workItem;

-

-    // Exception if something has gone wrong

-    private WorkException exception;

-

-    /**

-     * Instantiates the event.

-     *

-     * @param workItem Work item for this event.

-     */

-    public WorkEventImpl(final WorkItemImpl workItem) {

-        this.workItem = workItem;

-        this.exception = workItem.getException();

-    }

-

-    /**

-     * Returns the work type based on whether the work was accepted, started,

-     * rejected or completed.

-     *

-     * @return Work type.

-     */

-    public int getType() {

-        return workItem.getStatus();

-    }

-

-    /**

-     * Returns the work item associated with this work type.

-     *

-     * @return Work item.

-     */

-    public WorkItem getWorkItem() {

-        return workItem;

-    }

-

-    /**

-     * Returns the exception if the work completed with an exception.

-     *

-     * @return Work exception.

-     */

-    public WorkException getException() {

-        return exception;

-    }

-}

diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java b/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
deleted file mode 100644
index afa496435f..0000000000
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
+++ /dev/null
@@ -1,168 +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 org.apache.tuscany.sca.core.work;

-

-import commonj.work.Work;

-import commonj.work.WorkException;

-import commonj.work.WorkItem;

-

-/**

- * An identity based immutable implementation of the <code>WorkItem</code>

- * interface.

- *

- */

-class WorkItemImpl implements WorkItem {

-    

-    // Id scoped for the VM

-    private String id;

-

-    // Status

-    private int status = -1;

-

-    // Result

-    private Work result;

-    

-    // Original work

-    private Work originalWork;

-

-    // Exception

-    private WorkException exception;

-

-    /**

-     * Instantiates an id for this item.

-     *

-     * @param id of this work event.

-     */

-    protected WorkItemImpl(final String id, final Work orginalWork) {

-        this.id = id;

-        this.originalWork = orginalWork;

-    }

-

-    /**

-     * Returns the id.

-     *

-     * @return Id of this item.

-     */

-    public String getId() {

-        return id;

-    }

-

-    /**

-     * Returns the original work.

-     *

-     * @return Original work.

-     */

-    public Work getOriginalWork() {

-        return originalWork;

-    }

-

-    /**

-     * Returns the work result if the work completed.

-     *

-     * @return Work.

-     * @throws WorkException If the work completed with an exception.

-     */

-    public Work getResult() {

-        return result;

-    }

-

-    /**

-     * Sets the result.

-     *

-     * @param result Result.

-     */

-    protected void setResult(final Work result) {

-        this.result = result;

-    }

-

-    /**

-     * Returns the exception if work completed with an exception.

-     *

-     * @return Work exception.

-     */

-    protected WorkException getException() {

-        return exception;

-    }

-

-    /**

-     * Sets the exception.

-     *

-     * @param exception Exception.

-     */

-    protected void setException(final WorkException exception) {

-        this.exception = exception;

-    }

-

-    /**

-     * Returns the work type based on whether the work was accepted, started,

-     * rejected or completed.

-     *

-     * @return Work status.

-     */

-    public int getStatus() {

-        return status;

-    }

-

-    /**

-     * Sets the status.

-     *

-     * @param status Status.

-     */

-    protected void setStatus(final int status) {

-        this.status = status;

-    }

-

-    /**

-     * @see Object#hashCode() 

-     */

-    @Override

-    public int hashCode() {

-        return id.hashCode();

-    }

-

-    /**

-     * Indicates whether some other object is "equal to" this one.

-     *

-     * @param obj Object to be compared.

-     * @return true if this object is the same as the obj argument; false

-     *         otherwise..

-     */

-    @Override

-    public boolean equals(final Object obj) {

-        return (obj != null) && (obj.getClass() == WorkItemImpl.class) && ((WorkItemImpl) obj).id.equals(id);

-    }

-

-    /**

-     * Compares this object with the specified object for order. Returns a

-     * negative integer, zero, or a positive integer as this object is less

-     * than, equal to, or greater than the specified object.

-     *

-     * @param o Object to be compared.

-     * @return A negative integer, zero, or a positive integer as this object

-     *         is less than, equal to, or greater than the specified object.

-     * @throws ClassCastException needs better documentation.

-     */

-    public int compareTo(final Object o) {

-        if (o.getClass() != WorkItemImpl.class) {

-            throw new ClassCastException(o.getClass().getName());

-        } else {

-            return ((WorkItemImpl) o).getId().compareTo(getId());

-        }

-    }

-}

diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
index 1e68564d1d..1e68564d1d 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
index a96abce839..a96abce839 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
index f730b2ff71..f730b2ff71 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
index 2d7cfefd16..2d7cfefd16 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
index 7087df2a42..7087df2a42 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
index e500e8ee20..e500e8ee20 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index 5d7eab26fa..5d7eab26fa 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
index 68312e50f4..68312e50f4 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
index f8c80135c8..f8c80135c8 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
index 0393d31d61..0393d31d61 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
index bd8f5e0aa1..bd8f5e0aa1 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
index 7019c8c7d3..7019c8c7d3 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
index bcf9a366c6..bcf9a366c6 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
index 9a94d6dff8..9a94d6dff8 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index d0fc6c969f..d0fc6c969f 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
index 217e327184..217e327184 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
index 08e69230da..08e69230da 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
index fde3831cdf..fde3831cdf 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
index a238ce3d4e..a238ce3d4e 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
index 36a6dbcc5f..36a6dbcc5f 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
index a262f311ef..a262f311ef 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
index 7d37ed496e..7d37ed496e 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
index f9702abced..f9702abced 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
index 5b347166b5..5b347166b5 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
index 936717d7fd..936717d7fd 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
index 7770c9133b..7770c9133b 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
index 195971dc8f..195971dc8f 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
index 99ec0d2bef..99ec0d2bef 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
index c80dc19676..c80dc19676 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
index 4bbadff869..4bbadff869 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
index 100bf05d32..100bf05d32 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
index 56df7d10a9..56df7d10a9 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
index bacd652402..bacd652402 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index da8ce41ce7..da8ce41ce7 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 9b5e564081..9b5e564081 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 96ce410539..96ce410539 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index 40ee01a434..40ee01a434 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
index dfc3dcc95d..dfc3dcc95d 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index 3ccd357db7..3ccd357db7 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index e41b18c290..e41b18c290 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index c201b37a51..c201b37a51 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index 3fa636ed26..3fa636ed26 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index a5f9cdc84a..a5f9cdc84a 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
index 5c9ae8c706..5c9ae8c706 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index 4bc18fe80a..4bc18fe80a 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index 3dfc435e00..3dfc435e00 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
index 4380dc18ab..4380dc18ab 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
index 786e91a788..786e91a788 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
index fb476c3c7b..fb476c3c7b 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
index eca2279024..eca2279024 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index e98c6ac9a8..e98c6ac9a8 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
index 50b4b59d73..50b4b59d73 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
index 8e8a89c963..8e8a89c963 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index b7cfb2c4c9..b7cfb2c4c9 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index cd59fdb0aa..cd59fdb0aa 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index 20ea4ca379..20ea4ca379 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index 7ca30718b5..7ca30718b5 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
index 00bf9c831e..00bf9c831e 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index d5085289e9..d5085289e9 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index d6ce9b4582..d6ce9b4582 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index 3e981556dc..3e981556dc 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
index cad9279e5c..cad9279e5c 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
index c9693761e8..c9693761e8 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
index 55244932c5..55244932c5 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
index 487d2874b0..487d2874b0 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
index 62f1e3fb79..62f1e3fb79 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
index c42700c9a6..c42700c9a6 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
index 761430597c..761430597c 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
index c2a3172fe2..c2a3172fe2 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 1c72359e58..1c72359e58 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index ea91c5973c..ea91c5973c 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index e5f23f9a0a..e5f23f9a0a 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 6ec5667cb1..6ec5667cb1 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
index 6c25dbd2d4..6c25dbd2d4 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 8708c6e11e..8708c6e11e 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c533822952..c533822952 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
index f785647683..f785647683 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
index 7507248b32..7507248b32 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index a3c4e7ee1a..a3c4e7ee1a 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 29f43ed861..29f43ed861 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index b8b1d6bbe3..b8b1d6bbe3 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index d669711c40..d669711c40 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
index bed8f14cdc..bed8f14cdc 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java