summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl2.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl2.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointReferenceImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointReferenceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl2.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl2.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextExt.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextExt.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ConversationManagerImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ConversationManagerImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ExtendedConversationImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ExtendedConversationImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CachedProxy.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CachedProxy.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainer.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainer.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainerFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainerFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainer.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainer.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainerFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainerFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainer.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainer.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainerFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainerFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java (renamed from branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java)0
86 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
index c86c876075..c86c876075 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
index 939afa40a8..939afa40a8 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index 8d8c9d10e8..8d8c9d10e8 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl2.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl2.java
index de304ac3b5..de304ac3b5 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl2.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl2.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointReferenceImpl.java
index 022cac398a..022cac398a 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointReferenceImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
index 2c833a885e..2c833a885e 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
index 0170af54fc..0170af54fc 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
index 6032005b9a..6032005b9a 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
index dbdba54dc0..dbdba54dc0 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
index 2cbd72f218..2cbd72f218 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl2.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl2.java
index 754f6063cb..754f6063cb 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl2.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl2.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java
index c0217e7336..c0217e7336 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextExt.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextExt.java
index 6db3af213d..6db3af213d 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextExt.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextExt.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java
index 29c4dfd362..29c4dfd362 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index 4e43518738..4e43518738 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
index ace4dc48e1..ace4dc48e1 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
index aa1e1de0f6..aa1e1de0f6 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java
index 205ad6a62c..205ad6a62c 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
index 0b4c33c341..0b4c33c341 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
index 72789b72a1..72789b72a1 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
index 015c80c6fa..015c80c6fa 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
index 8aec07ceda..8aec07ceda 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java
index 9182b080fe..9182b080fe 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
index 425fa3af9c..425fa3af9c 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
index ed858bd499..ed858bd499 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
index 692d6861ba..692d6861ba 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ConversationManagerImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ConversationManagerImpl.java
index e23659b990..e23659b990 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ConversationManagerImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ConversationManagerImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ExtendedConversationImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ExtendedConversationImpl.java
index 34bf8a12d5..34bf8a12d5 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ExtendedConversationImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/impl/ExtendedConversationImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
index 2371897dce..2371897dce 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index d35b27fd24..d35b27fd24 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 3f64d2405b..3f64d2405b 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CachedProxy.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CachedProxy.java
index 8c8f001eb9..8c8f001eb9 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CachedProxy.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CachedProxy.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 8a54b7568f..8a54b7568f 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index 1ee922144f..1ee922144f 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index b949500ab9..b949500ab9 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index 2b37c30451..2b37c30451 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index 4c3bee0dc9..4c3bee0dc9 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index bb212d5869..bb212d5869 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
index 0be6e31b43..0be6e31b43 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 934f2f7aa0..934f2f7aa0 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index 494cb93d97..494cb93d97 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index 0b36b178f3..0b36b178f3 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index a5fabdf0f6..a5fabdf0f6 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index 875a252798..875a252798 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index 831bb62bd8..831bb62bd8 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index 5ae4a24b36..5ae4a24b36 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index 2fc3d6c7eb..2fc3d6c7eb 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java
index 301771d879..301771d879 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
index 3c7fefb674..3c7fefb674 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
index 9a0540915a..9a0540915a 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
index 8ef17503c4..8ef17503c4 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
index dc713353fe..dc713353fe 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
index 6ce2ffca21..6ce2ffca21 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
index e81e5a2f31..e81e5a2f31 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
index 45f4bf52bf..45f4bf52bf 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
index 602958ab5e..602958ab5e 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
index 175f3463ad..175f3463ad 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index 4674456925..4674456925 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
index b6857be97a..b6857be97a 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 0a20d793f7..0a20d793f7 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index 2398ecea3e..2398ecea3e 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index b19c14b3e0..b19c14b3e0 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 842ed4c547..842ed4c547 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 30d5c77181..30d5c77181 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c27b112f8a..c27b112f8a 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index 0f83dad97d..0f83dad97d 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 15959c0608..15959c0608 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index bb46a2499b..bb46a2499b 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index ea8d0e876c..ea8d0e876c 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
index 6763c8117d..6763c8117d 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
index f61e70a598..f61e70a598 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainer.java
index 1ae7bd58e1..1ae7bd58e1 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainer.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainerFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainerFactory.java
index f8ffc027a1..f8ffc027a1 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainer.java
index bfe197255d..bfe197255d 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainer.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainerFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainerFactory.java
index d6aaa4cc84..d6aaa4cc84 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainer.java
index 7519af2341..7519af2341 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainer.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainerFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainerFactory.java
index 9d1cf88d96..9d1cf88d96 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/RequestScopeContainerFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
index f11295c9fa..f11295c9fa 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
index 0639b8885b..0639b8885b 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
index 5bf20a6a5f..5bf20a6a5f 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
index 3df2f7188b..3df2f7188b 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
index 12fa4a485d..12fa4a485d 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
index ca06d0e854..ca06d0e854 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
index 4580011806..4580011806 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
index 0fc104d0fc..0fc104d0fc 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
diff --git a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
index facb2dfe56..facb2dfe56 100644
--- a/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java