tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r399161 [2/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...
Date Wed, 03 May 2006 06:09:51 GMT
Added: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleCompositeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleCompositeContext.java?rev=399161&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleCompositeContext.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/SimpleCompositeContext.java Tue May  2 23:09:37 2006
@@ -0,0 +1,106 @@
+/**
+ *
+ * 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 java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.core.config.ConfigurationException;
+import org.apache.tuscany.core.context.event.ModuleStart;
+import org.apache.tuscany.core.context.event.ModuleStop;
+import org.apache.tuscany.core.context.impl.AbstractContext;
+import org.apache.tuscany.model.assembly.Composite;
+import org.apache.tuscany.model.assembly.Extensible;
+import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.spi.QualifiedName;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class SimpleCompositeContext extends AbstractContext implements CompositeContext {
+    private CompositeContext parent;
+    private final Map<String, Context> children = new HashMap<String, Context>();
+
+    public SimpleCompositeContext(String name) {
+        super(name);
+    }
+
+    public void start() throws CoreRuntimeException {
+        for (Context context : children.values()) {
+            context.start();
+        }
+        publish(new ModuleStart(this));
+    }
+
+    public void stop() throws CoreRuntimeException {
+        publish(new ModuleStop(this));
+        for (Context context : children.values()) {
+            context.stop();
+        }
+    }
+
+    public CompositeContext getParent() {
+        return parent;
+    }
+
+    public void setParent(CompositeContext parent) {
+        this.parent = parent;
+    }
+
+    public void registerContext(Context context) {
+        if (context.getParent() != null) {
+            throw new IllegalStateException("Already registered");
+        }
+        String name = context.getName();
+        if (children.containsKey(name)) {
+            DuplicateNameException e = new DuplicateNameException(name);
+            e.setIdentifier(name);
+            e.addContextName(getName());
+            throw e;
+        }
+        context.setParent(this);
+        children.put(name, context);
+    }
+
+    public Context getContext(String name) {
+        if (name == null) {
+            throw new IllegalArgumentException("name is null");
+        }
+        return children.get(name);
+    }
+
+    public Object getInstance(QualifiedName name) throws TargetException {
+        if (name == null) {
+            throw new IllegalArgumentException("name is null");
+        }
+        Context context = getContext(name.getPortName());
+        if (context == null) {
+            return null;
+        }
+        return context.getInstance(null);
+    }
+
+    @Deprecated
+    public void registerModelObject(Extensible model) throws ConfigurationException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Deprecated
+    public Composite getComposite() {
+        throw new UnsupportedOperationException();
+    }
+}

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

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

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/AbstractEvent.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/AbstractEvent.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/AbstractEvent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/AbstractEvent.java Tue May  2 23:09:37 2006
@@ -13,12 +13,14 @@
  */
 package org.apache.tuscany.core.context.event;
 
+import org.apache.tuscany.spi.event.Event;
+
 /**
  * A basic implementation of a runtime event
  *
  * @version $$Rev$$ $$Date$$
  */
-public abstract class AbstractEvent implements Event{
+public abstract class AbstractEvent implements Event {
 
     protected transient Object source;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleEvent.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleEvent.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleEvent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/ModuleEvent.java Tue May  2 23:09:37 2006
@@ -13,11 +13,13 @@
  */
 package org.apache.tuscany.core.context.event;
 
+import org.apache.tuscany.spi.event.Event;
+
 /**
  * Implemented by runtime events associated with a module, e.g. lifecycle events 
  *
  * @version $$Rev$$ $$Date$$
  */
-public interface ModuleEvent extends Event{
+public interface ModuleEvent extends Event {
 
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionEvent.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionEvent.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionEvent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/event/SessionEvent.java Tue May  2 23:09:37 2006
@@ -13,6 +13,8 @@
  */
 package org.apache.tuscany.core.context.event;
 
+import org.apache.tuscany.spi.event.Event;
+
 /**
  * Implemented by runtime events associated with a session. There may be multiple session types in the runtime such as
  * HTTP-based or conversational.

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/filter/TrueFilter.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/filter/TrueFilter.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/filter/TrueFilter.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/filter/TrueFilter.java Tue May  2 23:09:37 2006
@@ -1,7 +1,7 @@
 package org.apache.tuscany.core.context.filter;
 
-import org.apache.tuscany.core.context.EventFilter;
-import org.apache.tuscany.core.context.event.Event;
+import org.apache.tuscany.spi.event.EventFilter;
+import org.apache.tuscany.spi.event.Event;
 
 /**
  * An event filter that always returns a true condition

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java Tue May  2 23:09:37 2006
@@ -13,7 +13,7 @@
  */
 package org.apache.tuscany.core.context.impl;
 
-import org.apache.tuscany.core.builder.BuilderConfigException;
+import org.apache.tuscany.spi.builder.BuilderConfigException;
 import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.config.ConfigurationException;
 import org.apache.tuscany.core.context.AutowireContext;
@@ -26,11 +26,12 @@
 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.QualifiedName;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.wire.WireFactory;
 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.spi.context.TargetException;
 import org.apache.tuscany.core.context.MissingImplementationException;
 import org.apache.tuscany.core.context.MissingContextFactoryException;
 import org.apache.tuscany.core.context.ProxyConfigurationException;
@@ -38,18 +39,16 @@
 import org.apache.tuscany.core.context.AutowireResolutionException;
 import org.apache.tuscany.core.context.Lifecycle;
 import org.apache.tuscany.core.context.event.RequestEnd;
-import org.apache.tuscany.core.context.event.Event;
+import org.apache.tuscany.spi.event.Event;
 import org.apache.tuscany.core.context.event.SessionBound;
 import org.apache.tuscany.core.context.event.SessionEvent;
 import org.apache.tuscany.core.context.scope.DefaultScopeStrategy;
 import org.apache.tuscany.core.wire.InvocationConfiguration;
 import org.apache.tuscany.core.wire.WireConfiguration;
-import org.apache.tuscany.core.wire.WireFactory;
-import org.apache.tuscany.core.wire.WireFactoryInitException;
-import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.WireFactoryInitException;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
 import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.core.system.annotation.ParentContext;
 import org.apache.tuscany.core.system.assembly.SystemBinding;
 import org.apache.tuscany.model.assembly.Composite;
 import org.apache.tuscany.model.assembly.Component;
@@ -86,8 +85,6 @@
 
     public static final int DEFAULT_WAIT = 1000 * 60;
 
-    protected CompositeContext parentContext;
-
     // The parent configuration context, if one exists
     @Autowire
     protected ConfigurationContext configurationContext;
@@ -143,7 +140,7 @@
         this.eventContext = ctx;
         this.configurationContext = configCtx;
         scopeIndex = new ConcurrentHashMap<String, ScopeContext>();
-        parentContext = parent;
+        setParent(parent);
         // FIXME the factory should be injected
         module = new AssemblyFactoryImpl().createModule();
     }
@@ -251,20 +248,8 @@
         this.configurationContext = context;
     }
 
-    public CompositeContext getParent() {
-        return parentContext;
-    }
+    public void registerContext(Context child) {
 
-    @ParentContext
-    public void setParent(CompositeContext parent){
-        parentContext = parent;
-    }
-
-    public void registerModelObjects(List<? extends Extensible> models) throws ConfigurationException {
-        assert (models != null) : "Model object collection was null";
-        for (Extensible model : models) {
-            registerModelObject(model);
-        }
     }
 
     public void registerModelObject(Extensible model) throws ConfigurationException {

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractContext.java Tue May  2 23:09:37 2006
@@ -16,16 +16,9 @@
  */
 package org.apache.tuscany.core.context.impl;
 
+import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.context.Context;
-import org.apache.tuscany.core.context.RuntimeEventListener;
-import org.apache.tuscany.core.context.EventFilter;
-import org.apache.tuscany.core.context.event.Event;
-import org.apache.tuscany.core.context.filter.TrueFilter;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ConcurrentHashMap;
+import org.apache.tuscany.core.system.annotation.ParentContext;
 
 /**
  * Functionality common to all <code>Context<code> implementations
@@ -33,6 +26,7 @@
  * @version $Rev$ $Date$
  */
 public abstract class AbstractContext extends AbstractLifecycle implements Context {
+    private CompositeContext parentContext;
 
     public AbstractContext() {
     }
@@ -41,5 +35,12 @@
         super(name);
     }
 
+    public CompositeContext getParent() {
+        return parentContext;
+    }
 
+    @ParentContext
+    public void setParent(CompositeContext parent){
+        parentContext = parent;
+    }
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractLifecycle.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractLifecycle.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractLifecycle.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractLifecycle.java Tue May  2 23:09:37 2006
@@ -22,18 +22,19 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.tuscany.core.context.RuntimeEventListener;
-import org.apache.tuscany.core.context.EventFilter;
+import org.apache.tuscany.spi.event.EventFilter;
 import org.apache.tuscany.core.context.Lifecycle;
+import org.apache.tuscany.core.context.CoreRuntimeException;
 import org.apache.tuscany.core.context.filter.TrueFilter;
-import org.apache.tuscany.core.context.event.Event;
+import org.apache.tuscany.spi.event.Event;
 
 /**
  * @version $Rev$ $Date$
  */
-public class AbstractLifecycle {
+public abstract class AbstractLifecycle implements Lifecycle {
     private static final EventFilter TRUE_FILTER = new TrueFilter();
     protected String name;
-    protected int lifecycleState = Lifecycle.UNINITIALIZED;
+    protected int lifecycleState = UNINITIALIZED;
     // Listeners for context events
     private Map<EventFilter, List<RuntimeEventListener>> listeners;
 
@@ -54,6 +55,18 @@
 
     public int getLifecycleState() {
         return lifecycleState;
+    }
+
+    protected void setLifecycleState(int lifecycleState) {
+        this.lifecycleState = lifecycleState;
+    }
+
+    public void start() throws CoreRuntimeException {
+        setLifecycleState(STARTED);
+    }
+
+    public void stop() throws CoreRuntimeException {
+        setLifecycleState(STOPPED);
     }
 
     public void addListener(RuntimeEventListener listener) {

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java Tue May  2 23:09:37 2006
@@ -26,11 +26,11 @@
 import org.apache.tuscany.core.context.ConfigurationContext;
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.core.context.ScopeContext;
 import org.apache.tuscany.core.context.ScopeStrategy;
 import org.apache.tuscany.core.context.ServiceNotFoundException;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.spi.context.TargetException;
 import org.apache.tuscany.core.system.annotation.Autowire;
 
 /**

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java Tue May  2 23:09:37 2006
@@ -13,14 +13,14 @@
  */
 package org.apache.tuscany.core.context.impl;
 
-import org.apache.tuscany.core.context.QualifiedName;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
+import org.apache.tuscany.spi.wire.ProxyCreationException;
+import org.apache.tuscany.spi.context.TargetException;
 import org.apache.tuscany.core.context.EntryPointContext;
 import org.apache.tuscany.core.context.ContextInitException;
 import org.apache.tuscany.core.context.CoreRuntimeException;
 import org.apache.tuscany.core.wire.jdk.JDKInvocationHandler;
-import org.apache.tuscany.core.wire.ProxyCreationException;
-import org.apache.tuscany.core.wire.SourceWireFactory;
 import org.apache.tuscany.core.message.MessageFactory;
 
 import java.lang.reflect.InvocationHandler;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java Tue May  2 23:09:37 2006
@@ -13,13 +13,13 @@
  */
 package org.apache.tuscany.core.context.impl;
 
-import org.apache.tuscany.core.builder.ObjectFactory;
-import org.apache.tuscany.core.context.QualifiedName;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.context.TargetException;
 import org.apache.tuscany.core.context.CoreRuntimeException;
 import org.apache.tuscany.core.context.ExternalServiceContext;
-import org.apache.tuscany.core.wire.ProxyCreationException;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.ProxyCreationException;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
 
 /**
  * The default implementation of an external service context

Added: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/POJOInstanceContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/POJOInstanceContextFactory.java?rev=399161&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/POJOInstanceContextFactory.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/POJOInstanceContextFactory.java Tue May  2 23:09:37 2006
@@ -0,0 +1,74 @@
+/**
+ *
+ * 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.impl;
+
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.core.context.CoreRuntimeException;
+import org.apache.tuscany.core.context.InstanceContext;
+import org.apache.tuscany.core.context.InstanceContextFactory;
+import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.core.injection.EventInvoker;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class POJOInstanceContextFactory<T> implements InstanceContextFactory {
+    private final ObjectFactory<T> objectFactory;
+    private EventInvoker<T> initInvoker;
+    private EventInvoker<T> destroyInvoker;
+
+    public POJOInstanceContextFactory(ObjectFactory<T> objectFactory,
+                                      EventInvoker<T> initInvoker,
+                                      EventInvoker<T> destroyInvoker) {
+        this.objectFactory = objectFactory;
+        this.initInvoker = initInvoker;
+        this.destroyInvoker = destroyInvoker;
+    }
+
+    public InstanceContext createContext() throws TargetException {
+        T instance = objectFactory.getInstance();
+        return new POJOInstanceContext(instance);
+    }
+
+    protected class POJOInstanceContext extends AbstractLifecycle implements InstanceContext {
+        private final T instance;
+
+        public POJOInstanceContext(T instance) {
+            this.instance = instance;
+        }
+
+        public T getInstance() {
+            return instance;
+        }
+
+        public void start() throws CoreRuntimeException {
+            setLifecycleState(INITIALIZING);
+            if (initInvoker != null) {
+                initInvoker.invokeEvent(instance);
+            }
+            setLifecycleState(STARTED);
+        }
+
+        public void stop() throws CoreRuntimeException {
+            setLifecycleState(STOPPING);
+            if (destroyInvoker != null) {
+                destroyInvoker.invokeEvent(instance);
+            }
+            setLifecycleState(STOPPED);
+        }
+    }
+}

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

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

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java Tue May  2 23:09:37 2006
@@ -23,9 +23,9 @@
 import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.core.context.ScopeContext;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.spi.context.TargetException;
 import org.apache.tuscany.core.context.impl.AbstractLifecycle;
 
 /**

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/CompositeScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/CompositeScopeContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/CompositeScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/CompositeScopeContext.java Tue May  2 23:09:37 2006
@@ -25,12 +25,12 @@
 import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.core.context.ScopeContext;
 import org.apache.tuscany.core.context.ScopeInitializationException;
 import org.apache.tuscany.core.context.ScopeRuntimeException;
-import org.apache.tuscany.core.context.TargetException;
-import org.apache.tuscany.core.context.event.Event;
+import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.spi.event.Event;
 import org.apache.tuscany.core.context.event.ModuleStart;
 import org.apache.tuscany.core.context.event.ModuleStop;
 import org.apache.tuscany.core.context.impl.AbstractLifecycle;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeContext.java Tue May  2 23:09:37 2006
@@ -21,10 +21,10 @@
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.context.CoreRuntimeException;
 import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.spi.context.TargetException;
 import org.apache.tuscany.core.context.Lifecycle;
 import org.apache.tuscany.core.context.event.InstanceCreated;
-import org.apache.tuscany.core.context.event.Event;
+import org.apache.tuscany.spi.event.Event;
 import org.apache.tuscany.core.context.event.ModuleStart;
 import org.apache.tuscany.core.context.event.ModuleStop;
 

Added: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeManager.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeManager.java?rev=399161&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeManager.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeManager.java Tue May  2 23:09:37 2006
@@ -0,0 +1,56 @@
+/**
+ *
+ * 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.scope;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.tuscany.core.context.InstanceContext;
+import org.apache.tuscany.core.context.InstanceContextFactory;
+import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.core.context.CoreRuntimeException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ModuleScopeManager extends ScopeManagerSupport {
+    private final Map<InstanceContextFactory, InstanceContext> cache;
+
+    public ModuleScopeManager() {
+        cache = new ConcurrentHashMap<InstanceContextFactory, InstanceContext>();
+    }
+
+    public InstanceContext getInstance(InstanceContextFactory contextFactory) throws TargetException {
+        synchronized (contextFactory) {
+            InstanceContext instanceContext = cache.get(contextFactory);
+            if (instanceContext == null) {
+                instanceContext = contextFactory.createContext();
+                instanceContext.start();
+                cache.put(contextFactory, instanceContext);
+            }
+            return instanceContext;
+        }
+    }
+
+    public void stop() throws CoreRuntimeException {
+        setLifecycleState(STOPPING);
+        for (InstanceContext instanceContext : cache.values()) {
+            instanceContext.stop();
+        }
+        setLifecycleState(STOPPED);
+    }
+}

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

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

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java Tue May  2 23:09:37 2006
@@ -21,10 +21,10 @@
 import org.apache.tuscany.core.context.CoreRuntimeException;
 import org.apache.tuscany.core.context.EventContext;
 import org.apache.tuscany.core.context.AtomicContext;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.spi.context.TargetException;
 import org.apache.tuscany.core.context.Lifecycle;
 import org.apache.tuscany.core.context.event.InstanceCreated;
-import org.apache.tuscany.core.context.event.Event;
+import org.apache.tuscany.spi.event.Event;
 import org.apache.tuscany.core.context.event.RequestEnd;
 import org.apache.tuscany.core.context.event.RequestStart;
 

Added: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ScopeManagerSupport.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ScopeManagerSupport.java?rev=399161&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ScopeManagerSupport.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/ScopeManagerSupport.java Tue May  2 23:09:37 2006
@@ -0,0 +1,38 @@
+/**
+ *
+ * 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.scope;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.tuscany.core.context.ScopeManager;
+import org.apache.tuscany.core.context.Lifecycle;
+import org.apache.tuscany.core.context.impl.AbstractLifecycle;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public abstract class ScopeManagerSupport<K> extends AbstractLifecycle implements ScopeManager, Lifecycle {
+    private final Map<K, ?> scopes = new ConcurrentHashMap<K, Object>();
+
+    protected void beginScope(K scopeKey) {
+    }
+
+    protected void endScope(K scopeKey) {
+
+    }
+}

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

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

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/SessionScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/SessionScopeContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/SessionScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/SessionScopeContext.java Tue May  2 23:09:37 2006
@@ -22,9 +22,9 @@
 import org.apache.tuscany.core.context.CoreRuntimeException;
 import org.apache.tuscany.core.context.EventContext;
 import org.apache.tuscany.core.context.ScopeRuntimeException;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.spi.context.TargetException;
 import org.apache.tuscany.core.context.Lifecycle;
-import org.apache.tuscany.core.context.event.Event;
+import org.apache.tuscany.spi.event.Event;
 import org.apache.tuscany.core.context.event.HttpSessionEvent;
 import org.apache.tuscany.core.context.event.InstanceCreated;
 import org.apache.tuscany.core.context.event.SessionEnd;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeContext.java Tue May  2 23:09:37 2006
@@ -21,7 +21,7 @@
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.context.CoreRuntimeException;
 import org.apache.tuscany.core.context.Lifecycle;
-import org.apache.tuscany.core.context.event.Event;
+import org.apache.tuscany.spi.event.Event;
 import org.apache.tuscany.core.context.event.ModuleStop;
 
 import java.util.Map;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java Tue May  2 23:09:37 2006
@@ -1,13 +1,13 @@
 package org.apache.tuscany.core.extension;
 
-import org.apache.tuscany.core.builder.BuilderConfigException;
-import org.apache.tuscany.core.builder.BuilderException;
+import org.apache.tuscany.spi.builder.BuilderConfigException;
+import org.apache.tuscany.spi.builder.BuilderException;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
 import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
 import org.apache.tuscany.core.system.annotation.Autowire;
-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.core.wire.service.WireFactoryService;
 import org.apache.tuscany.model.assembly.AssemblyObject;
 import org.apache.tuscany.model.assembly.Component;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/EntryPointBuilderSupport.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/EntryPointBuilderSupport.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/EntryPointBuilderSupport.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/EntryPointBuilderSupport.java Tue May  2 23:09:37 2006
@@ -13,13 +13,13 @@
  */
 package org.apache.tuscany.core.extension;
 
-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.core.builder.ContextFactoryBuilderRegistry;
 import org.apache.tuscany.core.builder.impl.EntryPointContextFactory;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.core.wire.SourceWireFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
 import org.apache.tuscany.core.wire.service.WireFactoryService;
 import org.apache.tuscany.model.assembly.AssemblyObject;
 import org.apache.tuscany.model.assembly.Binding;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceBuilderSupport.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceBuilderSupport.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceBuilderSupport.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/ExternalServiceBuilderSupport.java Tue May  2 23:09:37 2006
@@ -1,11 +1,11 @@
 package org.apache.tuscany.core.extension;
 
-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.core.builder.ContextFactoryBuilderRegistry;
 import org.apache.tuscany.core.builder.impl.ExternalServiceContextFactory;
 import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
 import org.apache.tuscany.core.wire.service.WireFactoryService;
 import org.apache.tuscany.model.assembly.AssemblyObject;
 import org.apache.tuscany.model.assembly.Binding;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java Tue May  2 23:09:37 2006
@@ -13,17 +13,17 @@
  */
 package org.apache.tuscany.core.extension;
 
-import org.apache.tuscany.core.builder.BuilderConfigException;
+import org.apache.tuscany.spi.builder.BuilderConfigException;
 import org.apache.tuscany.core.builder.WireBuilder;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
 import org.apache.tuscany.core.context.ScopeContext;
 import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.core.system.annotation.Autowire;
 import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
-import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.apache.tuscany.core.wire.TargetInvoker;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
 import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
+import org.apache.tuscany.spi.wire.TargetInvoker;
 import org.osoa.sca.annotations.Init;
 
 import java.lang.reflect.Method;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java Tue May  2 23:09:37 2006
@@ -1,7 +1,7 @@
 package org.apache.tuscany.core.injection;
 
 import org.apache.tuscany.core.builder.ContextResolver;
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.core.context.CompositeContext;
 
 /**

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

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java Tue May  2 23:09:37 2006
@@ -1,5 +1,7 @@
 package org.apache.tuscany.core.injection;
 
+import org.apache.tuscany.spi.ObjectCreationException;
+
 /**
  * Implementations inject a pre-configured value on an instance
  * 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java Tue May  2 23:09:37 2006
@@ -14,11 +14,12 @@
 package org.apache.tuscany.core.injection;
 
 import org.apache.tuscany.core.builder.ContextResolver;
-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.Context;
-import org.apache.tuscany.core.context.QualifiedName;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.context.TargetException;
 
 /**
  * Returns a direct reference to a target service exposed in another composite, i.e. the factory avoids creating proxies

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java Tue May  2 23:09:37 2006
@@ -19,7 +19,8 @@
 import javax.naming.Context;
 import javax.naming.NamingException;
 
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
 
 /**
  * An implementation of ObjectFactory that creates instances

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java Tue May  2 23:09:37 2006
@@ -1,6 +1,7 @@
 package org.apache.tuscany.core.injection;
 
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java Tue May  2 23:09:37 2006
@@ -14,8 +14,9 @@
 package org.apache.tuscany.core.injection;
 
 import org.apache.tuscany.core.builder.ContextResolver;
-import org.apache.tuscany.core.builder.ObjectFactory;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.model.assembly.ConfiguredService;
 
 /**

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java Tue May  2 23:09:37 2006
@@ -1,6 +1,7 @@
 package org.apache.tuscany.core.injection;
 
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java Tue May  2 23:09:37 2006
@@ -1,6 +1,6 @@
 package org.apache.tuscany.core.injection;
 
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
 
 /**
  * Implementation of ObjectFactory that returns a single instance, typically an immutable type.

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

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java Tue May  2 23:09:37 2006
@@ -29,7 +29,7 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.tuscany.common.resource.ResourceLoader;
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.core.config.ConfigurationLoadException;
 import org.apache.tuscany.core.loader.InvalidPropertyFactoryException;
 import org.apache.tuscany.core.loader.StAXPropertyFactory;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java Tue May  2 23:09:37 2006
@@ -23,7 +23,7 @@
 import javax.naming.NamingException;
 
 import org.apache.tuscany.core.loader.StAXPropertyFactory;
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.core.config.ConfigurationLoadException;
 import org.apache.tuscany.core.injection.JNDIObjectFactory;
 import org.apache.tuscany.model.assembly.Property;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java Tue May  2 23:09:37 2006
@@ -16,7 +16,7 @@
  */
 package org.apache.tuscany.core.loader.impl;
 
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.core.config.ConfigurationLoadException;
 import org.apache.tuscany.core.injection.SingletonObjectFactory;
 import org.apache.tuscany.core.loader.StAXPropertyFactory;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/MessageFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/MessageFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/MessageFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/MessageFactory.java Tue May  2 23:09:37 2006
@@ -16,6 +16,8 @@
  */
 package org.apache.tuscany.core.message;
 
+import org.apache.tuscany.spi.wire.Message;
+
 /**
  * A factory for creating messages flowed through a wire during an invocation 
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageFactoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageFactoryImpl.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageFactoryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageFactoryImpl.java Tue May  2 23:09:37 2006
@@ -16,7 +16,7 @@
  */
 package org.apache.tuscany.core.message.impl;
 
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.Message;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Init;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java Tue May  2 23:09:37 2006
@@ -16,9 +16,9 @@
  */
 package org.apache.tuscany.core.message.impl;
 
-import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.wire.MessageChannel;
-import org.apache.tuscany.core.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.MessageChannel;
+import org.apache.tuscany.spi.wire.TargetInvoker;
 
 /**
  * The default implementation of a message flowed through a wire during an invocation
@@ -36,49 +36,49 @@
     }
 
     /**
-     * @see org.apache.tuscany.core.message.Message#getBody()
+     * @see org.apache.tuscany.spi.wire.Message#getBody()
      */
     public Object getBody() {
         return body;
     }
 
     /**
-     * @see org.apache.tuscany.core.message.Message#setBody(java.lang.Object)
+     * @see org.apache.tuscany.spi.wire.Message#setBody(java.lang.Object)
      */
     public void setBody(Object body) {
         this.body = body;
     }
 
     /**
-     * @see org.apache.tuscany.core.message.Message#getCallbackChannel()
+     * @see org.apache.tuscany.spi.wire.Message#getCallbackChannel()
      */
     public MessageChannel getCallbackChannel() {
         return this;
     }
 
     /**
-     * @see org.apache.tuscany.core.wire.MessageChannel#send(org.apache.tuscany.core.message.Message)
+     * @see org.apache.tuscany.spi.wire.MessageChannel#send(org.apache.tuscany.spi.wire.Message)
      */
     public void send(Message message) {
         relatedCallbackMessage = message;
     }
 
     /**
-     * @see org.apache.tuscany.core.message.Message#getRelatedCallbackMessage()
+     * @see org.apache.tuscany.spi.wire.Message#getRelatedCallbackMessage()
      */
     public Message getRelatedCallbackMessage() {
         return relatedCallbackMessage;
     }
 
     /**
-     * @see org.apache.tuscany.core.message.Message#setTargetInvoker(org.apache.tuscany.core.wire.TargetInvoker)
+     * @see org.apache.tuscany.spi.wire.Message#setTargetInvoker(org.apache.tuscany.spi.wire.TargetInvoker)
      */
     public void setTargetInvoker(TargetInvoker invoker) {
         this.invoker = invoker;
     }
 
     /**
-     * @see org.apache.tuscany.core.message.Message#getTargetInvoker()
+     * @see org.apache.tuscany.spi.wire.Message#getTargetInvoker()
      */
     public TargetInvoker getTargetInvoker() {
         return invoker;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java Tue May  2 23:09:37 2006
@@ -13,10 +13,8 @@
  */
 package org.apache.tuscany.core.runtime;
 
-import java.util.List;
-
 import org.apache.tuscany.common.monitor.MonitorFactory;
-import org.apache.tuscany.core.builder.BuilderConfigException;
+import org.apache.tuscany.spi.builder.BuilderConfigException;
 import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
 import org.apache.tuscany.core.builder.HierarchicalWireBuilder;
 import org.apache.tuscany.core.builder.WireBuilder;
@@ -29,18 +27,18 @@
 import org.apache.tuscany.core.context.ConfigurationContext;
 import org.apache.tuscany.core.context.CoreRuntimeException;
 import org.apache.tuscany.core.context.EventException;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.core.context.ScopeContext;
 import org.apache.tuscany.core.context.SystemCompositeContext;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.spi.context.TargetException;
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.context.impl.AbstractContext;
 import org.apache.tuscany.core.context.impl.CompositeContextImpl;
 import org.apache.tuscany.core.context.impl.EventContextImpl;
 import org.apache.tuscany.core.system.context.SystemCompositeContextImpl;
 import org.apache.tuscany.core.system.context.SystemScopeStrategy;
-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.AssemblyObject;
 import org.apache.tuscany.model.assembly.Composite;
 import org.apache.tuscany.model.assembly.Extensible;
@@ -125,10 +123,8 @@
         rootContext.registerModelObject(model);
     }
 
-    public void registerModelObjects(List<? extends Extensible> models) throws ConfigurationException {
-        for (Extensible model : models) {
-            registerModelObject(model);
-        }
+    public void registerContext(Context context) {
+        throw new UnsupportedOperationException("Cannot register children to the runtime context");
     }
 
     public CompositeContext getParent() {

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java Tue May  2 23:09:37 2006
@@ -20,12 +20,12 @@
 import java.util.Set;
 
 import org.apache.tuscany.common.monitor.MonitorFactory;
-import org.apache.tuscany.core.builder.BuilderConfigException;
-import org.apache.tuscany.core.builder.BuilderException;
+import org.apache.tuscany.spi.builder.BuilderConfigException;
+import org.apache.tuscany.spi.builder.BuilderException;
+import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.builder.ContextResolver;
 import org.apache.tuscany.core.builder.NoAccessorException;
-import org.apache.tuscany.core.builder.ObjectFactory;
 import org.apache.tuscany.core.builder.UnknownTypeException;
 import org.apache.tuscany.core.builder.impl.ArrayMultiplicityObjectFactory;
 import org.apache.tuscany.core.builder.impl.ListMultiplicityObjectFactory;

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

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

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java Tue May  2 23:09:37 2006
@@ -10,8 +10,8 @@
 import org.apache.tuscany.core.injection.EventInvoker;
 import org.apache.tuscany.core.injection.Injector;
 import org.apache.tuscany.core.injection.PojoObjectFactory;
-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.system.context.SystemAtomicContext;
 import org.apache.tuscany.model.assembly.Module;
 import org.apache.tuscany.model.assembly.Scope;
@@ -24,7 +24,7 @@
  * A <code>ContextFactory</code> that handles system component implementation types, which may be either simple, leaf
  * types or an composites.
  * <p>
- * For composite types, this factory delegates to an {@link org.apache.tuscany.core.builder.ObjectFactory} to create an
+ * For composite types, this factory delegates to an {@link org.apache.tuscany.spi.ObjectFactory} to create an
  * instance of the composite implementation and perform injection of configuration and references. Once an composite
  * instance is created, the factory will register the composite's children. This process may be done recursively in a
  * lazy fashion, descending down an composite hierarchy as a child composite is instantiated.

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java Tue May  2 23:09:37 2006
@@ -18,8 +18,8 @@
 import org.apache.tuscany.core.builder.ContextResolver;
 import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.context.EntryPointContext;
-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.core.system.context.SystemEntryPointContext;
 import org.apache.tuscany.model.assembly.Scope;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java Tue May  2 23:09:37 2006
@@ -16,14 +16,14 @@
 import org.apache.tuscany.core.builder.ContextCreationException;
 import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.builder.ContextResolver;
-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.injection.InterCompositeReferenceFactory;
 import org.apache.tuscany.core.system.context.SystemExternalServiceContext;
 import org.apache.tuscany.core.system.injection.AutowireObjectFactory;
-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;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java Tue May  2 23:09:37 2006
@@ -19,13 +19,13 @@
 
 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.Context;
 import org.apache.tuscany.core.injection.SingletonObjectFactory;
-import org.apache.tuscany.core.wire.WireFactory;
-import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.WireFactory;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
 import org.apache.tuscany.core.system.context.SystemAtomicContext;
 import org.apache.tuscany.model.assembly.Scope;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicContext.java Tue May  2 23:09:37 2006
@@ -16,14 +16,14 @@
  */
 package org.apache.tuscany.core.system.context;
 
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.core.injection.EventInvoker;
 import org.apache.tuscany.core.injection.ObjectCallbackException;
-import org.apache.tuscany.core.injection.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.core.context.AtomicContext;
 import org.apache.tuscany.core.context.impl.AbstractContext;
-import org.apache.tuscany.core.context.TargetException;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.core.context.ContextInitException;
 import org.apache.tuscany.core.context.event.InstanceCreated;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java Tue May  2 23:09:37 2006
@@ -32,7 +32,7 @@
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
 import org.apache.tuscany.core.system.config.SystemObjectContextFactory;
-import org.apache.tuscany.core.wire.WireFactoryFactory;
+import org.apache.tuscany.spi.wire.WireFactoryFactory;
 import org.apache.tuscany.core.wire.jdk.JDKWireFactoryFactory;
 
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java Tue May  2 23:09:37 2006
@@ -18,8 +18,8 @@
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.context.CoreRuntimeException;
 import org.apache.tuscany.core.context.EntryPointContext;
-import org.apache.tuscany.core.context.QualifiedName;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.context.TargetException;
 
 /**
  * Manages an entry point into a system module. System entry points cache a direct (i.e. non-proxied) reference to a
@@ -33,7 +33,7 @@
     private Object cachedInstance;
 
     private ContextResolver resolver;
-    
+
     private QualifiedName targetName;
 
     private  Class serviceInterface;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java Tue May  2 23:09:37 2006
@@ -13,11 +13,11 @@
  */
 package org.apache.tuscany.core.system.context;
 
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.core.context.impl.AbstractContext;
 import org.apache.tuscany.core.context.ExternalServiceContext;
-import org.apache.tuscany.core.context.QualifiedName;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.context.TargetException;
 
 /**
  * An implementation of an external service for system wiring. As system components are not proxied and the system

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java Tue May  2 23:09:37 2006
@@ -14,11 +14,11 @@
 package org.apache.tuscany.core.system.injection;
 
 import org.apache.tuscany.core.builder.ContextResolver;
-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.AutowireContext;
 import org.apache.tuscany.core.injection.FactoryInitException;
-import org.apache.tuscany.core.injection.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectCreationException;
 
 /**
  * Returns an instance by resolving against an AutowireContext.

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/InvokerInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/InvokerInterceptor.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/InvokerInterceptor.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/InvokerInterceptor.java Tue May  2 23:09:37 2006
@@ -13,17 +13,17 @@
  */
 package org.apache.tuscany.core.wire.impl;
 
-import org.apache.tuscany.core.wire.Interceptor;
-import org.apache.tuscany.core.wire.InvocationRuntimeException;
-import org.apache.tuscany.core.wire.TargetInvoker;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.InvocationRuntimeException;
+import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.Message;
 
 /**
  * Serves as a tail interceptor on a target wire chain. This implementation dispatches to the target invoker
  * passed inside the wire message. Target invokers are passed from the source in order to allow for caching of
  * target instances.
  * 
- * @see org.apache.tuscany.core.wire.TargetInvoker
+ * @see org.apache.tuscany.spi.wire.TargetInvoker
  * @version $Rev$ $Date$
  */
 public class InvokerInterceptor implements Interceptor {

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageChannelImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageChannelImpl.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageChannelImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageChannelImpl.java Tue May  2 23:09:37 2006
@@ -16,16 +16,16 @@
  */
 package org.apache.tuscany.core.wire.impl;
 
-import org.apache.tuscany.core.wire.MessageChannel;
-import org.apache.tuscany.core.wire.MessageHandler;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.MessageChannel;
+import org.apache.tuscany.spi.wire.MessageHandler;
+import org.apache.tuscany.spi.wire.Message;
 
 import java.util.List;
 
 /**
  * A channel comprising an ordered collection of message handlers.
  *
- *@see org.apache.tuscany.core.message.Message
+ *@see org.apache.tuscany.spi.wire.Message
  * @version $Rev$ $Date$
  */
 public class MessageChannelImpl implements MessageChannel {

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageDispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageDispatcher.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageDispatcher.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/MessageDispatcher.java Tue May  2 23:09:37 2006
@@ -16,9 +16,9 @@
  */
 package org.apache.tuscany.core.wire.impl;
 
-import org.apache.tuscany.core.wire.Interceptor;
-import org.apache.tuscany.core.wire.MessageHandler;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.MessageHandler;
+import org.apache.tuscany.spi.wire.Message;
 
 /**
  * A message handler that dispatches the message through an interceptor stack and the uses the response channel to

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/NullWireFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/NullWireFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/NullWireFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/NullWireFactory.java Tue May  2 23:09:37 2006
@@ -2,9 +2,9 @@
 
 import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.wire.WireConfiguration;
-import org.apache.tuscany.core.wire.ProxyCreationException;
-import org.apache.tuscany.core.wire.WireFactory;
-import org.apache.tuscany.core.wire.WireFactoryInitException;
+import org.apache.tuscany.spi.wire.ProxyCreationException;
+import org.apache.tuscany.spi.wire.WireFactory;
+import org.apache.tuscany.spi.wire.WireFactoryInitException;
 
 /**
  * Returns an actual implementation instance as opposed to a proxy. Used in cases where proxying may be optimized away.



Mime
View raw message