diff options
Diffstat (limited to '')
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java (renamed from branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator (renamed from branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager (renamed from branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint (renamed from branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry (renamed from branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory (renamed from branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler (renamed from branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java (renamed from branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-equinox/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest (renamed from branches/sca-equinox/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest) | 0 |
104 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java index c86c876075..c86c876075 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java index 29dcc20f0b..29dcc20f0b 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java index 61f1f6494c..61f1f6494c 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java index 78096b20ab..78096b20ab 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java index c25c580fe6..c25c580fe6 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java index c3e5a12189..c3e5a12189 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java index 14a5f565fc..14a5f565fc 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java index b174dea6ce..b174dea6ce 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java index 32ac611e54..32ac611e54 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java index b386495a08..b386495a08 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java index af5230a163..af5230a163 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java index 58109fd86b..58109fd86b 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java index fc6d7abf6a..fc6d7abf6a 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java index 78b0887482..78b0887482 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java index 2bcf13f679..2bcf13f679 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java index c5b68389b2..c5b68389b2 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java index b577180291..b577180291 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java index aa69bb3ae5..aa69bb3ae5 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java index 1d178421cf..1d178421cf 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java index efa362a929..efa362a929 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java index 28e22b4f2c..28e22b4f2c 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java index 8a883f8e15..8a883f8e15 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java index 692d6861ba..692d6861ba 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java index 03c18c26b8..03c18c26b8 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java index 0bf66b2817..0bf66b2817 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java index d35b27fd24..d35b27fd24 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java index 3f64d2405b..3f64d2405b 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java index 588c43b8b1..588c43b8b1 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java index d19aa237cd..d19aa237cd 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java index 97c69c33cb..97c69c33cb 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java index b5b40811ad..b5b40811ad 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java index 2b37c30451..2b37c30451 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java index 15c4d50901..15c4d50901 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java index 6e93947dfb..6e93947dfb 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java index fcb48259b9..fcb48259b9 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java index 934f2f7aa0..934f2f7aa0 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java index c26501e7d7..c26501e7d7 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java index cade0499d3..cade0499d3 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java index a23b9af9ad..a23b9af9ad 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java index 0992638318..0992638318 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java index 6e182a6a14..6e182a6a14 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java index 7d7fc583c3..7d7fc583c3 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java index 733544d387..733544d387 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java index 60f90fb6b5..60f90fb6b5 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java index 94d67bffcc..94d67bffcc 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java index fc4bea3d9f..fc4bea3d9f 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java index 0b36b178f3..0b36b178f3 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java index cb836e42c1..cb836e42c1 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java index 875a252798..875a252798 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java index c007669bdf..c007669bdf 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java index 2c4d657882..2c4d657882 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java index 504bd9b036..504bd9b036 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java index 246f9c45d6..246f9c45d6 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java index ff92aa00a8..ff92aa00a8 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java index 7e7ab7a9e4..7e7ab7a9e4 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java index 786988613b..786988613b 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java index dc5d9ea8fe..dc5d9ea8fe 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java index 6263cf6313..6263cf6313 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java index 4d4b324e05..4d4b324e05 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java index c359f04ae0..c359f04ae0 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java index 49f89661b1..49f89661b1 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java index c6fd9ec067..c6fd9ec067 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java index 1cfb6b06a4..1cfb6b06a4 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java index 0a20d793f7..0a20d793f7 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java index 0f82e5e864..0f82e5e864 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java index b19c14b3e0..b19c14b3e0 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java index 842ed4c547..842ed4c547 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java index 75261e11a8..75261e11a8 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java index 85a6626cdd..85a6626cdd 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java index c27b112f8a..c27b112f8a 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java index a2c0edb9b4..a2c0edb9b4 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java index 0471b2c52e..0471b2c52e 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java index 0f83dad97d..0f83dad97d 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java index 15959c0608..15959c0608 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java index bb46a2499b..bb46a2499b 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java index ea8d0e876c..ea8d0e876c 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java index adeb667277..adeb667277 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java index 90c13e6da8..90c13e6da8 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java index fb47a65edf..fb47a65edf 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java index 67d2b66f84..67d2b66f84 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java index 170319b6e6..170319b6e6 100644 --- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor index 5f54178483..5f54178483 100644 --- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator index fc2760f73f..fc2760f73f 100644 --- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager index 898054509b..898054509b 100644 --- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint index af281d8f4d..af281d8f4d 100644 --- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry index a4a0154987..a4a0154987 100644 --- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory index bcbd5b0abf..bcbd5b0abf 100644 --- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler index 56e99be0f2..56e99be0f2 100644 --- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java index d3e31eb570..d3e31eb570 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java index 99d5ec7bc9..99d5ec7bc9 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java index 61164fa2de..61164fa2de 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme index 1aba9656d8..1aba9656d8 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java index 1ad0927d16..1ad0927d16 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme index b8150d4edc..b8150d4edc 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java index 3184c3de92..3184c3de92 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java index 91b45dfbcb..91b45dfbcb 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java index a7617f7a70..a7617f7a70 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java index 75840efef4..75840efef4 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java index 225f23cb93..225f23cb93 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java index ba32a92c18..ba32a92c18 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java index 715f5f95c0..715f5f95c0 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java index 3b30d86f14..3b30d86f14 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java index 341d889b7d..341d889b7d 100644 --- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java diff --git a/branches/sca-equinox/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest index 9ed0928a33..9ed0928a33 100644 --- a/branches/sca-equinox/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest +++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest |