svn commit: r399161 [1/7] - in /incubator/tuscany/sandbox/jboynes/sca: ./ bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/mocks/tuscany/ core/src/main/java/org/apache/tuscany/core/async/builder/ core/src/main/java/org/apache/t...

[jb...@apache.org]

Author: jboynes
Date: Tue May  2 23:09:37 2006
New Revision: 399161

URL: http://svn.apache.org/viewcvs?rev=399161&view=rev
Log:
strawman for extracting spi from core

Added:
    incubator/tuscany/sandbox/jboynes/sca/
      - copied from r398535, incubator/tuscany/java/sca/
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContext.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContextFactory.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeManager.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleAtomicContext.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleCompositeContext.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/POJOInstanceContextFactory.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeManager.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ScopeManagerSupport.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/CompositeLoader.java
      - copied unchanged from r397534, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/CompositeLoader.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/SimpleCompositeContextTestCase.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeManagerTestCase.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/doc/
    incubator/tuscany/sandbox/jboynes/sca/model/src/doc/SCA Model.emx
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/AtomicImplementation.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Binding.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/BoundReference.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/BoundService.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Component.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/ComponentType.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/CompositeComponentType.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/CompositeImplementation.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Implementation.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/InteractionScope.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/JavaServiceContract.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/ModelObject.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Multiplicity.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Property.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/PropertyValue.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Reference.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/ReferenceTarget.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Service.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/ServiceContract.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/WSDLServiceContract.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/Wire.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/
    incubator/tuscany/sandbox/jboynes/sca/spi/LICENSE.txt   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/doc/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/doc/Context Model.emx
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/InvalidNameException.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/Lifecycle.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/ObjectFactory.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/QualifiedName.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderConfigException.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/WireBuilder.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/CompositeContext.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Context.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ContextRuntimeException.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/TargetException.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/Event.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/EventFilter.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/EventPublisher.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/RuntimeEventListener.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderContext.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXLoaderRegistry.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Interceptor.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationRuntimeException.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Message.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageChannel.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageHandler.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ProxyCreationException.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/SourceWireFactory.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvoker.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetWireFactory.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireException.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireFactory.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireFactoryFactory.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireFactoryInitException.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java   (with props)
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java   (with props)
Removed:
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderConfigException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ObjectFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ContextRuntimeException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/EventFilter.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/EventPublisher.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InvalidNameException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/QualifiedName.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/RuntimeEventListener.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/TargetException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/Event.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/ObjectCreationException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/Interceptor.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/InvocationConfiguration.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/InvocationRuntimeException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/MessageChannel.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/MessageHandler.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/MethodHashMap.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/ProxyCreationException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/SourceInvocationConfiguration.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/SourceWireFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvocationConfiguration.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetInvoker.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/TargetWireFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/WireConfiguration.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/WireException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactoryFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/WireFactoryInitException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/WireSourceConfiguration.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/WireTargetConfiguration.java
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/ModelRuntimeException.java
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/assembly/
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/types/
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/util/
    incubator/tuscany/sandbox/jboynes/sca/model/src/main/resources/
    incubator/tuscany/sandbox/jboynes/sca/model/src/test/java/
    incubator/tuscany/sandbox/jboynes/sca/model/src/test/resources/
Modified:
    incubator/tuscany/sandbox/jboynes/sca/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/mocks/tuscany/MockEntryPointContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/async/builder/AsyncPolicyBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/async/invocation/AsyncInterceptor.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderInitException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyOrderer.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyOrderer.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyOrderer.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/UnknownTypeException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/system/DefaultPolicyBuilderRegistry.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/system/PolicyBuilderRegistry.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireResolutionException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/CompositeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ContextInitException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/DuplicateNameException.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/Lifecycle.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/AbstractEvent.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleEvent.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionEvent.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/filter/TrueFilter.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractLifecycle.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/CompositeScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/SessionScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/EntryPointBuilderSupport.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceBuilderSupport.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXPropertyFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/MessageFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageFactoryImpl.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/InvokerInterceptor.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageChannelImpl.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageDispatcher.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/NullWireFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/OneWayInterceptor.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/RequestResponseInterceptor.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/service/DefaultWireFactoryService.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/service/WireFactoryService.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/system.module
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/invocation/AsyncInvocationConfigurationTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockHandler.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockStaticInvoker.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockSyncInterceptor.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/QualifiedNameTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockHandler.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockStaticInvoker.java
    incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockSyncInterceptor.java
    incubator/tuscany/sandbox/jboynes/sca/model/pom.xml
    incubator/tuscany/sandbox/jboynes/sca/pom.xml

Modified: incubator/tuscany/sandbox/jboynes/sca/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/mocks/tuscany/MockEntryPointContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/mocks/tuscany/MockEntryPointContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/mocks/tuscany/MockEntryPointContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/mocks/tuscany/MockEntryPointContext.java Tue May  2 23:09:37 2006
@@ -6,6 +6,7 @@
 import org.apache.tuscany.core.context.QualifiedName;
 import org.apache.tuscany.core.context.RuntimeEventListener;
 import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.context.event.Event;
 
 public class MockEntryPointContext implements EntryPointContext {
@@ -68,4 +69,10 @@
 
     }
 
+    public CompositeContext getParent() {
+        return null;
+    }
+
+    public void setParent(CompositeContext parent) {
+    }
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/async/builder/AsyncPolicyBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/async/builder/AsyncPolicyBuilder.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/async/builder/AsyncPolicyBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/async/builder/AsyncPolicyBuilder.java Tue May  2 23:09:37 2006
@@ -21,13 +21,13 @@
 import javax.resource.spi.work.WorkManager;
 
 import org.apache.tuscany.core.async.invocation.AsyncInterceptor;
-import org.apache.tuscany.core.builder.BuilderException;
+import org.apache.tuscany.spi.builder.BuilderException;
+import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
 import org.apache.tuscany.core.builder.SourcePolicyBuilder;
 import org.apache.tuscany.core.builder.TargetPolicyBuilder;
 import org.apache.tuscany.core.builder.system.PolicyBuilderRegistry;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
 import org.apache.tuscany.core.wire.WireSourceConfiguration;
 import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.model.assembly.ConfiguredReference;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/async/invocation/AsyncInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/async/invocation/AsyncInterceptor.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/async/invocation/AsyncInterceptor.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/async/invocation/AsyncInterceptor.java Tue May  2 23:09:37 2006
@@ -20,9 +20,9 @@
 import javax.resource.spi.work.WorkException;
 import javax.resource.spi.work.WorkManager;
 
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.Message;
 import org.apache.tuscany.core.message.MessageFactory;
-import org.apache.tuscany.core.wire.Interceptor;
+import org.apache.tuscany.spi.wire.Interceptor;
 import org.osoa.sca.CurrentModuleContext;
 import org.osoa.sca.ModuleContext;
 import org.osoa.sca.SCA;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderInitException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderInitException.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderInitException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderInitException.java Tue May  2 23:09:37 2006
@@ -13,6 +13,8 @@
  */
 package org.apache.tuscany.core.builder;
 
+import org.apache.tuscany.spi.builder.BuilderException;
+
 /**
  * Denotes an exception initializing a builder
  * 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java Tue May  2 23:09:37 2006
@@ -13,6 +13,8 @@
  */
 package org.apache.tuscany.core.builder;
 
+import org.apache.tuscany.spi.builder.BuilderException;
+
 
 /**
  * Denotes an exception creating an instance context

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java Tue May  2 23:09:37 2006
@@ -2,8 +2,8 @@
 
 import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.context.Context;
-import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
 import org.apache.tuscany.model.assembly.Scope;
 
 import java.util.List;
@@ -15,7 +15,7 @@
  * Context factories are "built" in two phases. {@link ContextFactoryBuilder}s analyze an assembly, producing
  * <code>ContextFactory</code>s for {@link org.apache.tuscany.model.assembly.Component}s, {@link
  * org.apache.tuscany.model.assembly.EntryPoint}s, and {@link org.apache.tuscany.model.assembly.ExternalService}s. During this
- * phase, {@link org.apache.tuscany.core.wire.WireFactory}s for source- and target-side wires are produced for the
+ * phase, {@link org.apache.tuscany.spi.wire.WireFactory}s for source- and target-side wires are produced for the
  * <code>ContextFactory</code>s.  Ê
  * <p/>
  * The second build phase connects the source- and target-side <code>WireFactories</code>, thereby completing wire configuration.

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java Tue May  2 23:09:37 2006
@@ -1,6 +1,7 @@
 package org.apache.tuscany.core.builder;
 
 import org.apache.tuscany.model.assembly.AssemblyObject;
+import org.apache.tuscany.spi.builder.BuilderException;
 
 /**
  * The extension point for component types in the runtime. Implementations perform the first phase of converting an assembly model

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java Tue May  2 23:09:37 2006
@@ -13,6 +13,8 @@
  */
 package org.apache.tuscany.core.builder;
 
+import org.apache.tuscany.spi.builder.BuilderException;
+
 /**
  * Denotes an attempt to access a non-existent field or method
  * 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyBuilder.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyBuilder.java Tue May  2 23:09:37 2006
@@ -16,7 +16,7 @@
 /**
  * A marker for policy extensions in the runtime. Implementations evaluate wire-related policy metadata on a {@link
  * org.apache.tuscany.model.assembly.ConfiguredReference} or {@link org.apache.tuscany.model.assembly.ConfiguredService} and
- * contribute {@link org.apache.tuscany.core.wire.Interceptor}s or {@link org.apache.tuscany.core.wire.MessageHandler}s
+ * contribute {@link org.apache.tuscany.spi.wire.Interceptor}s or {@link org.apache.tuscany.spi.wire.MessageHandler}s
  * implementing a policy to {@link org.apache.tuscany.core.wire.InvocationConfiguration}s that are part of a {@link
  * org.apache.tuscany.core.wire.WireConfiguration}. The contributed <code>Interceptor</code>s or <code>Handler</code>s will be
  * called as part of an invocation over a wire.

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyOrderer.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyOrderer.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyOrderer.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/PolicyOrderer.java Tue May  2 23:09:37 2006
@@ -14,8 +14,8 @@
 package org.apache.tuscany.core.builder;
 
 /**
- * A marker for implementations that order source- or target-side policy {@link org.apache.tuscany.core.wire.Interceptor}s or
- * {@link org.apache.tuscany.core.wire.MessageHandler}s in a {@link org.apache.tuscany.core.wire.WireConfiguration}.
+ * A marker for implementations that order source- or target-side policy {@link org.apache.tuscany.spi.wire.Interceptor}s or
+ * {@link org.apache.tuscany.spi.wire.MessageHandler}s in a {@link org.apache.tuscany.core.wire.WireConfiguration}.
  *
  * @see SourcePolicyOrderer
  * @see TargetPolicyOrderer

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyBuilder.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyBuilder.java Tue May  2 23:09:37 2006
@@ -15,12 +15,13 @@
 
 import org.apache.tuscany.core.wire.WireSourceConfiguration;
 import org.apache.tuscany.model.assembly.ConfiguredReference;
+import org.apache.tuscany.spi.builder.BuilderException;
 
 import java.util.List;
 
 /**
- * Implementations contribute {@link org.apache.tuscany.core.wire.Interceptor}s or {@link
- * org.apache.tuscany.core.wire.MessageHandler}s that handle source-side policy on a wire.  
+ * Implementations contribute {@link org.apache.tuscany.spi.wire.Interceptor}s or {@link
+ * org.apache.tuscany.spi.wire.MessageHandler}s that handle source-side policy on a wire.
  *
  * @version $$Rev$$ $$Date$$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyOrderer.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyOrderer.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyOrderer.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/SourcePolicyOrderer.java Tue May  2 23:09:37 2006
@@ -3,8 +3,8 @@
 import org.apache.tuscany.core.wire.WireSourceConfiguration;
 
 /**
- * Implementations order source-side policy {@link org.apache.tuscany.core.wire.Interceptor}s or
- * {@link org.apache.tuscany.core.wire.MessageHandler}s in a {@link org.apache.tuscany.core.wire.WireConfiguration}.
+ * Implementations order source-side policy {@link org.apache.tuscany.spi.wire.Interceptor}s or
+ * {@link org.apache.tuscany.spi.wire.MessageHandler}s in a {@link org.apache.tuscany.core.wire.WireConfiguration}.
  *
  * @version $$Rev$$ $$Date$$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyBuilder.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyBuilder.java Tue May  2 23:09:37 2006
@@ -15,10 +15,11 @@
 
 import org.apache.tuscany.model.assembly.ConfiguredService;
 import org.apache.tuscany.core.wire.WireTargetConfiguration;
+import org.apache.tuscany.spi.builder.BuilderException;
 
 /**
- * Implementations contribute {@link org.apache.tuscany.core.wire.Interceptor}s or {@link
- * org.apache.tuscany.core.wire.MessageHandler}s that handle target-side policy on a wire.  
+ * Implementations contribute {@link org.apache.tuscany.spi.wire.Interceptor}s or {@link
+ * org.apache.tuscany.spi.wire.MessageHandler}s that handle target-side policy on a wire.
  *
  * @version $$Rev$$ $$Date$$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyOrderer.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyOrderer.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyOrderer.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/TargetPolicyOrderer.java Tue May  2 23:09:37 2006
@@ -16,8 +16,8 @@
 import org.apache.tuscany.core.wire.WireTargetConfiguration;
 
 /**
- * Implementation order target-side policy {@link org.apache.tuscany.core.wire.Interceptor}s or
- * {@link org.apache.tuscany.core.wire.MessageHandler}s in a {@link org.apache.tuscany.core.wire.WireConfiguration}.
+ * Implementation order target-side policy {@link org.apache.tuscany.spi.wire.Interceptor}s or
+ * {@link org.apache.tuscany.spi.wire.MessageHandler}s in a {@link org.apache.tuscany.core.wire.WireConfiguration}.
 
  * @version $$Rev$$ $$Date$$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/UnknownTypeException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/UnknownTypeException.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/UnknownTypeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/UnknownTypeException.java Tue May  2 23:09:37 2006
@@ -1,5 +1,7 @@
 package org.apache.tuscany.core.builder;
 
+import org.apache.tuscany.spi.builder.BuilderException;
+
 /**
  * Denotes an unknown configuration parameter type
  * 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java Tue May  2 23:09:37 2006
@@ -14,8 +14,9 @@
 package org.apache.tuscany.core.builder;
 
 import org.apache.tuscany.core.context.ScopeContext;
-import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
+import org.apache.tuscany.spi.builder.BuilderConfigException;
 
 /**
  * Implementations perform the second phase of converting a logical model representing an assembly into a series of
@@ -23,7 +24,7 @@
  * bridging {@link org.apache.tuscany.core.wire.InvocationConfiguration}s held by source- and target-side proxy
  * factories. <code>WireBuilder</code>s generally operate by target implementation type. In other words, for a wire
  * from a Java source to a JavaScript target, the Javascript <code>WireBuilder</code> will complete the wire. This is
- * necessary as a <code>WireBuilder</code> must set a {@link org.apache.tuscany.core.wire.TargetInvoker} that is
+ * necessary as a <code>WireBuilder</code> must set a {@link org.apache.tuscany.spi.wire.TargetInvoker} that is
  * responsible for dispatching to an implementation on the source side of the wire.
  * <p>
  * Runtimes are generally configured with a {@link org.apache.tuscany.core.builder.impl.DefaultWireBuilder} as a
@@ -57,7 +58,7 @@
 
     /**
      * Finishes processing the target side wire chain. For example, a
-     * {@link org.apache.tuscany.core.wire.TargetInvoker} used by target-side proxies is usually set during this
+     * {@link org.apache.tuscany.spi.wire.TargetInvoker} used by target-side proxies is usually set during this
      * phase.
      * 
      * @param targetFactory the target-side proxy factory

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java Tue May  2 23:09:37 2006
@@ -13,8 +13,8 @@
  */
 package org.apache.tuscany.core.builder.impl;
 
-import org.apache.tuscany.core.builder.ObjectFactory;
-import org.apache.tuscany.core.injection.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
 
 import java.lang.reflect.Array;
 import java.util.List;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java Tue May  2 23:09:37 2006
@@ -13,14 +13,14 @@
  */
 package org.apache.tuscany.core.builder.impl;
 
-import org.apache.tuscany.core.builder.BuilderConfigException;
+import org.apache.tuscany.spi.builder.BuilderConfigException;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
 import org.apache.tuscany.core.builder.HierarchicalWireBuilder;
 import org.apache.tuscany.core.builder.WireBuilder;
 import org.apache.tuscany.core.context.ScopeContext;
 import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
 import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
-import org.apache.tuscany.core.wire.TargetWireFactory;
-import org.apache.tuscany.core.wire.SourceWireFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
 import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
 import org.apache.tuscany.core.wire.impl.MessageChannelImpl;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java Tue May  2 23:09:37 2006
@@ -18,8 +18,8 @@
 import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.context.EntryPointContext;
 import org.apache.tuscany.core.context.impl.EntryPointContextImpl;
-import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.model.assembly.Scope;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java Tue May  2 23:09:37 2006
@@ -15,12 +15,12 @@
 
 import org.apache.tuscany.core.builder.ContextCreationException;
 import org.apache.tuscany.core.builder.ContextFactory;
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.context.ExternalServiceContext;
 import org.apache.tuscany.core.context.impl.ExternalServiceContextImpl;
-import org.apache.tuscany.core.wire.TargetWireFactory;
-import org.apache.tuscany.core.wire.SourceWireFactory;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
 import org.apache.tuscany.model.assembly.Scope;
 
 import java.util.Collections;
@@ -36,7 +36,7 @@
  *
  *
  * }
- * responsible for setting the proper {@link org.apache.tuscany.core.wire.TargetInvoker} on the wire chains
+ * responsible for setting the proper {@link org.apache.tuscany.spi.wire.TargetInvoker} on the wire chains
  * can be notified.
  * 
  * @version $Rev$ $Date$

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java Tue May  2 23:09:37 2006
@@ -13,7 +13,7 @@
  */
 package org.apache.tuscany.core.builder.impl;
 
-import org.apache.tuscany.core.builder.BuilderException;
+import org.apache.tuscany.spi.builder.BuilderException;
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.model.assembly.AssemblyObject;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java Tue May  2 23:09:37 2006
@@ -13,8 +13,8 @@
  */
 package org.apache.tuscany.core.builder.impl;
 
-import org.apache.tuscany.core.builder.ObjectFactory;
-import org.apache.tuscany.core.injection.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java Tue May  2 23:09:37 2006
@@ -13,10 +13,10 @@
  */
 package org.apache.tuscany.core.builder.impl;
 
-import org.apache.tuscany.core.builder.ObjectFactory;
-import org.apache.tuscany.core.injection.ObjectCreationException;
-import org.apache.tuscany.core.wire.ProxyCreationException;
-import org.apache.tuscany.core.wire.WireFactory;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.wire.ProxyCreationException;
+import org.apache.tuscany.spi.wire.WireFactory;
 
 /**
  * Uses a proxy factory to return an object instance

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/system/DefaultPolicyBuilderRegistry.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/system/DefaultPolicyBuilderRegistry.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/system/DefaultPolicyBuilderRegistry.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/system/DefaultPolicyBuilderRegistry.java Tue May  2 23:09:37 2006
@@ -13,13 +13,13 @@
  */
 package org.apache.tuscany.core.builder.system;
 
-import org.apache.tuscany.core.builder.BuilderException;
+import org.apache.tuscany.spi.builder.BuilderException;
+import org.apache.tuscany.core.wire.WireSourceConfiguration;
 import org.apache.tuscany.core.builder.SourcePolicyBuilder;
 import org.apache.tuscany.core.builder.SourcePolicyOrderer;
 import org.apache.tuscany.core.builder.TargetPolicyBuilder;
 import org.apache.tuscany.core.builder.TargetPolicyOrderer;
 import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.core.wire.WireSourceConfiguration;
 import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.model.assembly.ConfiguredReference;
 import org.apache.tuscany.model.assembly.ConfiguredService;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/system/PolicyBuilderRegistry.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/system/PolicyBuilderRegistry.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/system/PolicyBuilderRegistry.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/system/PolicyBuilderRegistry.java Tue May  2 23:09:37 2006
@@ -1,6 +1,6 @@
 package org.apache.tuscany.core.builder.system;
 
-import org.apache.tuscany.core.builder.BuilderException;
+import org.apache.tuscany.spi.builder.BuilderException;
 import org.apache.tuscany.core.builder.SourcePolicyBuilder;
 import org.apache.tuscany.core.builder.TargetPolicyBuilder;
 import org.apache.tuscany.core.wire.WireSourceConfiguration;
@@ -12,7 +12,7 @@
 
 /**
  * A System registry for {@link org.apache.tuscany.core.builder.PolicyBuilder}s. <code>PolicyBuilder</code>s will be invoked when
- * a {@link org.apache.tuscany.core.wire.WireFactory} is constructed by the {@link org.apache.tuscany.core.wire.WireFactory}
+ * a {@link org.apache.tuscany.spi.wire.WireFactory} is constructed by the {@link org.apache.tuscany.spi.wire.WireFactory}
  * service.
  * <p/>
  * <code>PolicyBuilder</code>s operate on either a source- or target-side wire and typically are registered by runtime extensions

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java Tue May  2 23:09:37 2006
@@ -16,6 +16,8 @@
  */
 package org.apache.tuscany.core.context;
 
+import org.apache.tuscany.spi.context.TargetException;
+
 /**
  * A runtime entity that manages an atomic (i.e. leaf-type) artifact.
  * 
@@ -30,7 +32,7 @@
 
     /**
      * Notifies the context of an initialization event
-     * @throws TargetException
+     * @throws org.apache.tuscany.spi.context.TargetException
      */
     public void init() throws TargetException;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireResolutionException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireResolutionException.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireResolutionException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/AutowireResolutionException.java Tue May  2 23:09:37 2006
@@ -13,6 +13,8 @@
  */
 package org.apache.tuscany.core.context;
 
+import org.apache.tuscany.spi.context.TargetException;
+
 /**
  * Denotes an exception while resolving an automatic wire
  * 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/CompositeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/CompositeContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/CompositeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/CompositeContext.java Tue May  2 23:09:37 2006
@@ -2,10 +2,8 @@
 
 import org.apache.tuscany.core.config.ConfigurationException;
 import org.apache.tuscany.model.assembly.Composite;
-import org.apache.tuscany.model.assembly.Part;
 import org.apache.tuscany.model.assembly.Extensible;
-
-import java.util.List;
+import org.apache.tuscany.model.assembly.Part;
 
 /**
  * A context which contains child component contexts.
@@ -13,20 +11,9 @@
  * @version $Rev$ $Date$
  */
 public interface CompositeContext extends Context {
-
-    /**
-     * Returns the parent context, or null if the context does not have one
-     */
-    public CompositeContext getParent();
-
-    /**
-     * Sets the parent context
-     */
-    public void setParent(CompositeContext parent);
-
     /**
-     * Adds runtime artifacts represented by the set of model objects to the composite context by merging them with
-     * existing artifacts. Implementing classes may support only a subset of {@link Part} types.
+     * Adds a runtime artifact represented by the model object to the composite context by merging it with existing
+     * artifacts. Implementing classes may support only a subset of {@link Part} types.
      * 
      * @see org.apache.tuscany.model.assembly.Component
      * @see org.apache.tuscany.model.assembly.ModuleComponent
@@ -34,29 +21,24 @@
      * @see org.apache.tuscany.model.assembly.EntryPoint
      * @see org.apache.tuscany.model.assembly.ExternalService
      */
-    public void registerModelObjects(List<? extends Extensible> models) throws ConfigurationException;
+    void registerModelObject(Extensible model) throws ConfigurationException;
 
     /**
-     * Adds a runtime artifact represented by the model object to the composite context by merging it with existing
-     * artifacts. Implementing classes may support only a subset of {@link Part} types.
-     * 
-     * @see org.apache.tuscany.model.assembly.Component
-     * @see org.apache.tuscany.model.assembly.ModuleComponent
-     * @see org.apache.tuscany.model.assembly.AtomicComponent
-     * @see org.apache.tuscany.model.assembly.EntryPoint
-     * @see org.apache.tuscany.model.assembly.ExternalService
+     * Register a Context as a child of this composite.
+     *
+     * @param context the context to add as a child
      */
-    public void registerModelObject(Extensible model) throws ConfigurationException;
+    void registerContext(Context context);
 
     /**
      * Returns the child context associated with a given name
      */
-    public Context getContext(String name);
+    Context getContext(String name);
 
     /**
      * Returns the composite managed by this composite context
      */
     @Deprecated
-    public Composite getComposite();
+    Composite getComposite();
     
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java Tue May  2 23:09:37 2006
@@ -16,6 +16,10 @@
  */
 package org.apache.tuscany.core.context;
 
+import org.apache.tuscany.spi.EventPublisher;
+import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.spi.QualifiedName;
+
 /**
  * An entity that provides an execution context for a runtime artifact or artifacts. A <code>Context</code> may
  * be a composite, managing child contexts or it may be an atomic, i.e. leaf, context.
@@ -24,6 +28,18 @@
  */
 public interface Context extends EventPublisher, Lifecycle {
     /**
+     * Returns the name of the Context.
+     * @return the name of the Context
+     */
+    String getName();
+
+    /**
+     * Sets the name of the Context.
+     * @param name the name of the Context
+     */
+    void setName(String name);
+
+    /**
      * Returns the instance associated with the requested name, which may be in a atomic or composite form. Atomic (i.e.
      * leaf) contexts will return an instance associated with the service name part of the compound name, which may be
      * null.
@@ -35,7 +51,7 @@
      *
      * @param qName a qualified name of the requested instance
      * @return the implementation instance or a proxy to it
-     * @throws TargetException
+     * @throws org.apache.tuscany.spi.context.TargetException
      *          if an error occurs retrieving the instance or the requested component is not an entry
      *          point.
      * @see CompositeContext
@@ -43,4 +59,13 @@
      */
     public Object getInstance(QualifiedName qName) throws TargetException;
 
+    /**
+     * Returns the parent context, or null if the context does not have one
+     */
+    CompositeContext getParent();
+
+    /**
+     * Sets the parent context
+     */
+    void setParent(CompositeContext parent);
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ContextInitException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ContextInitException.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ContextInitException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ContextInitException.java Tue May  2 23:09:37 2006
@@ -16,6 +16,8 @@
  */
 package org.apache.tuscany.core.context;
 
+import org.apache.tuscany.spi.context.ContextRuntimeException;
+
 /**
  * Denotes an error encountered while initializing an instance context
  *

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/DuplicateNameException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/DuplicateNameException.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/DuplicateNameException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/DuplicateNameException.java Tue May  2 23:09:37 2006
@@ -13,6 +13,8 @@
  */
 package org.apache.tuscany.core.context;
 
+import org.apache.tuscany.spi.context.ContextRuntimeException;
+
 /**
  * Denotes an attempt to add a context with a name equal to an existing context
  * 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java Tue May  2 23:09:37 2006
@@ -16,14 +16,14 @@
  */
 package org.apache.tuscany.core.context;
 
-import org.apache.tuscany.core.wire.SourceWireFactory;
+import org.apache.tuscany.spi.context.TargetException;
 
 /**
  * The runtime artifact representing an entry point, <code>EntryPointContext</code> manages wire handler
  * instances that expose service operations offered by a component in the parent composite. The wire handler
  * instance is responsible for dispatching the request down an wire chain to the target instance. The wire
- * chain may contain {@link org.apache.tuscany.core.wire.Interceptor}s and
- * {@link org.apache.tuscany.core.wire.MessageHandler}s that implement policies or perform mediations on the
+ * chain may contain {@link org.apache.tuscany.spi.wire.Interceptor}s and
+ * {@link org.apache.tuscany.spi.wire.MessageHandler}s that implement policies or perform mediations on the
  * wire.
  * <p>
  * Entry point contexts are used by transport binding artifacts to invoke an operation on a service. The transport
@@ -58,7 +58,7 @@
 
     /**
      * Returns the handler responsible for flowing a request through the entry point
-     * @throws TargetException
+     * @throws org.apache.tuscany.spi.context.TargetException
      */
     public Object getHandler() throws TargetException;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java Tue May  2 23:09:37 2006
@@ -13,6 +13,8 @@
  */
 package org.apache.tuscany.core.context;
 
+import org.apache.tuscany.spi.context.TargetException;
+
 /**
  * Manages an external service 
  * 
@@ -22,9 +24,9 @@
 
     /**
      * Returns the handler responsible for flowing a request through the entry point
-     * @throws TargetException
+     * @throws org.apache.tuscany.spi.context.TargetException
      */
      public Object getHandler() throws TargetException;
-    
+
 }
 

Added: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContext.java?rev=399161&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContext.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContext.java Tue May  2 23:09:37 2006
@@ -0,0 +1,24 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation or its licensors as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tuscany.core.context;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface InstanceContext extends Lifecycle {
+    Object getInstance();
+}

Propchange: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContext.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContextFactory.java?rev=399161&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContextFactory.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContextFactory.java Tue May  2 23:09:37 2006
@@ -0,0 +1,26 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation or its licensors as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tuscany.core.context;
+
+import org.apache.tuscany.spi.context.TargetException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface InstanceContextFactory {
+    InstanceContext createContext() throws TargetException;
+}

Propchange: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContextFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContextFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/Lifecycle.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/Lifecycle.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/Lifecycle.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/Lifecycle.java Tue May  2 23:09:37 2006
@@ -64,16 +64,4 @@
      * @throws CoreRuntimeException
      */
     void stop() throws CoreRuntimeException;
-
-    /**
-     * Returns the name of the Lifecycle.
-     * @return the name of the Lifecycle
-     */
-    String getName();
-
-    /**
-     * Sets the name of the Lifecycle.
-     * @param name the name of the Lifecycle
-     */
-    void setName(String name);
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java Tue May  2 23:09:37 2006
@@ -17,6 +17,8 @@
 package org.apache.tuscany.core.context;
 
 import org.apache.tuscany.core.builder.ContextFactory;
+import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.spi.QualifiedName;
 
 import java.util.List;
 

Added: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeManager.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeManager.java?rev=399161&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeManager.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeManager.java Tue May  2 23:09:37 2006
@@ -0,0 +1,26 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation or its licensors as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tuscany.core.context;
+
+import org.apache.tuscany.spi.context.TargetException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface ScopeManager {
+    InstanceContext getInstance(InstanceContextFactory contextFactory) throws TargetException;
+}

Propchange: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeManager.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleAtomicContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleAtomicContext.java?rev=399161&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleAtomicContext.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleAtomicContext.java Tue May  2 23:09:37 2006
@@ -0,0 +1,66 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation or its licensors as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tuscany.core.context;
+
+import org.apache.tuscany.core.context.impl.AbstractContext;
+import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.spi.QualifiedName;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class SimpleAtomicContext extends AbstractContext implements AtomicContext {
+    private final ScopeManager scopeManager;
+    private final InstanceContextFactory instanceFactory;
+
+    public SimpleAtomicContext(String name, ScopeManager scopeManager, InstanceContextFactory instanceFactory) {
+        super(name);
+        this.scopeManager = scopeManager;
+        this.instanceFactory = instanceFactory;
+    }
+
+    public void start() throws CoreRuntimeException {
+    }
+
+    public void stop() throws CoreRuntimeException {
+    }
+
+    public Object getInstance(QualifiedName qName) throws TargetException {
+        return getTargetInstance();
+    }
+
+    public Object getTargetInstance() throws TargetException {
+        InstanceContext instanceContext = scopeManager.getInstance(instanceFactory);
+        return instanceContext.getInstance();
+    }
+
+    public boolean isEagerInit() {
+        throw new UnsupportedOperationException();
+    }
+
+    public void init() throws TargetException {
+        throw new UnsupportedOperationException();
+    }
+
+    public void destroy() throws TargetException {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isDestroyable() {
+        throw new UnsupportedOperationException();
+    }
+}

Propchange: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleAtomicContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleAtomicContext.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date