tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmar...@apache.org
Subject svn commit: r411356 [6/6] - in /incubator/tuscany/sandbox/jboynes/sca: commands/launcher/ containers/container.groovy/src/main/java/org/apache/tuscany/container/extension/loader/ containers/container.groovy/src/main/java/org/apache/tuscany/container/gr...
Date Sat, 03 Jun 2006 02:25:09 GMT
Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AbstractSCAObject.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AbstractContext.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AbstractSCAObject.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AbstractSCAObject.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AbstractContext.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AbstractContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AbstractSCAObject.java Fri Jun  2 19:25:01 2006
@@ -25,17 +25,17 @@
 import org.apache.tuscany.spi.event.TrueFilter;
 
 /**
- * Functionality common to all <code>Context<code> implementations
+ * Functionality common to all <code>SCAObject<code> implementations
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  */
-public abstract class AbstractContext<T> extends AbstractLifecycle implements Context<T> {
+public abstract class AbstractSCAObject<T> extends AbstractLifecycle implements SCAObject<T> {
     private final String name;
-    private final CompositeContext parent;
+    private final CompositeComponent parent;
     protected Map<EventFilter, List<RuntimeEventListener>> listeners;
     protected static final EventFilter TRUE_FILTER = new TrueFilter();
 
-    public AbstractContext(String name, CompositeContext<?> parent) {
+    public AbstractSCAObject(String name, CompositeComponent<?> parent) {
         this.name = name;
         this.parent = parent;
     }
@@ -44,7 +44,7 @@
         return name;
     }
 
-    public CompositeContext getParent() {
+    public CompositeComponent getParent() {
         return parent;
     }
 
@@ -101,6 +101,6 @@
     }
 
     public String toString() {
-        return "Context [" + name + "] in state [" + super.toString() + ']';
+        return "SCAObject [" + name + "] in state [" + super.toString() + ']';
     }
 }

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AtomicComponent.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AtomicContext.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AtomicComponent.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AtomicComponent.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AtomicContext.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AtomicContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AtomicComponent.java Fri Jun  2 19:25:01 2006
@@ -19,15 +19,14 @@
 import org.apache.tuscany.spi.ObjectCreationException;
 
 /**
- * A runtime entity that manages an leaf-type artifact and functions as the runtime analog to atomic
- * components configured in an assembly
+ * The runtime instantiation of an SCA atomic, or leaf-type, component
  *
  * @version $Rev$ $Date$
  */
-public interface AtomicContext<T> extends ComponentContext<T> {
+public interface AtomicComponent<T> extends Component<T> {
 
     /**
-     * Returns whether the context should be eagerly initialized
+     * Returns whether component instances should be eagerly initialized
      */
     boolean isEagerInit();
 

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

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

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Component.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ComponentContext.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Component.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Component.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ComponentContext.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ComponentContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Component.java Fri Jun  2 19:25:01 2006
@@ -9,21 +9,21 @@
 import org.apache.tuscany.spi.wire.InboundWire;
 
 /**
- * Provides a runtime context for application artifacts configured as components
+ * The runtime instantiation of an SCA component
  *
  * @version $$Rev$$ $$Date$$
  */
-public interface ComponentContext<T> extends Context<T> {
+public interface Component<T> extends SCAObject<T> {
 
     /**
      * Returns a service associated with the given name
      *
      * @throws TargetException if an error occurs retrieving the service instance
      */
-    Object getService(String name) throws TargetException;
+    Object getServiceInstance(String name) throws TargetException;
 
     /**
-     * Returns the service interfaces implemented by the context
+     * Returns the service interfaces implemented by the component
      */
     List<Class<?>> getServiceInterfaces();
 
@@ -58,7 +58,7 @@
 
     /**
      * Callback to create a {@link org.apache.tuscany.spi.wire.TargetInvoker} which dispatches to a service
-     * contained by the context
+     * offered by the component
      *
      * @param serviceName the name of the service
      * @param operation   the operation to invoke

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ComponentNotFoundException.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ContextNotFoundException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ComponentNotFoundException.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ComponentNotFoundException.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ContextNotFoundException.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ContextNotFoundException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ComponentNotFoundException.java Fri Jun  2 19:25:01 2006
@@ -1,23 +1,23 @@
 package org.apache.tuscany.spi.context;
 
 /**
- * Thrown when a runtime context cannot be found
+ * Thrown when a component cannot be found
  *
  * @version $$Rev$$ $$Date$$
  */
-public class ContextNotFoundException extends ContextRuntimeException {
-    public ContextNotFoundException() {
+public class ComponentNotFoundException extends ComponentRuntimeException {
+    public ComponentNotFoundException() {
     }
 
-    public ContextNotFoundException(String message) {
+    public ComponentNotFoundException(String message) {
         super(message);
     }
 
-    public ContextNotFoundException(String message, Throwable cause) {
+    public ComponentNotFoundException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public ContextNotFoundException(Throwable cause) {
+    public ComponentNotFoundException(Throwable cause) {
         super(cause);
     }
 }

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ComponentRuntimeException.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ContextRuntimeException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ComponentRuntimeException.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ComponentRuntimeException.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ContextRuntimeException.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ContextRuntimeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ComponentRuntimeException.java Fri Jun  2 19:25:01 2006
@@ -16,25 +16,25 @@
 import org.apache.tuscany.spi.CoreRuntimeException;
 
 /**
- * An unchecked exception encountered by an {@link Context}
+ * An unchecked exception encountered by an {@link SCAObject}
  *
  * @version $Rev: 392190 $ $Date: 2006-04-06 22:37:58 -0700 (Thu, 06 Apr 2006) $
  */
-public class ContextRuntimeException extends CoreRuntimeException {
+public class ComponentRuntimeException extends CoreRuntimeException {
 
-    public ContextRuntimeException() {
+    public ComponentRuntimeException() {
         super();
     }
 
-    public ContextRuntimeException(String message) {
+    public ComponentRuntimeException(String message) {
         super(message);
     }
 
-    public ContextRuntimeException(String message, Throwable cause) {
+    public ComponentRuntimeException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public ContextRuntimeException(Throwable cause) {
+    public ComponentRuntimeException(Throwable cause) {
         super(cause);
     }
 

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

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

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/CompositeComponent.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/CompositeContext.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/CompositeComponent.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/CompositeComponent.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/CompositeContext.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/CompositeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/CompositeComponent.java Fri Jun  2 19:25:01 2006
@@ -21,46 +21,50 @@
 import org.apache.tuscany.spi.event.RuntimeEventListener;
 
 /**
- * A runtime artifact that contains child component contexts and functions as the runtime analog to composites
- * configured in an assembly
+ * The runtime instantiation of an SCA composite component. Composites may contain child components, offer
+ * services, and have references
  *
  * @version $Rev: 393708 $ $Date: 2006-04-12 21:29:05 -0700 (Wed, 12 Apr 2006) $
  */
-public interface CompositeContext<T> extends ComponentContext<T>, RuntimeEventListener {
+public interface CompositeComponent<T> extends Component<T>, RuntimeEventListener {
     /**
-     * Register a Context as a child of this composite.
+     * Registers a child of this composite.
      *
      * @param context the context to add as a child
-     * @throws InvalidContextTypeException
+     * @throws InvalidComponentTypeException
      */
-    void registerContext(Context context) throws InvalidContextTypeException;
+    void register(SCAObject context) throws InvalidComponentTypeException;
 
     /**
-     * Returns the child context associated with a given name
+     * Returns the child associated with a given name
      */
-    Context getContext(String name);
+    SCAObject getChild(String name);
 
     /**
-     * Returns the child contexts contained by the composite
+     * Returns the children contained by the composite
      */
-    List<Context> getContexts();
+    List<SCAObject> getChildren();
 
     /**
-     * Returns the service contexts contained by the composite
+     * Returns the services contained by the composite
      */
-    List<ServiceContext> getServiceContexts();
+    List<Service> getServices();
 
     /**
-     * Returns the service context associated with the given name
+     * Returns the service associated with the given name
      *
-     * @throws ContextNotFoundException
+     * @throws ComponentNotFoundException
      */
-    ServiceContext getServiceContext(String name) throws ContextNotFoundException;
+    Service getService(String name) throws ComponentNotFoundException;
 
     /**
-     * Returns the reference context contained by the composite
+     * Returns the references contained by the composite
      */
-    List<ReferenceContext> getReferenceContexts();
+    List<Reference> getReferences();
 
+    /**
+     *
+     * @param scopeContext
+     */
     void setScopeContext(ScopeContext scopeContext);
 }

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

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

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/DuplicateNameException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/DuplicateNameException.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/DuplicateNameException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/DuplicateNameException.java Fri Jun  2 19:25:01 2006
@@ -1,11 +1,11 @@
 package org.apache.tuscany.spi.context;
 
 /**
- * Denotes an attempt to add a context with a name equal to an existing context
+ * Denotes an attempt to add an child to a composite component with a name equal to an existing child
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  */
-public class DuplicateNameException extends ContextRuntimeException {
+public class DuplicateNameException extends ComponentRuntimeException {
 
     public DuplicateNameException() {
         super();

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/InstanceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/InstanceWrapper.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/InstanceWrapper.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/InstanceWrapper.java Fri Jun  2 19:25:01 2006
@@ -19,7 +19,7 @@
 import org.apache.tuscany.spi.Lifecycle;
 
 /**
- * Provides lifecycle management for an implementation instance associated with an {@link AtomicContext} for use by the atomic context's
+ * Provides lifecycle management for an implementation instance associated with an {@link AtomicComponent} for use by the atomic context's
  * associated {@link ScopeContext}
  *
  * @version $Rev$ $Date$

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/InvalidComponentTypeException.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/InvalidContextTypeException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/InvalidComponentTypeException.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/InvalidComponentTypeException.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/InvalidContextTypeException.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/InvalidContextTypeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/InvalidComponentTypeException.java Fri Jun  2 19:25:01 2006
@@ -5,19 +5,19 @@
  *
  * @version $$Rev$$ $$Date$$
  */
-public class InvalidContextTypeException extends ContextRuntimeException{
-    public InvalidContextTypeException() {
+public class InvalidComponentTypeException extends ComponentRuntimeException {
+    public InvalidComponentTypeException() {
     }
 
-    public InvalidContextTypeException(String message) {
+    public InvalidComponentTypeException(String message) {
         super(message);
     }
 
-    public InvalidContextTypeException(String message, Throwable cause) {
+    public InvalidComponentTypeException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public InvalidContextTypeException(Throwable cause) {
+    public InvalidComponentTypeException(Throwable cause) {
         super(cause);
     }
 }

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Reference.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ReferenceContext.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Reference.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Reference.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ReferenceContext.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ReferenceContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Reference.java Fri Jun  2 19:25:01 2006
@@ -3,16 +3,16 @@
 import java.lang.reflect.Method;
 
 import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
 import org.apache.tuscany.spi.wire.TargetInvoker;
 import org.apache.tuscany.spi.wire.WireInvocationHandler;
-import org.apache.tuscany.spi.wire.OutboundWire;
 
 /**
- * Manages a reference configured for a binding
+ * Manages an SCA reference configured for a binding
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  */
-public interface ReferenceContext<T> extends Context<T> {
+public interface Reference<T> extends SCAObject<T> {
 
     /**
      * Returns the service interface configured for the reference
@@ -31,8 +31,8 @@
     public OutboundWire<T> getOutboundWire();
 
     /**
-     * Callback to create a {@link org.apache.tuscany.spi.wire.TargetInvoker} which dispatches to a service
-     * contained by the context
+     * Callback to create a {@link org.apache.tuscany.spi.wire.TargetInvoker} which dispatches to the target
+     * service of the reference
      *
      * @param serviceName the name of the service
      * @param operation   the operation to invoke

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/SCAObject.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Context.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/SCAObject.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/SCAObject.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Context.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Context.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/SCAObject.java Fri Jun  2 19:25:01 2006
@@ -16,42 +16,42 @@
  */
 package org.apache.tuscany.spi.context;
 
-import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.Lifecycle;
 import org.apache.tuscany.spi.event.EventPublisher;
+import org.apache.tuscany.spi.model.Scope;
 
 /**
- * Provides an execution context for application artifacts derived from an assembly
+ * Represents the base SCA artifact type in an assembly
  *
  * @version $Rev: 396520 $ $Date: 2006-04-24 12:38:07 +0100 (Mon, 24 Apr 2006) $
  */
-public interface Context<T> extends EventPublisher, Lifecycle {
+public interface SCAObject<T> extends EventPublisher, Lifecycle {
 
     /**
-     * Returns the name of the context.
+     * Returns the artifact name
      */
     String getName();
 
     /**
-     * Returns the parent context, or null if the context does not have one
+     * Returns the parent composite, or null if the artifact does not have one
      */
-    CompositeContext getParent();
+    CompositeComponent getParent();
 
     /**
-     * Returns the context scope
+     * Returns the artifact scope
      */
     Scope getScope();
 
     /**
-     * Returns an instance associated with the default service for the context
+     * Returns an instance associated with the default service
      *
      * @throws TargetException if an error occurs retrieving the instance
      */
     T getService() throws TargetException;
 
     /**
-     * Called to signal to the configuration that its parent context has been activated and that it shoud
-     * perform any required initialization steps
+     * Called to signal that the parent composite has been activated and that the artifact should perform any
+     * required initialization steps
      */
     void prepare();
 

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

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

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeContext.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeContext.java Fri Jun  2 19:25:01 2006
@@ -22,10 +22,10 @@
 
 
 /**
- * Manages the lifecycle and visibility of instances associated with a set of {@link AtomicContext}s.
+ * Manages the lifecycle and visibility of instances associated with a set of {@link AtomicComponent}s.
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
- * @see Context
+ * @see SCAObject
  */
 public interface ScopeContext extends Lifecycle, RuntimeEventListener {
 
@@ -40,24 +40,24 @@
     void setWorkContext(WorkContext workContext);
 
     /**
-     * Registers a context with the scope context
+     * Registers a component with the scope component
      */
-    void register(AtomicContext context);
+    void register(AtomicComponent component);
 
     /**
-     * Returns an instance associated with the current context
+     * Returns an instance associated with the current component
      *
      * @throws TargetException
      */
-    Object getInstance(AtomicContext context) throws TargetException;
+    Object getInstance(AtomicComponent component) throws TargetException;
 
 
     /**
-     * Returns the instance wrapper associated with the current context
+     * Returns the instance wrapper associated with the current component
      *
      * @throws TargetException
      */
-    InstanceWrapper getInstanceContext(AtomicContext context) throws TargetException;
+    InstanceWrapper getInstanceContext(AtomicComponent component) throws TargetException;
 
 
 }

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Service.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ServiceContext.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Service.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Service.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ServiceContext.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ServiceContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/Service.java Fri Jun  2 19:25:01 2006
@@ -1,40 +1,18 @@
 package org.apache.tuscany.spi.context;
 
 import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.WireInvocationHandler;
 import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.WireInvocationHandler;
 
 /**
- * Manages the context for a service configured for a binding. Bindings uses an {@link
- * java.lang.reflect.InvocationHandler} to perform an invocation as in:
- * <p/>
- * <pre>
- *              CompositeContext compositeContext = ...
- *              ServiceContext ctx = compositeContext.getServiceContext(&quot;source&quot;);
- *              InvocationHandler handler = (InvocationHandler) ctx.getHandler();
- *              Object response = handler.invoke(null, operation, new Object[] { param });
- * </pre>
- * <p/>
- * The <code>Proxy</code> instance passed to <code>InvocationHandler</code> may be null as the client is
- * invoking directly on the handler.
- * <p/>
- * Alternatively, the following will return a proxy implementing the service interface exposed by the entry
- * point:
- * <p/>
- * <pre>
- *              CompositeContext compositeContext = ...
- *              ServiceContext<HelloWorld> ctx = (ServiceContext<HelloWorld>)compositeContext.getServiceContext(&quot;source&quot;);
- *              HelloWorld proxy = ctx.getService();
- * </pre>
- * <p/>
- * The proxy returned will be backed by the context wire chain.
+ * The runtime instantiation of an SCA service configured for a binding.
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  */
-public interface ServiceContext<T> extends Context<T> {
+public interface Service<T> extends SCAObject<T> {
 
     /**
-     * Returns the handler responsible for flowing a request through the service context
+     * Returns the handler responsible for flowing a request through the service
      *
      * @throws TargetException
      */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/WorkContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/WorkContext.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/WorkContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/WorkContext.java Fri Jun  2 19:25:01 2006
@@ -6,9 +6,9 @@
  */
 public interface WorkContext {
 
-    public CompositeContext getRemoteContext();
+    public CompositeComponent getRemoteContext();
 
-    public void setRemoteContext(CompositeContext context);
+    public void setRemoteContext(CompositeComponent component);
 
     /**
      * Returns the unique key for the given identifier associated with the current request

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java Fri Jun  2 19:25:01 2006
@@ -16,11 +16,11 @@
  */
 package org.apache.tuscany.spi.deployer;
 
-import org.apache.tuscany.spi.context.CompositeContext;
-import org.apache.tuscany.spi.context.Context;
-import org.apache.tuscany.spi.model.Component;
-import org.apache.tuscany.spi.model.Implementation;
+import org.apache.tuscany.spi.context.CompositeComponent;
+import org.apache.tuscany.spi.context.SCAObject;
 import org.apache.tuscany.spi.loader.LoaderException;
+import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.Implementation;
 
 /**
  * Interface that can be used to deploy SCA bundles to a runtime.
@@ -29,14 +29,14 @@
  */
 public interface Deployer {
     /**
-     * Deploy a component as a child of the supplied parent.
-     * This operation creates a new context in the runtime to represent the supplied component.
-     * The type of context created will depend on the implementation of the component; for example,
-     * if the implementation of the component is a composite then typically a CompositeContext would be returned. 
+     * Deploy a component as a child of the supplied parent. This operation creates a new component in the
+     * runtime to represent the supplied component definition. The type of component created will depend on
+     * the component definition implementation; for example, if the implementation of the component definition is a composite then
+     * typically a CompositeComponent would be returned.
      *
-     * @param parent the parent context
-     * @param component the component definition
-     * @return the newly deployed context for the component
+     * @param parent              the parent context
+     * @param componentDefinition the component definition as parsed from an assembly
+     * @return the newly deployed component
      */
-    <I extends Implementation<?>> Context<?> deploy(CompositeContext<?> parent, Component<I> component) throws LoaderException;
+    <I extends Implementation<?>> SCAObject<?> deploy(CompositeComponent<?> parent, ComponentDefinition<I> componentDefinition) throws LoaderException;
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java Fri Jun  2 19:25:01 2006
@@ -21,8 +21,8 @@
 import org.apache.tuscany.spi.context.ScopeContext;
 
 /**
- * Context holder that can be used during the load process to store information
- * that is not part of the logical model. This should be regarded as transient
+ * An holder that can be used during the load process to store information
+ * that is not part of the logical assembly model. This should be regarded as transient
  * and references to this context should not be stored inside the model.
  *
  * @version $Rev$ $Date$

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicContextExtension.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicContextExtension.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicContextExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java Fri Jun  2 19:25:01 2006
@@ -10,20 +10,19 @@
 import org.apache.tuscany.spi.wire.OutboundWire;
 import org.apache.tuscany.spi.wire.InboundInvocationChain;
 import org.apache.tuscany.spi.wire.WireService;
-import org.apache.tuscany.spi.context.AtomicContext;
-import org.apache.tuscany.spi.context.CompositeContext;
+import org.apache.tuscany.spi.context.AtomicComponent;
+import org.apache.tuscany.spi.context.CompositeComponent;
 import org.apache.tuscany.spi.context.ScopeContext;
 import org.apache.tuscany.spi.context.TargetException;
-import org.apache.tuscany.spi.context.AbstractContext;
+import org.apache.tuscany.spi.context.AbstractSCAObject;
 import org.apache.tuscany.spi.model.Scope;
 
 /**
- * An extension point for atomic contexts. When adding support for new component types, implementations may
- * extend this class as a convenience.
+ * An extension point for atomic component type, which new implementation types may extend
  *
  * @version $$Rev$$ $$Date$$
  */
-public abstract class AtomicContextExtension<T> extends AbstractContext<T> implements AtomicContext<T> {
+public abstract class AtomicComponentExtension<T> extends AbstractSCAObject<T> implements AtomicComponent<T> {
 
     protected ScopeContext scopeContext;
     protected Scope scope;
@@ -31,7 +30,7 @@
     protected Map<String, List<OutboundWire>> referenceWires = new HashMap<String,List<OutboundWire>>();
     protected WireService wireService;
 
-    protected AtomicContextExtension(String name, CompositeContext<?> parent, ScopeContext scopeContext, WireService wireService) {
+    protected AtomicComponentExtension(String name, CompositeComponent<?> parent, ScopeContext scopeContext, WireService wireService) {
         super(name, parent);
         this.scopeContext = scopeContext;
         this.wireService = wireService;

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java Fri Jun  2 19:25:01 2006
@@ -3,12 +3,12 @@
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.apache.tuscany.spi.builder.BindingBuilder;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
-import org.apache.tuscany.spi.context.CompositeContext;
-import org.apache.tuscany.spi.context.Context;
+import org.apache.tuscany.spi.context.CompositeComponent;
+import org.apache.tuscany.spi.context.SCAObject;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.model.Binding;
-import org.apache.tuscany.spi.model.BoundReference;
-import org.apache.tuscany.spi.model.BoundService;
+import org.apache.tuscany.spi.model.BoundReferenceDefinition;
+import org.apache.tuscany.spi.model.BoundServiceDefinition;
 import org.apache.tuscany.spi.wire.WireService;
 import org.osoa.sca.annotations.Init;
 
@@ -39,11 +39,11 @@
         builderRegistry.register(getBindingType(), this);
     }
 
-    public Context build(CompositeContext parent, BoundService<B> boundService, DeploymentContext deploymentContext) {
+    public SCAObject build(CompositeComponent parent, BoundServiceDefinition<B> boundServiceDefinition, DeploymentContext deploymentContext) {
         return null;
     }
 
-    public Context build(CompositeContext parent, BoundReference<B> boundReference, DeploymentContext deploymentContext) {
+    public SCAObject build(CompositeComponent parent, BoundReferenceDefinition<B> boundReferenceDefinition, DeploymentContext deploymentContext) {
         return null;
     }
 

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeContextExtension.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeContextExtension.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeContextExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Fri Jun  2 19:25:01 2006
@@ -6,15 +6,15 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.tuscany.spi.context.AbstractContext;
-import org.apache.tuscany.spi.context.CompositeContext;
-import org.apache.tuscany.spi.context.Context;
-import org.apache.tuscany.spi.context.ContextNotFoundException;
+import org.apache.tuscany.spi.context.AbstractSCAObject;
+import org.apache.tuscany.spi.context.CompositeComponent;
+import org.apache.tuscany.spi.context.SCAObject;
+import org.apache.tuscany.spi.context.ComponentNotFoundException;
 import org.apache.tuscany.spi.context.DuplicateNameException;
 import org.apache.tuscany.spi.context.IllegalTargetException;
-import org.apache.tuscany.spi.context.InvalidContextTypeException;
-import org.apache.tuscany.spi.context.ReferenceContext;
-import org.apache.tuscany.spi.context.ServiceContext;
+import org.apache.tuscany.spi.context.InvalidComponentTypeException;
+import org.apache.tuscany.spi.context.Reference;
+import org.apache.tuscany.spi.context.Service;
 import org.apache.tuscany.spi.context.TargetException;
 import org.apache.tuscany.spi.context.TargetNotFoundException;
 import org.apache.tuscany.spi.event.Event;
@@ -24,19 +24,18 @@
 import org.apache.tuscany.spi.wire.WireService;
 
 /**
- * An extension point for composite contexts. When adding support for new composite component types,
- * implementations may extend this class as a convenience.
+ * An extension point for composite components, which new types may extend
  *
  * @version $$Rev$$ $$Date$$
  */
-public abstract class CompositeContextExtension<T> extends AbstractContext<T> implements CompositeContext<T> {
+public abstract class CompositeComponentExtension<T> extends AbstractSCAObject<T> implements CompositeComponent<T> {
 
-    protected final Map<String, Context> children = new ConcurrentHashMap<String, Context>();
-    protected final List<ServiceContext> services = new ArrayList<ServiceContext>();
-    protected final List<ReferenceContext> references = new ArrayList<ReferenceContext>();
+    protected final Map<String, SCAObject> children = new ConcurrentHashMap<String, SCAObject>();
+    protected final List<Service> services = new ArrayList<Service>();
+    protected final List<Reference> references = new ArrayList<Reference>();
     protected WireService wireService;
 
-    protected CompositeContextExtension(String name, CompositeContext<?> parent, WireService wireService) {
+    protected CompositeComponentExtension(String name, CompositeComponent<?> parent, WireService wireService) {
         super(name, parent);
         this.wireService = wireService;
     }
@@ -53,8 +52,8 @@
         publish(event);
     }
 
-    public void registerContext(Context child) {
-        assert(child != null): "Context was null";
+    public void register(SCAObject child) {
+        assert(child != null): "SCAObject was null";
         if (children.get(child.getName()) != null) {
             DuplicateNameException e = new DuplicateNameException("A context is already registered with name");
             e.setIdentifier(child.getName());
@@ -62,54 +61,54 @@
             throw e;
         }
         children.put(child.getName(), child);
-        if (child instanceof ServiceContext) {
-            ServiceContext serviceContext = (ServiceContext) child;
+        if (child instanceof Service) {
+            Service service = (Service) child;
             synchronized (services) {
-                services.add(serviceContext);
+                services.add(service);
             }
-        } else if (child instanceof ReferenceContext) {
-            ReferenceContext context = (ReferenceContext) child;
+        } else if (child instanceof Reference) {
+            Reference context = (Reference) child;
             synchronized (references) {
                 references.add(context);
             }
         } else {
-            InvalidContextTypeException e = new InvalidContextTypeException(child.getClass().getName());
+            InvalidComponentTypeException e = new InvalidComponentTypeException(child.getClass().getName());
             e.setIdentifier(child.getName());
             e.addContextName(getName());
             throw e;
         }
     }
 
-    public Context getContext(String name) {
+    public SCAObject getChild(String name) {
         assert (name != null) : "Name was null";
         return children.get(name);
     }
 
-    public List<Context> getContexts() {
-        return Collections.unmodifiableList(new ArrayList<Context>(children.values()));
+    public List<SCAObject> getChildren() {
+        return Collections.unmodifiableList(new ArrayList<SCAObject>(children.values()));
     }
 
-    public List<ServiceContext> getServiceContexts() {
+    public List<Service> getServices() {
         return Collections.unmodifiableList(services);
     }
 
-    public ServiceContext getServiceContext(String name) {
-        Context ctx = children.get(name);
+    public Service getService(String name) {
+        SCAObject ctx = children.get(name);
         if (ctx == null) {
-            ContextNotFoundException e = new ContextNotFoundException("Service context not found");
+            ComponentNotFoundException e = new ComponentNotFoundException("ServiceDefinition context not found");
             e.setIdentifier(name);
             e.addContextName(getName());
             throw e;
-        } else if (!(ctx instanceof ServiceContext)) {
-            ContextNotFoundException e = new ContextNotFoundException("Context not a service context");
+        } else if (!(ctx instanceof Service)) {
+            ComponentNotFoundException e = new ComponentNotFoundException("SCAObject not a service context");
             e.setIdentifier(name);
             e.addContextName(getName());
             throw e;
         }
-        return (ServiceContext) ctx;
+        return (Service) ctx;
     }
 
-    public List<ReferenceContext> getReferenceContexts() {
+    public List<Reference> getReferences() {
         return Collections.unmodifiableList(references);
     }
 
@@ -117,13 +116,13 @@
         return null;  //TODO implement
     }
 
-    public Object getService(String name) throws TargetException {
-        Context context = children.get(name);
+    public Object getServiceInstance(String name) throws TargetException {
+        SCAObject context = children.get(name);
         if (context == null) {
             TargetNotFoundException e = new TargetNotFoundException(name);
             e.addContextName(getName());
             throw e;
-        } else if (context instanceof ServiceContext) {
+        } else if (context instanceof Service) {
             return context.getService();
         } else {
             IllegalTargetException e = new IllegalTargetException("Target must be a service");
@@ -136,8 +135,8 @@
     public List<Class<?>> getServiceInterfaces() {
         List<Class<?>> serviceInterfaces = new ArrayList<Class<?>>(services.size());
         synchronized (services) {
-            for (ServiceContext serviceContext : services) {
-                serviceInterfaces.add(serviceContext.getInterface());
+            for (Service service : services) {
+                serviceInterfaces.add(service.getInterface());
             }
         }
         return serviceInterfaces;
@@ -160,15 +159,15 @@
     }
 
     public InboundWire getInboundWire(String serviceName) {
-        Context context = children.get(serviceName);
-        if (context == null || !(context instanceof ServiceContext)) {
-            throw new ContextNotFoundException(serviceName);
+        SCAObject context = children.get(serviceName);
+        if (context == null || !(context instanceof Service)) {
+            throw new ComponentNotFoundException(serviceName);
         }
-        return ((ServiceContext) context).getInboundWire();
+        return ((Service) context).getInboundWire();
     }
 
     public void prepare() {
-        for (Context context : children.values()) {
+        for (SCAObject context : children.values()) {
             context.prepare();
         }
     }

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java Fri Jun  2 19:25:01 2006
@@ -13,9 +13,9 @@
  */
 package org.apache.tuscany.spi.extension;
 
-import org.apache.tuscany.spi.context.AbstractContext;
-import org.apache.tuscany.spi.context.CompositeContext;
-import org.apache.tuscany.spi.context.ReferenceContext;
+import org.apache.tuscany.spi.context.AbstractSCAObject;
+import org.apache.tuscany.spi.context.CompositeComponent;
+import org.apache.tuscany.spi.context.Reference;
 import org.apache.tuscany.spi.context.TargetException;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.InboundInvocationChain;
@@ -25,18 +25,18 @@
 import org.apache.tuscany.spi.wire.WireService;
 
 /**
- * The default implementation of an external service context
+ * The default implementation of an SCA reference
  *
  * @version $Rev$ $Date$
  */
-public abstract class ReferenceContextExtension<T> extends AbstractContext<T> implements ReferenceContext<T> {
+public abstract class ReferenceExtension<T> extends AbstractSCAObject<T> implements Reference<T> {
 
     protected InboundWire<T> inboundWire;
     protected OutboundWire<T> outboundWire;
     protected Class<T> referenceInterface;
     protected WireService wireService;
 
-    protected ReferenceContextExtension(String name, CompositeContext<?> parent, WireService wireService) {
+    protected ReferenceExtension(String name, CompositeComponent<?> parent, WireService wireService) {
         super(name, parent);
         this.wireService = wireService;
     }

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceContextExtension.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceContextExtension.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceContextExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java Fri Jun  2 19:25:01 2006
@@ -1,9 +1,9 @@
 package org.apache.tuscany.spi.extension;
 
 import org.apache.tuscany.spi.CoreRuntimeException;
-import org.apache.tuscany.spi.context.AbstractContext;
-import org.apache.tuscany.spi.context.CompositeContext;
-import org.apache.tuscany.spi.context.ServiceContext;
+import org.apache.tuscany.spi.context.AbstractSCAObject;
+import org.apache.tuscany.spi.context.CompositeComponent;
+import org.apache.tuscany.spi.context.Service;
 import org.apache.tuscany.spi.context.TargetException;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.InboundWire;
@@ -12,17 +12,17 @@
 import org.apache.tuscany.spi.wire.WireService;
 
 /**
- * The default implementation of an service context
+ * The default implementation of an SCA service 
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  */
-public class ServiceContextExtension<T> extends AbstractContext<T> implements ServiceContext<T> {
+public class ServiceExtension<T> extends AbstractSCAObject<T> implements Service<T> {
 
     protected InboundWire<T> inboundWire;
     protected OutboundWire<T> outboundWire;
     protected WireService wireService;
 
-    public ServiceContextExtension(String name, CompositeContext parent, WireService wireService) throws CoreRuntimeException {
+    public ServiceExtension(String name, CompositeComponent parent, WireService wireService) throws CoreRuntimeException {
         super(name, parent);
         this.wireService = wireService;
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/host/ServletHost.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/host/ServletHost.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/host/ServletHost.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/host/ServletHost.java Fri Jun  2 19:25:01 2006
@@ -3,7 +3,7 @@
 import javax.servlet.Servlet;
 
 /**
- * Service interface implemented by host environments that allow Servlets
+ * ServiceDefinition interface implemented by host environments that allow Servlets
  * to be registered.
  * <p/>
  * This interface allows an SCA system component to register a servlet to handle

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundReferenceDefinition.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundReference.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundReferenceDefinition.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundReferenceDefinition.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundReference.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundReference.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundReferenceDefinition.java Fri Jun  2 19:25:01 2006
@@ -19,7 +19,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class BoundReference<B extends Binding> extends Reference {
+public class BoundReferenceDefinition<B extends Binding> extends ReferenceDefinition {
     private B binding;
 
     public B getBinding() {

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundReferenceDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundReferenceDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundService.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundService.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java Fri Jun  2 19:25:01 2006
@@ -23,17 +23,17 @@
 /**
  * @version $Rev$ $Date$
  */
-public class BoundService<B extends Binding> extends Service {
+public class BoundServiceDefinition<B extends Binding> extends ServiceDefinition {
     private B binding;
     private URI target;
 
-    public BoundService(String name, ServiceContract serviceContract, B binding, URI target) {
+    public BoundServiceDefinition(String name, ServiceContract serviceContract, B binding, URI target) {
         super(name, serviceContract);
         this.binding = binding;
         this.target = target;
     }
 
-    public BoundService() {
+    public BoundServiceDefinition() {
     }
 
     public B getBinding() {

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentDefinition.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Component.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentDefinition.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentDefinition.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Component.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Component.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentDefinition.java Fri Jun  2 19:25:01 2006
@@ -22,18 +22,18 @@
 /**
  * @version $Rev$ $Date$
  */
-public class Component<I extends Implementation<?>> extends ModelObject {
+public class ComponentDefinition<I extends Implementation<?>> extends ModelObject {
     private String name;
     private final I implementation;
     private final Map<String, ReferenceTarget> referenceTargets = new HashMap<String, ReferenceTarget>();
     private final Map<String, PropertyValue<?>> propertyValues = new HashMap<String, PropertyValue<?>>();
 
-    public Component(String name, I implementation) {
+    public ComponentDefinition(String name, I implementation) {
         this.name = name;
         this.implementation = implementation;
     }
 
-    public Component(I implementation) {
+    public ComponentDefinition(I implementation) {
         this.implementation = implementation;
     }
 

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java Fri Jun  2 19:25:01 2006
@@ -22,7 +22,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class ComponentType<S extends Service, R extends Reference, P extends Property<?>> extends ModelObject {
+public class ComponentType<S extends ServiceDefinition, R extends ReferenceDefinition, P extends Property<?>> extends ModelObject {
     private boolean eagerInit;
     private final Map<String, S> services = new HashMap<String, S>();
     private final Map<String, R> references = new HashMap<String, R>();

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java Fri Jun  2 19:25:01 2006
@@ -22,9 +22,9 @@
 /**
  * @version $Rev$ $Date$
  */
-public class CompositeComponentType<S extends Service, R extends Reference, P extends Property<?>> extends ComponentType<S,R,P> {
+public class CompositeComponentType<S extends ServiceDefinition, R extends ReferenceDefinition, P extends Property<?>> extends ComponentType<S,R,P> {
     private String name;
-    private final Map<String, Component<? extends Implementation<?>>> components = new HashMap<String, Component<? extends Implementation<?>>>();
+    private final Map<String, ComponentDefinition<? extends Implementation<?>>> components = new HashMap<String, ComponentDefinition<? extends Implementation<?>>>();
 
     public String getName() {
         return name;
@@ -34,11 +34,11 @@
         this.name = name;
     }
 
-    public Map<String, Component<? extends Implementation<?>>> getComponents() {
+    public Map<String, ComponentDefinition<? extends Implementation<?>>> getComponents() {
         return components;
     }
 
-    public void add(Component<? extends Implementation<?>> component) {
-        components.put(component.getName(), component);
+    public void add(ComponentDefinition<? extends Implementation<?>> componentDefinition) {
+        components.put(componentDefinition.getName(), componentDefinition);
     }
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedReference.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedReference.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedReference.java Fri Jun  2 19:25:01 2006
@@ -19,12 +19,12 @@
 import java.lang.reflect.Member;
 
 /**
- * A Reference definition that is mapped to a specific location in the implementation class.
+ * A ReferenceDefinition definition that is mapped to a specific location in the implementation class.
  * This location will typically be used to inject reference values.
  *
  * @version $Rev$ $Date$
  */
-public class JavaMappedReference extends Reference {
+public class JavaMappedReference extends ReferenceDefinition {
     private Member member;
 
     /**

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedService.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedService.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedService.java Fri Jun  2 19:25:01 2006
@@ -17,7 +17,7 @@
 package org.apache.tuscany.spi.model;
 
 /**
- * A Service definition that is mapped to a Java interface.
+ * A ServiceDefinition definition that is mapped to a Java interface.
  * The mapped interface is not required to be the same as the interface
  * specified in the service contract. This is to allow the service contract
  * to be specified using different interface definition languages or, in the
@@ -26,7 +26,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class JavaMappedService extends Service {
+public class JavaMappedService extends ServiceDefinition {
     private Class<?> serviceInterface;
 
     public JavaMappedService() {

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Reference.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Reference.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Reference.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java Fri Jun  2 19:25:01 2006
@@ -22,7 +22,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class Reference extends ModelObject {
+public class ReferenceDefinition extends ModelObject {
     private String name;
     private ServiceContract serviceContract;
     private Multiplicity multiplicity;

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceTarget.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceTarget.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceTarget.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceTarget.java Fri Jun  2 19:25:01 2006
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 
 import org.apache.tuscany.spi.model.ModelObject;
-import org.apache.tuscany.spi.model.Reference;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
 
 /**
  * @version $Rev$ $Date$
@@ -29,7 +29,7 @@
 public class ReferenceTarget extends ModelObject {
     private String referenceName;
     private List<URI> targets = new ArrayList<URI>();
-    private Reference reference;
+    private ReferenceDefinition referenceDefinition;
 
     public String getReferenceName() {
         return referenceName;
@@ -47,12 +47,12 @@
        targets.add(target);
     }
 
-    public Reference getReference(){
-        return reference;
+    public ReferenceDefinition getReference(){
+        return referenceDefinition;
     }
 
-    public void setReference(Reference reference){
-         this.reference = reference;
+    public void setReference(ReferenceDefinition referenceDefinition){
+         this.referenceDefinition = referenceDefinition;
     }
 
 }

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Service.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Service.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Service.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java Fri Jun  2 19:25:01 2006
@@ -19,16 +19,16 @@
 /**
  * @version $Rev$ $Date$
  */
-public class Service extends ModelObject {
+public class ServiceDefinition extends ModelObject {
     private String name;
     private ServiceContract serviceContract;
 
-    public Service(String name, ServiceContract serviceContract) {
+    public ServiceDefinition(String name, ServiceContract serviceContract) {
         this.name = name;
         this.serviceContract = serviceContract;
     }
 
-    public Service() {
+    public ServiceDefinition() {
     }
 
     public String getName() {

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WireDefinition.java (from r411328, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Wire.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WireDefinition.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WireDefinition.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Wire.java&r1=411328&r2=411356&rev=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Wire.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WireDefinition.java Fri Jun  2 19:25:01 2006
@@ -23,7 +23,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class Wire extends ModelObject {
+public class WireDefinition extends ModelObject {
     private URI source;
     private URI target;
 

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WireDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WireDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java Fri Jun  2 19:25:01 2006
@@ -1,8 +1,8 @@
 package org.apache.tuscany.spi.policy;
 
 import org.apache.tuscany.spi.builder.BuilderException;
-import org.apache.tuscany.spi.model.Reference;
-import org.apache.tuscany.spi.model.Service;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
+import org.apache.tuscany.spi.model.ServiceDefinition;
 import org.apache.tuscany.spi.wire.OutboundWire;
 import org.apache.tuscany.spi.wire.InboundWire;
 
@@ -35,12 +35,12 @@
     public void registerSourceBuilder(int phase, SourcePolicyBuilder builder);
 
     /**
-     * Evaluates source-side policy metadata for reference and updates the curresponding collection of wire
+     * Evaluates source-side policy metadata for referenceDefinition and updates the curresponding collection of wire
      * configurations
      *
      * @throws BuilderException
      */
-    public void buildSource(Reference reference, OutboundWire wire) throws BuilderException;
+    public void buildSource(ReferenceDefinition referenceDefinition, OutboundWire wire) throws BuilderException;
 
     /**
      * Evaluates target-side policy metadata for configured reference and updates the curresponding collection
@@ -48,5 +48,5 @@
      *
      * @throws BuilderException
      */
-    public void buildTarget(Service service, InboundWire wire) throws BuilderException;
+    public void buildTarget(ServiceDefinition serviceDefinition, InboundWire wire) throws BuilderException;
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java Fri Jun  2 19:25:01 2006
@@ -1,6 +1,6 @@
 package org.apache.tuscany.spi.policy;
 
-import org.apache.tuscany.spi.model.Reference;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
 import org.apache.tuscany.spi.builder.BuilderException;
 import org.apache.tuscany.spi.wire.OutboundWire;
 
@@ -12,6 +12,6 @@
  */
 public interface SourcePolicyBuilder {
 
-    public void build(Reference reference, OutboundWire wire) throws BuilderException;
+    public void build(ReferenceDefinition referenceDefinition, OutboundWire wire) throws BuilderException;
 
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java Fri Jun  2 19:25:01 2006
@@ -1,6 +1,6 @@
 package org.apache.tuscany.spi.policy;
 
-import org.apache.tuscany.spi.model.Service;
+import org.apache.tuscany.spi.model.ServiceDefinition;
 import org.apache.tuscany.spi.builder.BuilderException;
 import org.apache.tuscany.spi.wire.InboundWire;
 
@@ -12,6 +12,6 @@
  */
 public interface TargetPolicyBuilder{
 
-    public void build(Service service, InboundWire<?> wire) throws BuilderException;
+    public void build(ServiceDefinition serviceDefinition, InboundWire<?> wire) throws BuilderException;
 
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java Fri Jun  2 19:25:01 2006
@@ -60,10 +60,10 @@
     PortType getPortType(QName name);
 
     /**
-     * Returns the Service with the supplied qualified name, or null if no such service has been defined.
+     * Returns the ServiceDefinition with the supplied qualified name, or null if no such service has been defined.
      *
      * @param name the qualified name of the WSDL service
-     * @return the Service for the supplied name, or null if none has been defined
+     * @return the ServiceDefinition for the supplied name, or null if none has been defined
      */
     Service getService(QName name);
 

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java Fri Jun  2 19:25:01 2006
@@ -19,8 +19,8 @@
 /**
  * Implementations are responsible for managing the service side of a wire, including the invocation chains
  * associated with each service operation. A <Code>InboundWire</code> can be connected to another
- * <code>InboundWire</code> when connecting a {@link org.apache.tuscany.spi.context.ServiceContext} to an
- * {@link org.apache.tuscany.spi.context.AtomicContext}.
+ * <code>InboundWire</code> when connecting a {@link org.apache.tuscany.spi.context.Service} to an
+ * {@link org.apache.tuscany.spi.context.AtomicComponent}.
  *
  * @version $$Rev$$ $$Date$$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java Fri Jun  2 19:25:01 2006
@@ -12,8 +12,8 @@
  * <code>MessageHandler</code>s do so in a one-way manner.
  * <p/>
  * Source-side chains may only connect to target-side chains. Target-side chains may connect to other
- * target-side chains, for example, when invoking from a {@link org.apache.tuscany.spi.context.ServiceContext}
- * to an {@link org.apache.tuscany.spi.context.AtomicContext}.
+ * target-side chains, for example, when invoking from a {@link org.apache.tuscany.spi.context.Service}
+ * to an {@link org.apache.tuscany.spi.context.AtomicComponent}.
  * <p/>
  * In some scenarios, a service proxy may only contain target-side invocaton chains, for example, when a
  * service is resolved through a locate operation by a non-component client. In this case, there will be no

Modified: incubator/tuscany/sandbox/jboynes/sca/test/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/test/LICENSE.txt?rev=411356&r1=411355&r2=411356&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/test/LICENSE.txt (original)
+++ incubator/tuscany/sandbox/jboynes/sca/test/LICENSE.txt Fri Jun  2 19:25:01 2006
@@ -137,7 +137,7 @@
       with Licensor regarding such Contributions.
 
    6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
+      names, trademarks, serviceDefinition marks, or product names of the Licensor,
       except as required for reasonable and customary use in describing the
       origin of the Work and reproducing the content of the NOTICE file.
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message