summaryrefslogtreecommitdiffstats
path: root/branches/sca-android/modules/core
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--branches/sca-android/modules/assembly-xml/DISCLAIMER (renamed from branches/sca-android/modules/core-android/DISCLAIMER)0
-rw-r--r--branches/sca-android/modules/assembly-xml/LICENSE (renamed from branches/sca-android/modules/core-android/LICENSE)0
-rw-r--r--branches/sca-android/modules/assembly-xml/NOTICE (renamed from branches/sca-android/modules/core-android/NOTICE)0
-rw-r--r--branches/sca-android/modules/core-android/.classpath25
-rw-r--r--branches/sca-android/modules/core-android/.project23
-rw-r--r--branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java63
-rw-r--r--branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java182
-rw-r--r--branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java228
-rw-r--r--branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java74
-rw-r--r--branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java168
-rw-r--r--branches/sca-android/modules/core-spi/DISCLAIMER (renamed from branches/sca-android/modules/tuscany-assembly-xml/DISCLAIMER)0
-rw-r--r--branches/sca-android/modules/core-spi/LICENSE (renamed from branches/sca-android/modules/tuscany-assembly-xml/LICENSE)0
-rw-r--r--branches/sca-android/modules/core-spi/NOTICE (renamed from branches/sca-android/modules/tuscany-assembly-xml/NOTICE)0
-rw-r--r--branches/sca-android/modules/core-spi/pom.xml (renamed from branches/sca-android/modules/tuscany-core-spi/pom.xml)0
-rw-r--r--branches/sca-android/modules/core-spi/src/doc/Context Model.emx (renamed from branches/sca-android/modules/tuscany-core-spi/src/doc/Context Model.emx)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint)0
-rw-r--r--branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint (renamed from branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint)0
-rw-r--r--branches/sca-android/modules/core/DISCLAIMER (renamed from branches/sca-android/modules/tuscany-assembly/DISCLAIMER)0
-rw-r--r--branches/sca-android/modules/core/LICENSE (renamed from branches/sca-android/modules/tuscany-assembly/LICENSE)0
-rw-r--r--branches/sca-android/modules/core/NOTICE (renamed from branches/sca-android/modules/tuscany-assembly/NOTICE)0
-rw-r--r--branches/sca-android/modules/core/pom.xml (renamed from branches/sca-android/modules/core-android/pom.xml)0
-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
-rw-r--r--branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java (renamed from branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java)0
-rw-r--r--branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java (renamed from branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java)0
-rw-r--r--branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java (renamed from branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java)0
-rw-r--r--branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java (renamed from branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java)0
-rw-r--r--branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java (renamed from branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java)0
-rw-r--r--branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java (renamed from branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java)0
-rw-r--r--branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java (renamed from branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java)0
-rw-r--r--branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java (renamed from branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java)0
-rw-r--r--branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java (renamed from branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java)0
-rw-r--r--branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java (renamed from branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java)0
-rw-r--r--branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java (renamed from branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java)0
-rw-r--r--branches/sca-android/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest (renamed from branches/sca-android/modules/core-android/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest)0
172 files changed, 0 insertions, 763 deletions
diff --git a/branches/sca-android/modules/core-android/DISCLAIMER b/branches/sca-android/modules/assembly-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android/modules/core-android/DISCLAIMER
+++ b/branches/sca-android/modules/assembly-xml/DISCLAIMER
diff --git a/branches/sca-android/modules/core-android/LICENSE b/branches/sca-android/modules/assembly-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/core-android/LICENSE
+++ b/branches/sca-android/modules/assembly-xml/LICENSE
diff --git a/branches/sca-android/modules/core-android/NOTICE b/branches/sca-android/modules/assembly-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/core-android/NOTICE
+++ b/branches/sca-android/modules/assembly-xml/NOTICE
diff --git a/branches/sca-android/modules/core-android/.classpath b/branches/sca-android/modules/core-android/.classpath
deleted file mode 100644
index a25189936b..0000000000
--- a/branches/sca-android/modules/core-android/.classpath
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.2/junit-4.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-commonj_1.1_spec/1.0/geronimo-commonj_1.1_spec-1.0.jar"/>
- <classpathentry kind="src" path="/tuscany-contribution"/>
- <classpathentry kind="src" path="/tuscany-assembly"/>
- <classpathentry kind="src" path="/tuscany-extensibility"/>
- <classpathentry kind="src" path="/tuscany-interface"/>
- <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/>
- <classpathentry kind="src" path="/tuscany-contribution-java"/>
- <classpathentry kind="src" path="/tuscany-core-spi"/>
- <classpathentry kind="src" path="/tuscany-sca-api"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.1/wstx-asl-3.2.1.jar"/>
- <classpathentry kind="src" path="/tuscany-interface-java"/>
- <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Android"/>
- <classpathentry combineaccessrules="false" kind="src" path="/tuscany-policy"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/branches/sca-android/modules/core-android/.project b/branches/sca-android/modules/core-android/.project
deleted file mode 100644
index 1678b1e753..0000000000
--- a/branches/sca-android/modules/core-android/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<projectDescription>
- <name>tuscany-core</name>
- <comment>Parent POM defining settings that can be used across Tuscany</comment>
- <projects>
- <project>tuscany-contribution</project>
- <project>tuscany-assembly</project>
- <project>tuscany-policy</project>
- <project>tuscany-extensibility</project>
- <project>tuscany-interface</project>
- <project>tuscany-contribution-java</project>
- <project>tuscany-core-spi</project>
- <project>tuscany-sca-api</project>
- <project>tuscany-interface-java</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription> \ No newline at end of file
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/tuscany-assembly-xml/DISCLAIMER b/branches/sca-android/modules/core-spi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/DISCLAIMER
+++ b/branches/sca-android/modules/core-spi/DISCLAIMER
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/LICENSE b/branches/sca-android/modules/core-spi/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/LICENSE
+++ b/branches/sca-android/modules/core-spi/LICENSE
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/NOTICE b/branches/sca-android/modules/core-spi/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/NOTICE
+++ b/branches/sca-android/modules/core-spi/NOTICE
diff --git a/branches/sca-android/modules/tuscany-core-spi/pom.xml b/branches/sca-android/modules/core-spi/pom.xml
index 72cfbe7a7c..72cfbe7a7c 100644
--- a/branches/sca-android/modules/tuscany-core-spi/pom.xml
+++ b/branches/sca-android/modules/core-spi/pom.xml
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/doc/Context Model.emx b/branches/sca-android/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/doc/Context Model.emx
+++ b/branches/sca-android/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index 93fc219903..93fc219903 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index 822c9ccd84..822c9ccd84 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index 8cd0978ff0..8cd0978ff0 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
index fc8119578c..fc8119578c 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index 5435255708..5435255708 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index efc2f80dc7..efc2f80dc7 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index 537c9d69d8..537c9d69d8 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index 1893dc57cc..1893dc57cc 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
index 0aa922afa0..0aa922afa0 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
index 00f6961235..00f6961235 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
index 4a204efdd1..4a204efdd1 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
index e540ef683e..e540ef683e 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
index 177dcfbb77..177dcfbb77 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
index dec01a119b..dec01a119b 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5d6daab23..a5d6daab23 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index 37d15a8704..37d15a8704 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 95efa3d259..95efa3d259 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index b28f6ad483..b28f6ad483 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index 9a452b5d54..9a452b5d54 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
index 82b994577f..82b994577f 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 49bceac82b..49bceac82b 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 900450f206..900450f206 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 371f9c9af2..371f9c9af2 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
index 4cca3b1e32..4cca3b1e32 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index a9f86c45ca..a9f86c45ca 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 084056278c..084056278c 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
index 7e798549b3..7e798549b3 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
index b7306e48dd..b7306e48dd 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
index d7e4fee1d9..d7e4fee1d9 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index e0c03b3db1..e0c03b3db1 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index 63c8cc162b..63c8cc162b 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index d0a1b53563..d0a1b53563 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
index b85d19ba9a..b85d19ba9a 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
index 9be99c389c..9be99c389c 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
index 4d91480295..4d91480295 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index db08098ae8..db08098ae8 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index fb58c72262..fb58c72262 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
index 0e7a1ce103..0e7a1ce103 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
index b4ec354988..b4ec354988 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index f640d9a227..f640d9a227 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index f10c6c6e5d..f10c6c6e5d 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index f30c92452b..f30c92452b 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 002bc90010..002bc90010 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index 104a490fa4..104a490fa4 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index a828995c5a..a828995c5a 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 30630cc2af..30630cc2af 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
index 465b385d57..465b385d57 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
index 728faf5d0c..728faf5d0c 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
index 45bce4d8fb..45bce4d8fb 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
index 24f8c1a8fd..24f8c1a8fd 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
index 8798f31138..8798f31138 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
index 7cbf4c5ea6..7cbf4c5ea6 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
index 9e05090845..9e05090845 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
index 024c3af2f0..024c3af2f0 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
index e9de1f135f..e9de1f135f 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint b/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
index 2f700671ca..2f700671ca 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
+++ b/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
index 95591dca5d..95591dca5d 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/branches/sca-android/modules/tuscany-assembly/DISCLAIMER b/branches/sca-android/modules/core/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android/modules/tuscany-assembly/DISCLAIMER
+++ b/branches/sca-android/modules/core/DISCLAIMER
diff --git a/branches/sca-android/modules/tuscany-assembly/LICENSE b/branches/sca-android/modules/core/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/tuscany-assembly/LICENSE
+++ b/branches/sca-android/modules/core/LICENSE
diff --git a/branches/sca-android/modules/tuscany-assembly/NOTICE b/branches/sca-android/modules/core/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/tuscany-assembly/NOTICE
+++ b/branches/sca-android/modules/core/NOTICE
diff --git a/branches/sca-android/modules/core-android/pom.xml b/branches/sca-android/modules/core/pom.xml
index 0d0ee2c606..0d0ee2c606 100644
--- a/branches/sca-android/modules/core-android/pom.xml
+++ b/branches/sca-android/modules/core/pom.xml
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
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
index b3d1d42ed3..b3d1d42ed3 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
index d4cc0e64d8..d4cc0e64d8 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
index 13f5c14c77..13f5c14c77 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
index b8a9d5a591..b8a9d5a591 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
index a309ac4b15..a309ac4b15 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
index 5601d18746..5601d18746 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
index 3725ce74b0..3725ce74b0 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
index 424f12800f..424f12800f 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
index 120fe861c8..120fe861c8 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
index 971d9493c8..971d9493c8 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index 504313921c..504313921c 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/branches/sca-android/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
index 1f2218aba8..1f2218aba8 100644
--- a/branches/sca-android/modules/core-android/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ b/branches/sca-android/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest