summaryrefslogtreecommitdiffstats
path: root/branches/sca-android/modules/core/src/main
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java (renamed from branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java)0
-rw-r--r--branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler (renamed from branches/sca-android/modules/core-android/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler)0
84 files changed, 0 insertions, 0 deletions
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
diff --git a/branches/sca-android/modules/core-android/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 56e99be0f2..56e99be0f2 100644
--- a/branches/sca-android/modules/core-android/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler