tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmar...@apache.org
Subject svn commit: r392146 [1/4] - in /incubator/tuscany/java/sca: bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/handler/ containers/container.java/src/...
Date Fri, 07 Apr 2006 01:11:38 GMT
Author: jmarino
Date: Thu Apr  6 18:11:28 2006
New Revision: 392146

URL: http://svn.apache.org/viewcvs?rev=392146&view=rev
Log:
more extension api refactor; removal of dead imports

Modified:
    incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceTargetInvoker.java
    incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
    incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/handler/JSONRPCEntryPointServlet.java
    incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java
    incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
    incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java
    incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java
    incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooESTargetInvoker.java
    incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java
    incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java
    incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java
    incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/EndpointReference.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/AddressingFactoryImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/EndpointReferenceImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitor.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseExternalServiceContextFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ImplementationCache.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/JavaIntrospectionHelper.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ModuleComponentConfigurationLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AggregateContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeAwareContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeStrategy.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AggregateContextImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EventContextImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AggregateScopeContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategy.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/HttpSessionScopeContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/HTTPSessionExpirationListener.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/TuscanyRequestFilter.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/SDOObjectFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationConfiguration.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MethodHashMap.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/ProxyConfiguration.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageChannelImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/jdk/JDKInvocationHandler.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactoryFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXElementLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistry.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXPropertyFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AggregateLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceJavaLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleFragmentLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/PropertyLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ReferenceLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ServiceLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StAXLoaderRegistryImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/AbstractLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemImplementationLoader.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeScopeStrategy.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Autowire.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/ParentContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/SystemAssemblyFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemAssemblyFactoryImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemImplementationImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemModuleImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemScopeStrategy.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/ContextBinder.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/LazyHTTPSessionId.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyRequestFilter.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/config/Bean2.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/config/JavaIntrospectionHelperTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AbstractAggregateHierarchyTests.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AggregateComponentContextRegisterTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AggregateHierarchyTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategyTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraAggregateWireIntegrationTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationErrorTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationErrorTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKInvocationHandlerTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactoryTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/mock/MockScopeContext.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/mock/MockStaticInvoker.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/ComponentTypeLoaderTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/AutowireSourceImpl.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AggregateNestingTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextRegisterTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateHierarchyTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java

Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceTargetInvoker.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceTargetInvoker.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceTargetInvoker.java Thu Apr  6 18:11:28 2006
@@ -64,7 +64,7 @@
             }
             context = (ExternalServiceContext) iContext;
         }
-        ExternalWebServiceClient client = (ExternalWebServiceClient) context.getImplementationInstance();
+        ExternalWebServiceClient client = (ExternalWebServiceClient) context.getHandler();
         if (payload != null) {
             return client.invoke(method.getName(), (Object[])payload);
         } else {

Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java Thu Apr  6 18:11:28 2006
@@ -84,7 +84,7 @@
             // invoke the proxy's InvocationHandler
             // FIXME we should be invoking the Tuscany pipeline rather than the proxy
             Method operationMethod = methodMap.get(axisOperationName);
-            InvocationHandler handler = (InvocationHandler) entryPointContext.getImplementationInstance();
+            InvocationHandler handler = (InvocationHandler) entryPointContext.getHandler();
             Object response = handler.invoke(null, operationMethod, args);
 
             // construct the response message

Modified: incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/handler/JSONRPCEntryPointServlet.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/handler/JSONRPCEntryPointServlet.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/handler/JSONRPCEntryPointServlet.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/handler/JSONRPCEntryPointServlet.java Thu Apr  6 18:11:28 2006
@@ -128,7 +128,7 @@
         final EntryPointContext entryPointContext = (EntryPointContext) moduleContext.getContext(entryPointName);
         InvocationHandler ih = new InvocationHandler() {
             public Object invoke(Object o, Method method, Object[] args) throws Throwable {
-                Object target = entryPointContext.getImplementationInstance();
+                Object target = entryPointContext.getHandler();
                 if (target instanceof InvocationHandler) {
                     return ((InvocationHandler) target).invoke(this, method, args);
                 } else {

Modified: incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java Thu Apr  6 18:11:28 2006
@@ -43,10 +43,6 @@
     // creates a new implementation instance with injected references and properties
     private ObjectFactory objectFactory;
 
-    // ----------------------------------
-    // Constructors
-    // ----------------------------------
-
     public JavaComponentContext(String name, ObjectFactory objectFactory, boolean eagerInit, EventInvoker<Object> initInvoker,
                                 EventInvoker<Object> destroyInvoker, boolean stateless) {
         super(name);
@@ -64,10 +60,6 @@
         this.stateless = stateless;
     }
 
-    // ----------------------------------
-    // Methods
-    // ----------------------------------
-
     public void setName(String name) {
         super.setName(name);
     }
@@ -131,12 +123,6 @@
         return getInstance(null);
     }
 
-//    public Object getImplementationInstance(boolean notify) throws TargetException {
-//        //TODO refactor when getInstance() returns a proxy
-//        return getInstance(null, notify);
-//    }
-
-
     public boolean isEagerInit() {
         return eagerInit;
     }
@@ -145,10 +131,6 @@
         return (destroyInvoker != null);
     }
 
-    // ----------------------------------
-    // Lifecycle methods
-    // ----------------------------------
-
     public void start() throws ContextInitException {
         if (getLifecycleState() != UNINITIALIZED && getLifecycleState() != STOPPED) {
             throw new IllegalStateException("Context must be in UNINITIALIZED state [" + getLifecycleState() + "]");
@@ -163,6 +145,7 @@
     }
 
     public void stop() {
+        setLifecycleState(STOPPING);
         if (cachedTargetInstance != null) {
             if (destroyInvoker != null) {
                 try {
@@ -177,9 +160,6 @@
         setLifecycleState(STOPPED);
     }
 
-    // ----------------------------------
-    // Private methods
-    // ----------------------------------
     private void startInstance(Object instance) throws TargetException {
         try {
             // handle @Init

Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java Thu Apr  6 18:11:28 2006
@@ -31,6 +31,7 @@
 import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.QualifiedName;
 import org.apache.tuscany.core.invocation.jdk.JDKProxyFactoryFactory;
 import org.apache.tuscany.core.invocation.spi.ProxyFactoryFactory;
 import org.apache.tuscany.core.message.MessageFactory;
@@ -91,7 +92,7 @@
         AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
         child.registerModelObject(MockFactory.createModule());
         child.fireEvent(EventContext.MODULE_START, null);
-        GenericComponent source = (GenericComponent) child.locateInstance("source");
+        GenericComponent source = (GenericComponent) child.getContext("source").getInstance(null);
         Assert.assertNotNull(source);
         source.getGenericComponent().getString();
         Assert.assertEquals(1, mockInterceptor.getCount());
@@ -135,7 +136,7 @@
         AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
         child.registerModelObject(MockFactory.createModule());
         child.fireEvent(EventContext.MODULE_START, null);
-        GenericComponent source = (GenericComponent) child.locateInstance("source");
+        GenericComponent source = (GenericComponent) child.getContext("source").getInstance(null);
         Assert.assertNotNull(source);
         source.getGenericComponent().getString();
         Assert.assertEquals(1, mockInterceptor.getCount());
@@ -182,7 +183,7 @@
         AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
         child.registerModelObject(MockFactory.createModule());
         child.fireEvent(EventContext.MODULE_START, null);
-        GenericComponent source = (GenericComponent) child.locateInstance("source");
+        GenericComponent source = (GenericComponent) child.getContext("source").getInstance(null);
         Assert.assertNotNull(source);
         source.getGenericComponent().getString();
         Assert.assertEquals(1, mockInterceptor.getCount());
@@ -226,7 +227,7 @@
         AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
         child.registerModelObject(MockFactory.createModule());
         child.fireEvent(EventContext.MODULE_START, null);
-        GenericComponent source = (GenericComponent) child.locateInstance("source");
+        GenericComponent source = (GenericComponent) child.getContext("source").getInstance(null);
         Assert.assertNotNull(source);
         source.getGenericComponent().getString();
         Assert.assertEquals(1, mockInterceptor.getCount());

Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java Thu Apr  6 18:11:28 2006
@@ -60,7 +60,7 @@
         child.fireEvent(EventContext.REQUEST_START, null);
         EntryPointContext ctx = (EntryPointContext) child.getContext("source");
         Assert.assertNotNull(ctx);
-        InvocationHandler handler = (InvocationHandler) ctx.getImplementationInstance();
+        InvocationHandler handler = (InvocationHandler) ctx.getHandler();
         Assert.assertEquals(0, mockInterceptor.getCount());
         Object response = handler.invoke(null, hello, new Object[] { "foo" });
         Assert.assertEquals("Hello foo", response);
@@ -71,7 +71,7 @@
         child.fireEvent(EventContext.REQUEST_START, null);
         ctx = (EntryPointContext) child.getContext("source");
         Assert.assertNotNull(ctx);
-        handler = (InvocationHandler) ctx.getImplementationInstance();
+        handler = (InvocationHandler) ctx.getHandler();
         Assert.assertEquals(1, mockInterceptor.getCount());
         response = handler.invoke(null, hello, new Object[] { "foo" });
         Assert.assertEquals("Hello foo", response);
@@ -106,7 +106,7 @@
         
         EntryPointContext ctx = (EntryPointContext) child.getContext("source");
         Assert.assertNotNull(ctx);
-        InvocationHandler handler = (InvocationHandler) ctx.getImplementationInstance();
+        InvocationHandler handler = (InvocationHandler) ctx.getHandler();
         Assert.assertEquals(0, mockInterceptor.getCount());
         Object response = handler.invoke(null, hello, new Object[] { "foo" });
         Assert.assertEquals("Hello foo", response);
@@ -175,7 +175,7 @@
         child.fireEvent(EventContext.REQUEST_START, null);
         EntryPointContext ctx = (EntryPointContext) child.getContext("source");
         Assert.assertNotNull(ctx);
-        InvocationHandler handler = (InvocationHandler) ctx.getImplementationInstance();
+        InvocationHandler handler = (InvocationHandler) ctx.getHandler();
         Assert.assertEquals(0, mockInterceptor.getCount());
         Object response = handler.invoke(null, hello, new Object[] { "foo" });
         Assert.assertEquals("Hello foo", response);
@@ -186,7 +186,7 @@
         child.fireEvent(EventContext.REQUEST_START, null);
         ctx = (EntryPointContext) child.getContext("source");
         Assert.assertNotNull(ctx);
-        handler = (InvocationHandler) ctx.getImplementationInstance();
+        handler = (InvocationHandler) ctx.getHandler();
         Assert.assertEquals(1, mockInterceptor.getCount());
         response = handler.invoke(null, hello, new Object[] { "foo" });
         Assert.assertEquals("Hello foo", response);
@@ -213,7 +213,7 @@
         child.fireEvent(EventContext.REQUEST_START, null);
         EntryPointContext ctx = (EntryPointContext) child.getContext("source");
         Assert.assertNotNull(ctx);
-        InvocationHandler handler = (InvocationHandler) ctx.getImplementationInstance();
+        InvocationHandler handler = (InvocationHandler) ctx.getHandler();
         Assert.assertEquals(0, mockInterceptor.getCount());
         Object response = handler.invoke(null, hello, new Object[] { "foo" });
         Assert.assertEquals("Hello foo", response);
@@ -221,7 +221,7 @@
 
         ctx = (EntryPointContext) child.getContext("source");
         Assert.assertNotNull(ctx);
-        handler = (InvocationHandler) ctx.getImplementationInstance();
+        handler = (InvocationHandler) ctx.getHandler();
         response = handler.invoke(null, hello, new Object[] { "foo" });
         HelloWorldService service1 = (HelloWorldService)child.getContext("target").getInstance(null);
         Assert.assertEquals(2, service1.count());
@@ -232,7 +232,7 @@
         child.fireEvent(EventContext.REQUEST_START, null);
         ctx = (EntryPointContext) child.getContext("source");
         Assert.assertNotNull(ctx);
-        handler = (InvocationHandler) ctx.getImplementationInstance();
+        handler = (InvocationHandler) ctx.getHandler();
         Assert.assertEquals(2, mockInterceptor.getCount());
         response = handler.invoke(null, hello, new Object[] { "foo" });
         Assert.assertEquals("Hello foo", response);

Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java Thu Apr  6 18:11:28 2006
@@ -23,6 +23,7 @@
 import org.apache.tuscany.container.java.mock.binding.foo.FooBindingBuilder;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.QualifiedName;
 import org.apache.tuscany.core.runtime.RuntimeContext;
 
 /**
@@ -49,7 +50,7 @@
         AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
         child.registerModelObject(MockFactory.createModuleWithExternalService());
         child.fireEvent(EventContext.MODULE_START, null);
-        HelloWorldService source = (HelloWorldService) child.locateInstance("source");
+        HelloWorldService source = (HelloWorldService) child.getContext("source").getInstance(null);
         Assert.assertNotNull(source);
         Assert.assertEquals(0, mockInterceptor.getCount());
         Assert.assertEquals("foo", source.hello("foo"));

Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooESTargetInvoker.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooESTargetInvoker.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooESTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooESTargetInvoker.java Thu Apr  6 18:11:28 2006
@@ -54,7 +54,7 @@
             }
             context = (ExternalServiceContext) iContext;
         }
-        FooClient client = (FooClient) context.getImplementationInstance();
+        FooClient client = (FooClient) context.getHandler();
         if (payload != null) {
             return client.invoke(payload);
         } else {

Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java Thu Apr  6 18:11:28 2006
@@ -64,9 +64,9 @@
         scopeContainer.onEvent(EventContext.REQUEST_START, null);
         scopeContainer.onEvent(EventContext.SESSION_NOTIFY, session);
         AggregateContext componentCtx = (AggregateContext) scopeContainer.getContext("AggregateComponent");
-        GenericComponent testService1 = (GenericComponent) componentCtx.locateInstance("TestService1");
-        GenericComponent testService2 = (GenericComponent) componentCtx.locateInstance("TestService2");
-        GenericComponent testService3 = (GenericComponent) componentCtx.locateInstance("TestService3");
+        GenericComponent testService1 = (GenericComponent) componentCtx.getContext("TestService1").getInstance(null);
+        GenericComponent testService2 = (GenericComponent) componentCtx.getContext("TestService2").getInstance(null);
+        GenericComponent testService3 = (GenericComponent) componentCtx.getContext("TestService3").getInstance(null);
         Assert.assertNotNull(testService1);
         Assert.assertNotNull(testService2);
         Assert.assertNotNull(testService3);
@@ -74,9 +74,9 @@
         scopeContainer.onEvent(EventContext.REQUEST_START, null);
         scopeContainer.onEvent(EventContext.SESSION_NOTIFY, session);
 
-        GenericComponent testService2a = (GenericComponent) componentCtx.locateInstance("TestService2");
+        GenericComponent testService2a = (GenericComponent) componentCtx.getContext("TestService2").getInstance(null);
         Assert.assertNotNull(testService2a);
-        GenericComponent testService3a = (GenericComponent) componentCtx.locateInstance("TestService3");
+        GenericComponent testService3a = (GenericComponent) componentCtx.getContext("TestService3").getInstance(null);
         Assert.assertNotNull(testService3a);
         Assert.assertEquals(testService2, testService2a);
         Assert.assertNotSame(testService3, testService3a);
@@ -86,7 +86,7 @@
         Object session2 = new Object();
         scopeContainer.onEvent(EventContext.REQUEST_START, null);
         scopeContainer.onEvent(EventContext.SESSION_NOTIFY, session2);
-        GenericComponent testService2b = (GenericComponent) componentCtx.locateInstance("TestService2");
+        GenericComponent testService2b = (GenericComponent) componentCtx.getContext("TestService2").getInstance(null);
         Assert.assertNotNull(testService2b);
         Assert.assertNotSame(testService2, testService2b);
 

Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java Thu Apr  6 18:11:28 2006
@@ -155,7 +155,7 @@
 
     JavaContextFactoryBuilder builder = new JavaContextFactoryBuilder();
 
-    private List<ContextFactory<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
+    private List<ContextFactory<InstanceContext>> createComponents() throws BuilderException {
         SimpleComponent[] ca = new SimpleComponent[3];
         ca[0] = MockFactory.createComponent("TestServiceInitDestroy", ModuleScopeInitDestroyComponent.class,
                 Scope.MODULE);
@@ -163,17 +163,17 @@
                 Scope.MODULE);
         ca[2] = MockFactory.createComponent("TestServiceDestroyOnly", ModuleScopeDestroyOnlyComponent.class,
                 Scope.MODULE);
-        List<ContextFactory<InstanceContext>> configs = new ArrayList();
-        for (int i = 0; i < ca.length; i++) {
-            builder.build(ca[i]);
-            configs.add((ContextFactory<InstanceContext>) ca[i].getComponentImplementation()
+        List<ContextFactory<InstanceContext>> configs = new ArrayList<ContextFactory<InstanceContext>> ();
+        for (SimpleComponent aCa : ca) {
+            builder.build(aCa);
+            configs.add((ContextFactory<InstanceContext>) aCa.getComponentImplementation()
                     .getContextFactory());
 
         }
         return configs;
     }
 
-    private List<ContextFactory<InstanceContext>> createEagerInitComponents() throws NoSuchMethodException,
+    private List<ContextFactory<InstanceContext>> createEagerInitComponents() throws
             BuilderException {
         SimpleComponent[] ca = new SimpleComponent[2];
         ca[0] = MockFactory.createComponent("TestServiceEagerInitDestroy", ModuleScopeEagerInitDestroyComponent.class,
@@ -190,13 +190,13 @@
         return configs;
     }
 
-    private List<ContextFactory<InstanceContext>> createOrderedInitComponents() throws NoSuchMethodException,
+    private List<ContextFactory<InstanceContext>> createOrderedInitComponents() throws
             BuilderException {
         SimpleComponent[] ca = new SimpleComponent[3];
         ca[0] = MockFactory.createComponent("one", OrderedInitPojo.class, Scope.MODULE);
         ca[1] = MockFactory.createComponent("two", OrderedInitPojo.class, Scope.MODULE);
         ca[2] = MockFactory.createComponent("three", OrderedInitPojo.class, Scope.MODULE);
-        List<ContextFactory<InstanceContext>> configs = new ArrayList();
+        List<ContextFactory<InstanceContext>> configs = new ArrayList<ContextFactory<InstanceContext>>();
         for (int i = 0; i < ca.length; i++) {
             builder.build(ca[i]);
             configs.add((ContextFactory<InstanceContext>) ca[i].getComponentImplementation()
@@ -206,7 +206,7 @@
         return configs;
     }
 
-    private List<ContextFactory<InstanceContext>> createOrderedEagerInitComponents() throws NoSuchMethodException,
+    private List<ContextFactory<InstanceContext>> createOrderedEagerInitComponents() throws
             BuilderException {
         SimpleComponent[] ca = new SimpleComponent[3];
         ca[0] = MockFactory.createComponent("one", OrderedEagerInitPojo.class, Scope.MODULE);

Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java Thu Apr  6 18:11:28 2006
@@ -111,7 +111,7 @@
 
     JavaContextFactoryBuilder builder = new JavaContextFactoryBuilder();
 
-    private List<ContextFactory<InstanceContext>> createComponents() throws NoSuchMethodException, BuilderException {
+    private List<ContextFactory<InstanceContext>> createComponents() throws BuilderException {
         SimpleComponent[] ca = new SimpleComponent[3];
         ca[0] = MockFactory.createComponent("TestServiceInitDestroy", SessionScopeInitDestroyComponent.class,
                 Scope.REQUEST);
@@ -119,25 +119,25 @@
                 Scope.REQUEST);
         ca[2] = MockFactory.createComponent("TestServiceDestroyOnly", SessionScopeDestroyOnlyComponent.class,
                 Scope.REQUEST);
-        List<ContextFactory<InstanceContext>> configs = new ArrayList();
-        for (int i = 0; i < ca.length; i++) {
-            builder.build(ca[i]);
-            configs.add((ContextFactory<InstanceContext>) ca[i].getComponentImplementation().getContextFactory());
+        List<ContextFactory<InstanceContext>> configs = new ArrayList<ContextFactory<InstanceContext>>();
+        for (SimpleComponent aCa : ca) {
+            builder.build(aCa);
+            configs.add((ContextFactory<InstanceContext>) aCa.getComponentImplementation().getContextFactory());
 
         }
         return configs;
     }
 
-    private List<ContextFactory<InstanceContext>> createOrderedInitComponents() throws NoSuchMethodException,
+    private List<ContextFactory<InstanceContext>> createOrderedInitComponents() throws
             BuilderException {
         SimpleComponent[] ca = new SimpleComponent[3];
         ca[0] = MockFactory.createComponent("one", OrderedInitPojo.class, Scope.REQUEST);
         ca[1] = MockFactory.createComponent("two", OrderedInitPojo.class, Scope.REQUEST);
         ca[2] = MockFactory.createComponent("three", OrderedInitPojo.class, Scope.REQUEST);
-        List<ContextFactory<InstanceContext>> configs = new ArrayList();
-        for (int i = 0; i < ca.length; i++) {
-            builder.build(ca[i]);
-            configs.add((ContextFactory<InstanceContext>) ca[i].getComponentImplementation().getContextFactory());
+        List<ContextFactory<InstanceContext>> configs = new ArrayList<ContextFactory<InstanceContext>>();
+        for (SimpleComponent aCa : ca) {
+            builder.build(aCa);
+            configs.add((ContextFactory<InstanceContext>) aCa.getComponentImplementation().getContextFactory());
 
         }
         return configs;

Modified: incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java Thu Apr  6 18:11:28 2006
@@ -31,6 +31,7 @@
 import org.apache.tuscany.core.builder.impl.HierarchicalBuilder;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.QualifiedName;
 import org.apache.tuscany.core.context.impl.AggregateContextImpl;
 import org.apache.tuscany.core.invocation.jdk.JDKProxyFactoryFactory;
 import org.apache.tuscany.core.message.MessageFactory;
@@ -52,7 +53,7 @@
     public void testBasicInvocation() throws Exception {
         MessageFactory msgFactory = new MessageFactoryImpl();
 
-        List<ContextFactoryBuilder> builders = new ArrayList();
+        List<ContextFactoryBuilder> builders = new ArrayList<ContextFactoryBuilder>();
         builders.add((new SystemContextFactoryBuilder()));
         builders.add(new SystemEntryPointBuilder());
         builders.add(new SystemExternalServiceBuilder());
@@ -79,7 +80,7 @@
         AggregateContext child = (AggregateContext) runtime.getRootContext().getContext("test.module");
         child.registerModelObject(MockModuleFactory.createModule());
         child.fireEvent(EventContext.MODULE_START, null);
-        HelloWorldService source = (HelloWorldService) child.locateInstance("source/HelloWorldService");
+        HelloWorldService source = (HelloWorldService) child.getContext("source").getInstance(new QualifiedName("./HelloWorldService"));
         Assert.assertNotNull(source);
         Assert.assertEquals("Hello foo",source.hello("foo"));
         //Assert.assertEquals(1, mockInterceptor.getCount());

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/EndpointReference.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/EndpointReference.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/EndpointReference.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/EndpointReference.java Thu Apr  6 18:11:28 2006
@@ -16,10 +16,10 @@
  */
 package org.apache.tuscany.core.addressing;
 
-import java.util.Map;
-
 import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.model.assembly.ConfiguredPort;
+
+import java.util.Map;
 
 /**
  * A representation of the model object '<em><b>Endpoint Reference</b></em>'.

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/AddressingFactoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/AddressingFactoryImpl.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/AddressingFactoryImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/AddressingFactoryImpl.java Thu Apr  6 18:11:28 2006
@@ -16,10 +16,9 @@
  */
 package org.apache.tuscany.core.addressing.impl;
 
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
 import org.apache.tuscany.core.addressing.AddressingFactory;
 import org.apache.tuscany.core.addressing.EndpointReference;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 
 /**
  * A factory for endpoint references.

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/EndpointReferenceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/EndpointReferenceImpl.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/EndpointReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/EndpointReferenceImpl.java Thu Apr  6 18:11:28 2006
@@ -16,13 +16,13 @@
  */
 package org.apache.tuscany.core.addressing.impl;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.tuscany.core.addressing.EndpointReference;
 import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.core.message.Message;
 import org.apache.tuscany.model.assembly.ConfiguredPort;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * An implementation of EndpointReference.

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java Thu Apr  6 18:11:28 2006
@@ -1,12 +1,12 @@
 package org.apache.tuscany.core.builder;
 
-import java.util.List;
-import java.util.Map;
-
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
 import org.apache.tuscany.model.assembly.Scope;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * Implementations serve the dual purpose of creating instances of {@link org.apache.tuscany.core.context.Context} based

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java Thu Apr  6 18:11:28 2006
@@ -13,11 +13,11 @@
  */
 package org.apache.tuscany.core.builder.impl;
 
-import java.lang.reflect.Array;
-import java.util.List;
-
 import org.apache.tuscany.core.builder.ObjectFactory;
 import org.apache.tuscany.core.injection.ObjectCreationException;
+
+import java.lang.reflect.Array;
+import java.util.List;
 
 /**
  * Resolves targets configured in a multiplicity by delegating to object factories and returning an

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitor.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/AssemblyVisitor.java Thu Apr  6 18:11:28 2006
@@ -13,11 +13,11 @@
  */
 package org.apache.tuscany.core.builder.impl;
 
-import java.util.List;
-
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
 import org.apache.tuscany.model.assembly.AssemblyModelVisitor;
+
+import java.util.List;
 
 /**
  * Decorates an assembly object graph with runtime configurations using a set of builders

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseExternalServiceContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseExternalServiceContextFactory.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseExternalServiceContextFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseExternalServiceContextFactory.java Thu Apr  6 18:11:28 2006
@@ -13,19 +13,19 @@
  */
 package org.apache.tuscany.core.builder.impl;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.tuscany.core.builder.ContextCreationException;
-import org.apache.tuscany.core.builder.ObjectFactory;
 import org.apache.tuscany.core.builder.ContextFactory;
+import org.apache.tuscany.core.builder.ObjectFactory;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.ExternalServiceContext;
 import org.apache.tuscany.core.context.impl.ExternalServiceContextImpl;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
 import org.apache.tuscany.model.assembly.Scope;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * A template implementation that creates instances of {@link org.apache.tuscany.core.context.ExternalServiceContext}

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java Thu Apr  6 18:11:28 2006
@@ -13,11 +13,6 @@
  */
 package org.apache.tuscany.core.builder.impl;
 
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.tuscany.core.builder.BuilderConfigException;
 import org.apache.tuscany.core.builder.HierarchicalWireBuilder;
 import org.apache.tuscany.core.builder.WireBuilder;
@@ -26,6 +21,11 @@
 import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
 import org.apache.tuscany.core.invocation.impl.MessageChannelImpl;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * The top-most <code>WireBuilder</code> configured in a runtime. Responsible for constructing wires from source and target chains,

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java Thu Apr  6 18:11:28 2006
@@ -13,11 +13,6 @@
  */
 package org.apache.tuscany.core.builder.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.tuscany.core.builder.ContextCreationException;
 import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.AggregateContext;
@@ -26,6 +21,11 @@
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.model.assembly.Scope;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Produces entry point contexts

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/HierarchicalBuilder.java Thu Apr  6 18:11:28 2006
@@ -13,13 +13,13 @@
  */
 package org.apache.tuscany.core.builder.impl;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
 import org.apache.tuscany.core.builder.BuilderException;
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * A builder that contains nested builders. Used for synchronizing parts of the build process, such as references.

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java Thu Apr  6 18:11:28 2006
@@ -13,11 +13,11 @@
  */
 package org.apache.tuscany.core.builder.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.tuscany.core.builder.ObjectFactory;
 import org.apache.tuscany.core.injection.ObjectCreationException;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Resolves targets configured in a multiplicity by delegating to object factories and returning an

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java Thu Apr  6 18:11:28 2006
@@ -16,26 +16,21 @@
  */
 package org.apache.tuscany.core.client;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.stream.XMLInputFactory;
-
 import org.apache.tuscany.common.resource.ResourceLoader;
 import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
-import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
 import org.apache.tuscany.core.config.ConfigurationException;
+import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
 import org.apache.tuscany.core.config.impl.StAXModuleComponentConfigurationLoaderImpl;
-import org.apache.tuscany.core.context.SystemAggregateContext;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.SystemAggregateContext;
+import org.apache.tuscany.core.loader.StAXLoaderRegistry;
+import org.apache.tuscany.core.loader.StAXUtil;
 import org.apache.tuscany.core.system.assembly.impl.SystemAssemblyFactoryImpl;
 import org.apache.tuscany.core.system.builder.SystemContextFactoryBuilder;
 import org.apache.tuscany.core.system.builder.SystemEntryPointBuilder;
 import org.apache.tuscany.core.system.builder.SystemExternalServiceBuilder;
-import org.apache.tuscany.core.loader.StAXLoaderRegistry;
-import org.apache.tuscany.core.loader.StAXUtil;
 import org.apache.tuscany.model.assembly.AssemblyFactory;
 import org.apache.tuscany.model.assembly.AssemblyModelContext;
 import org.apache.tuscany.model.assembly.ModuleComponent;
@@ -43,6 +38,10 @@
 import org.apache.tuscany.model.assembly.loader.AssemblyModelLoader;
 import org.apache.tuscany.model.scdl.loader.SCDLModelLoader;
 import org.apache.tuscany.model.scdl.loader.impl.SCDLAssemblyModelLoaderImpl;
+
+import javax.xml.stream.XMLInputFactory;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java Thu Apr  6 18:11:28 2006
@@ -16,12 +16,6 @@
  */
 package org.apache.tuscany.core.client;
 
-import java.util.List;
-
-import org.osoa.sca.ModuleContext;
-import org.osoa.sca.SCA;
-import org.osoa.sca.ServiceRuntimeException;
-
 import org.apache.tuscany.common.monitor.MonitorFactory;
 import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
@@ -36,7 +30,11 @@
 import org.apache.tuscany.core.runtime.RuntimeContextImpl;
 import org.apache.tuscany.model.assembly.AssemblyModelContext;
 import org.apache.tuscany.model.assembly.ModuleComponent;
-import org.apache.tuscany.model.scdl.loader.SCDLModelLoader;
+import org.osoa.sca.ModuleContext;
+import org.osoa.sca.SCA;
+import org.osoa.sca.ServiceRuntimeException;
+
+import java.util.List;
 
 /**
  * Create and initialize a Tuscany SCA runtime environment.

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ImplementationCache.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ImplementationCache.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ImplementationCache.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ImplementationCache.java Thu Apr  6 18:11:28 2006
@@ -16,9 +16,9 @@
  */
 package org.apache.tuscany.core.config;
 
-import javax.xml.namespace.QName;
-
 import org.apache.tuscany.model.assembly.ComponentImplementation;
+
+import javax.xml.namespace.QName;
 
 /**
  * Cache of introspected implementations.

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/JavaIntrospectionHelper.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/JavaIntrospectionHelper.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/JavaIntrospectionHelper.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/JavaIntrospectionHelper.java Thu Apr  6 18:11:28 2006
@@ -1,11 +1,6 @@
 package org.apache.tuscany.core.config;
 
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
+import java.lang.reflect.*;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ModuleComponentConfigurationLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ModuleComponentConfigurationLoader.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ModuleComponentConfigurationLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ModuleComponentConfigurationLoader.java Thu Apr  6 18:11:28 2006
@@ -16,10 +16,10 @@
  */
 package org.apache.tuscany.core.config;
 
-import java.util.Collection;
-import java.net.URL;
-
 import org.apache.tuscany.model.assembly.ModuleComponent;
+
+import java.net.URL;
+import java.util.Collection;
 
 /**
  * Interface for loading configuration information from some external

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java Thu Apr  6 18:11:28 2006
@@ -16,21 +16,17 @@
  */
 package org.apache.tuscany.core.config.impl;
 
-import java.net.URL;
+import org.apache.tuscany.common.resource.ResourceLoader;
+import org.apache.tuscany.core.config.ConfigurationLoadException;
+import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
+import org.apache.tuscany.model.assembly.*;
+
 import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
-
-import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
-import org.apache.tuscany.core.config.ConfigurationLoadException;
-import org.apache.tuscany.model.assembly.ModuleComponent;
-import org.apache.tuscany.model.assembly.Module;
-import org.apache.tuscany.model.assembly.ModuleFragment;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
-import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.common.resource.ResourceLoader;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java Thu Apr  6 18:11:28 2006
@@ -16,30 +16,22 @@
  */
 package org.apache.tuscany.core.config.impl;
 
+import org.apache.tuscany.core.config.ComponentTypeIntrospector;
+import org.apache.tuscany.core.config.ConfigurationException;
+import org.apache.tuscany.core.config.JavaIntrospectionHelper;
+import org.apache.tuscany.core.system.annotation.Autowire;
+import org.apache.tuscany.core.system.assembly.SystemAssemblyFactory;
+import org.apache.tuscany.model.assembly.*;
+import org.apache.tuscany.model.types.java.JavaServiceContract;
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Remotable;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-import org.apache.tuscany.core.config.ComponentTypeIntrospector;
-import org.apache.tuscany.core.config.ConfigurationException;
-import org.apache.tuscany.core.config.JavaIntrospectionHelper;
-import org.apache.tuscany.core.system.assembly.SystemAssemblyFactory;
-import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.ComponentType;
-import org.apache.tuscany.model.assembly.Multiplicity;
-import org.apache.tuscany.model.assembly.Property;
-import org.apache.tuscany.model.assembly.Reference;
-import org.apache.tuscany.model.assembly.Scope;
-import org.apache.tuscany.model.assembly.Service;
-import org.apache.tuscany.model.assembly.ServiceContract;
-import org.apache.tuscany.model.types.java.JavaServiceContract;
 
 /**
  * Introspects Java annotation-based metata data

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java Thu Apr  6 18:11:28 2006
@@ -16,19 +16,18 @@
  */
 package org.apache.tuscany.core.config.impl;
 
-import java.io.IOException;
-import java.net.URL;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamConstants;
-
 import org.apache.tuscany.core.config.ConfigurationLoadException;
 import org.apache.tuscany.core.loader.StAXLoaderRegistry;
 import org.apache.tuscany.model.assembly.AssemblyModelContext;
 import org.apache.tuscany.model.assembly.Module;
 import org.apache.tuscany.model.assembly.ModuleFragment;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.io.IOException;
+import java.net.URL;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AggregateContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AggregateContext.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AggregateContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AggregateContext.java Thu Apr  6 18:11:28 2006
@@ -1,11 +1,11 @@
 package org.apache.tuscany.core.context;
 
-import java.util.List;
-
 import org.apache.tuscany.core.config.ConfigurationException;
 import org.apache.tuscany.model.assembly.Aggregate;
-import org.apache.tuscany.model.assembly.Extensible;
 import org.apache.tuscany.model.assembly.AggregatePart;
+import org.apache.tuscany.model.assembly.Extensible;
+
+import java.util.List;
 
 /**
  * A context which contains child component contexts.
@@ -15,6 +15,11 @@
 public interface AggregateContext extends InstanceContext {
 
     /**
+     * Returns the parent context, or null if the context does not have one
+     */
+    public AggregateContext getParent();
+
+    /**
      * Propagates an event to registered listeners. All lifecycle events will be propagated to children in the order
      * that they were registered. Listeners are expected to be well-behaved and if an exception is thrown the
      * notification process will be aborted.
@@ -62,22 +67,16 @@
     public InstanceContext getContext(String name);
 
     /**
-     * Returns the parent context, or null if the context does not have one
-     */
-    public AggregateContext getParent();
-
-    /**
      * Intended for internal use by the runtime, returns an implementation instance for the given context name, which
      * may be a compound component/service form. Unlike {@link InstanceContext#getInstance(QualifiedName)}, which for aggregate contexts only returns
      * entry point proxies, this method will return any type of contained implementation instance.
      * 
      * @throws TargetException if there was an error returning the instance
      */
-    public Object locateInstance(String name) throws TargetException;
+    //public Object locateInstance(QualifiedName name) throws TargetException;
 
     /**
      * Returns the aggregate managed by this aggregate context
-     *
      */
     @Deprecated
     public Aggregate getAggregate();

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java Thu Apr  6 18:11:28 2006
@@ -67,18 +67,6 @@
     public int getLifecycleState();
 
     /**
-     * Sets the lifecycle state
-     * 
-     * @see #UNINITIALIZED
-     * @see #INITIALIZING
-     * @see #INITIALIZED
-     * @see #RUNNING
-     * @see #STOPPING
-     * @see #STOPPED
-     */
-    public void setLifecycleState(int state);
-
-    /**
      * Starts the container
      * 
      * @throws CoreRuntimeException

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java Thu Apr  6 18:11:28 2006
@@ -32,7 +32,7 @@
  *              AggregateContext aggregateContext = ...
  *              EntryPointContext ctx = (EntryPointContext) aggregateContext.getContext(&quot;source&quot;);
  *              Assert.assertNotNull(ctx);
- *              InvocationHandler handler = (InvocationHandler) ctx.getImplementationInstance();
+ *              InvocationHandler handler = (InvocationHandler) ctx.getHandler();
  *              Object response = handler.invoke(null, operation, new Object[] { param });
  * </pre>
  * 
@@ -55,11 +55,10 @@
 public interface EntryPointContext extends InstanceContext {
 
     /**
-     * Returns the implementation instance associated with the context. An implementation instance is the actual
-     * object a request is dispatched to sans proxy invocation chain.
+     * Returns the handler responsible for flowing a request through the entry point
      * @throws TargetException
      */
-    public Object getImplementationInstance() throws TargetException;
+    public Object getHandler() throws TargetException;
 
 
 }

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ExternalServiceContext.java Thu Apr  6 18:11:28 2006
@@ -21,11 +21,10 @@
 public interface ExternalServiceContext extends InstanceContext {
 
     /**
-     * Returns the implementation instance associated with the context. An implementation instance is the actual
-     * object a request is dispatched to sans proxy invocation chain.
+     * Returns the handler responsible for flowing a request through the entry point
      * @throws TargetException
      */
-    public Object getImplementationInstance() throws TargetException;
+     public Object getHandler() throws TargetException;
     
 }
 

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeAwareContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeAwareContext.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeAwareContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeAwareContext.java Thu Apr  6 18:11:28 2006
@@ -13,9 +13,9 @@
  */
 package org.apache.tuscany.core.context;
 
-import java.util.Map;
-
 import org.apache.tuscany.model.assembly.Scope;
+
+import java.util.Map;
 
 /**
  * Denotes an aggregate context that supports scopes

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeContext.java Thu Apr  6 18:11:28 2006
@@ -16,9 +16,9 @@
  */
 package org.apache.tuscany.core.context;
 
-import java.util.List;
-
 import org.apache.tuscany.core.builder.ContextFactory;
+
+import java.util.List;
 
 /**
  * Manages the lifecycle and visibility of <code>InstanceContext</code>s.

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeStrategy.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeStrategy.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeStrategy.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ScopeStrategy.java Thu Apr  6 18:11:28 2006
@@ -16,9 +16,9 @@
  */
 package org.apache.tuscany.core.context;
 
-import java.util.Map;
-
 import org.apache.tuscany.model.assembly.Scope;
+
+import java.util.Map;
 
 /**
  * Implementations provide scope container creation facilities and scope semantics to the runtime

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java?rev=392146&r1=392145&r2=392146&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java Thu Apr  6 18:11:28 2006
@@ -1,42 +1,11 @@
 package org.apache.tuscany.core.context.impl;
 
-import static org.apache.tuscany.core.context.EventContext.HTTP_SESSION;
-import static org.apache.tuscany.core.context.EventContext.REQUEST_END;
-import static org.apache.tuscany.core.context.EventContext.SESSION_NOTIFY;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import javax.wsdl.Part;
-
 import org.apache.tuscany.common.monitor.MonitorFactory;
 import org.apache.tuscany.core.builder.BuilderConfigException;
 import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.config.ConfigurationException;
-import org.apache.tuscany.core.context.AbstractContext;
-import org.apache.tuscany.core.context.AggregateContext;
-import org.apache.tuscany.core.context.AutowireContext;
-import org.apache.tuscany.core.context.ConfigurationContext;
-import org.apache.tuscany.core.context.ContextInitException;
-import org.apache.tuscany.core.context.CoreRuntimeException;
-import org.apache.tuscany.core.context.DuplicateNameException;
-import org.apache.tuscany.core.context.EntryPointContext;
-import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.EventException;
-import org.apache.tuscany.core.context.InstanceContext;
-import org.apache.tuscany.core.context.QualifiedName;
-import org.apache.tuscany.core.context.RuntimeEventListener;
-import org.apache.tuscany.core.context.ScopeAwareContext;
-import org.apache.tuscany.core.context.ScopeContext;
-import org.apache.tuscany.core.context.ScopeStrategy;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.core.context.*;
+import static org.apache.tuscany.core.context.EventContext.*;
 import org.apache.tuscany.core.context.scope.DefaultScopeStrategy;
 import org.apache.tuscany.core.invocation.InvocationConfiguration;
 import org.apache.tuscany.core.invocation.ProxyConfiguration;
@@ -44,16 +13,16 @@
 import org.apache.tuscany.core.invocation.spi.ProxyInitializationException;
 import org.apache.tuscany.core.system.annotation.Autowire;
 import org.apache.tuscany.core.system.annotation.ParentContext;
-import org.apache.tuscany.model.assembly.Aggregate;
-import org.apache.tuscany.model.assembly.Component;
-import org.apache.tuscany.model.assembly.ComponentImplementation;
-import org.apache.tuscany.model.assembly.EntryPoint;
-import org.apache.tuscany.model.assembly.Extensible;
-import org.apache.tuscany.model.assembly.ExternalService;
-import org.apache.tuscany.model.assembly.Module;
-import org.apache.tuscany.model.assembly.Scope;
+import org.apache.tuscany.model.assembly.*;
 import org.apache.tuscany.model.assembly.impl.AssemblyFactoryImpl;
 
+import javax.wsdl.Part;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 /**
  * The base implementation of an aggregate context
  * 
@@ -63,10 +32,6 @@
 
     public static final int DEFAULT_WAIT = 1000 * 60;
 
-    // ----------------------------------
-    // Fields
-    // ----------------------------------
-
     // The parent context, if one exists
     @ParentContext
     protected AggregateContext parentContext;
@@ -495,25 +460,6 @@
             throw e;
         }
         return ctx.getInstance(null);
-    }
-
-    public Object locateInstance(String qualifiedName) throws TargetException {
-        checkInit();
-        QualifiedName qName = new QualifiedName(qualifiedName);
-        ScopeContext scope = scopeIndex.get(qName.getPartName());
-        if (scope == null) {
-            TargetException e = new TargetException("Component not found");
-            e.setIdentifier(qualifiedName);
-            e.addContextName(getName());
-            throw e;
-        }
-        InstanceContext ctx = scope.getContext(qName.getPartName());
-        try {
-            return ctx.getInstance(qName);
-        } catch (TargetException e) {
-            e.addContextName(getName());
-            throw e;
-        }
     }
 
     public Map<Scope, ScopeContext> getScopeContexts() {



Mime
View raw message