tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmar...@apache.org
Subject svn commit: r411384 [2/5] - in /incubator/tuscany/sandbox/jboynes/sca: containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/ containers/container.java/ containers/container.java/src/main/java/org/apache/tuscany/container/java/ ...
Date Sat, 03 Jun 2006 05:12:57 GMT
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java Fri Jun  2 22:12:47 2006
@@ -1,11 +1,11 @@
 package org.apache.tuscany.core.builder;
 
 import org.apache.tuscany.spi.builder.BuilderConfigException;
-import org.apache.tuscany.spi.context.SCAObject;
-import org.apache.tuscany.spi.context.CompositeComponent;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.apache.tuscany.spi.wire.OutboundWire;
-import org.apache.tuscany.spi.model.Scope;
 
 /**
  * Implementations are responsible for bridging invocation chains as an assembly is converted to runtime

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java Fri Jun  2 22:12:47 2006
@@ -12,11 +12,11 @@
 import org.apache.tuscany.core.wire.OutboundAutowire;
 import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.spi.builder.BuilderConfigException;
-import org.apache.tuscany.spi.context.AtomicComponent;
-import org.apache.tuscany.spi.context.Component;
-import org.apache.tuscany.spi.context.CompositeComponent;
-import org.apache.tuscany.spi.context.SCAObject;
-import org.apache.tuscany.spi.context.Reference;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.SCAObject;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.InboundInvocationChain;
 import org.apache.tuscany.spi.wire.InboundWire;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java Fri Jun  2 22:12:47 2006
@@ -10,14 +10,14 @@
 import org.apache.tuscany.core.system.component.SystemService;
 import org.apache.tuscany.spi.CoreRuntimeException;
 import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.context.AtomicComponent;
-import org.apache.tuscany.spi.context.CompositeComponent;
-import org.apache.tuscany.spi.context.SCAObject;
-import org.apache.tuscany.spi.context.DuplicateNameException;
-import org.apache.tuscany.spi.context.IllegalTargetException;
-import org.apache.tuscany.spi.context.Reference;
-import org.apache.tuscany.spi.context.ScopeContext;
-import org.apache.tuscany.spi.context.Service;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.DuplicateNameException;
+import org.apache.tuscany.spi.component.IllegalTargetException;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.event.Event;
 import org.apache.tuscany.spi.extension.CompositeComponentExtension;
 import org.apache.tuscany.spi.wire.TargetInvoker;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AutowireComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AutowireComponent.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AutowireComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AutowireComponent.java Fri Jun  2 22:12:47 2006
@@ -13,7 +13,7 @@
  */
 package org.apache.tuscany.core.component;
 
-import org.apache.tuscany.spi.context.CompositeComponent;
+import org.apache.tuscany.spi.component.CompositeComponent;
 
 
 /**

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AutowireResolutionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AutowireResolutionException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AutowireResolutionException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AutowireResolutionException.java Fri Jun  2 22:12:47 2006
@@ -13,11 +13,11 @@
  */
 package org.apache.tuscany.core.component;
 
-import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.spi.component.TargetException;
 
 /**
  * Denotes an exception while resolving an automatic wire
- * 
+ *
  * @version $Rev$ $Date$
  */
 public class AutowireResolutionException extends TargetException {

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/ComponentInitException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/ComponentInitException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/ComponentInitException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/ComponentInitException.java Fri Jun  2 22:12:47 2006
@@ -1,8 +1,10 @@
 package org.apache.tuscany.core.component;
 
-import org.apache.tuscany.spi.context.ComponentRuntimeException;
+import org.apache.tuscany.spi.component.ComponentRuntimeException;
 
 /**
+ * Denotes an error initializing a component
+ *
  * @version $$Rev$$ $$Date$$
  */
 public class ComponentInitException extends ComponentRuntimeException {

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/CompositeComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/CompositeComponentImpl.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/CompositeComponentImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/CompositeComponentImpl.java Fri Jun  2 22:12:47 2006
@@ -1,27 +1,25 @@
 package org.apache.tuscany.core.component;
 
 import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.TargetException;
 import org.apache.tuscany.spi.wire.WireService;
-import org.apache.tuscany.spi.context.AtomicComponent;
-import org.apache.tuscany.spi.context.CompositeComponent;
-import org.apache.tuscany.spi.context.SCAObject;
-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.core.component.AbstractCompositeComponent;
-import org.apache.tuscany.core.component.AutowireComponent;
 import org.osoa.sca.ServiceUnavailableException;
 
 /**
- * The standard implementation of an composite context. Autowiring is performed by delegating to the parent
- * context.
+ * The standard implementation of a composite component. Autowiring is performed by delegating to the parent
+ * composite.
  *
  * @version $Rev: 399348 $ $Date: 2006-05-03 09:33:22 -0700 (Wed, 03 May 2006) $
  */
 public class CompositeComponentImpl<T> extends AbstractCompositeComponent<T> {
 
     public CompositeComponentImpl(String name, CompositeComponent parent, AutowireComponent autowireContext, WireService wireService) {
-        super(name, parent, autowireContext,wireService);
+        super(name, parent, autowireContext, wireService);
     }
 
     private String uri;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/InvalidServiceTypeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/InvalidServiceTypeException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/InvalidServiceTypeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/InvalidServiceTypeException.java Fri Jun  2 22:12:47 2006
@@ -1,6 +1,6 @@
 package org.apache.tuscany.core.component;
 
-import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.spi.component.TargetException;
 
 /**
  * @version $$Rev$$ $$Date$$

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java Fri Jun  2 22:12:47 2006
@@ -19,11 +19,11 @@
 import org.apache.tuscany.core.injection.WireObjectFactory;
 import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.context.AtomicComponent;
-import org.apache.tuscany.spi.context.CompositeComponent;
-import org.apache.tuscany.spi.context.InstanceWrapper;
-import org.apache.tuscany.spi.context.ScopeContext;
-import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.InstanceWrapper;
+import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.TargetException;
 import org.apache.tuscany.spi.extension.AtomicComponentExtension;
 import org.apache.tuscany.spi.wire.OutboundWire;
 import org.apache.tuscany.spi.wire.WireService;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoInstanceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoInstanceWrapper.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoInstanceWrapper.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoInstanceWrapper.java Fri Jun  2 22:12:47 2006
@@ -15,8 +15,8 @@
 
 import org.apache.tuscany.spi.AbstractLifecycle;
 import org.apache.tuscany.spi.CoreRuntimeException;
-import org.apache.tuscany.spi.context.AtomicComponent;
-import org.apache.tuscany.spi.context.InstanceWrapper;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.InstanceWrapper;
 
 /**
  * Manages a Java class-based implementation instance

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/ScopeIdentifier.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/ScopeIdentifier.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/ScopeIdentifier.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/ScopeIdentifier.java Fri Jun  2 22:12:47 2006
@@ -1,12 +1,12 @@
 package org.apache.tuscany.core.component;
 
 /**
- * Implementations enable lazy retrieval of a scope id associated with a request, i.e. an id (and presumably a context) do not
- * have to be generated if the scope is never accessed. Identifiers are associated with the current request thread and keyed on
- * scope type.
+ * Implementations enable lazy retrieval of a scope id associated with a request, i.e. an id (and presumably a
+ * context) do not have to be generated if the scope is never accessed. Identifiers are associated with the
+ * current request thread and keyed on scope type.
  *
  * @version $Rev: 395110 $ $Date: 2006-04-18 19:32:30 -0700 (Tue, 18 Apr 2006) $
- * @see org.apache.tuscany.spi.context.WorkContext
+ * @see org.apache.tuscany.spi.component.WorkContext
  */
 public interface ScopeIdentifier {
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java Fri Jun  2 22:12:47 2006
@@ -3,12 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.tuscany.spi.context.CompositeComponent;
-import org.apache.tuscany.spi.context.WorkContext;
-import org.apache.tuscany.core.component.ScopeIdentifier;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.WorkContext;
 
 /**
- * An implementation of an {@link org.apache.tuscany.spi.context.WorkContext} that handles event-to-thread
+ * An implementation of an {@link org.apache.tuscany.spi.component.WorkContext} that handles event-to-thread
  * associations using an <code>InheritableThreadLocal</code>
  *
  * @version $Rev: 393567 $ $Date: 2006-04-12 11:28:58 -0700 (Wed, 12 Apr 2006) $
@@ -24,7 +23,7 @@
      */
     private ThreadLocal<Map<Object, Object>> workContext = new InheritableThreadLocal<Map<Object, Object>>();
 
-    public CompositeComponent getRemoteContext() {
+    public CompositeComponent getRemoteComponent() {
         Map<Object, Object> map = workContext.get();
         if (map == null) {
             return null;
@@ -33,7 +32,7 @@
     }
 
 
-    public void setRemoteContext(CompositeComponent component) {
+    public void setRemoteComponent(CompositeComponent component) {
         Map<Object, Object> map = workContext.get();
         if (map == null) {
             map = new HashMap<Object, Object>();

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/AbstractEvent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/AbstractEvent.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/AbstractEvent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/AbstractEvent.java Fri Jun  2 22:12:47 2006
@@ -12,7 +12,7 @@
     protected transient Object source;
 
     public AbstractEvent(Object source) {
-        assert (source !=null): "Source id was null";
+        assert (source != null): "Source id was null";
         this.source = source;
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/AbstractRequestEvent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/AbstractRequestEvent.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/AbstractRequestEvent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/AbstractRequestEvent.java Fri Jun  2 22:12:47 2006
@@ -13,8 +13,6 @@
  */
 package org.apache.tuscany.core.component.event;
 
-import org.apache.tuscany.core.component.event.AbstractEvent;
-
 /**
  * Base implementation of a request event
  *
@@ -24,11 +22,12 @@
 
     /**
      * Creates a new event
+     *
      * @param source the source of the event
      */
-     public AbstractRequestEvent(Object source) {
-         super(source);
-     }
+    public AbstractRequestEvent(Object source) {
+        super(source);
+    }
 
 
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java Fri Jun  2 22:12:47 2006
@@ -1,7 +1,7 @@
 package org.apache.tuscany.core.component.event;
 
+import org.apache.tuscany.spi.component.CompositeComponent;
 import org.apache.tuscany.spi.event.Event;
-import org.apache.tuscany.spi.context.CompositeComponent;
 
 /**
  * Implemented by runtime events associated with a composite, e.g. lifecycle events

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java Fri Jun  2 22:12:47 2006
@@ -1,8 +1,6 @@
 package org.apache.tuscany.core.component.event;
 
-import org.apache.tuscany.spi.context.CompositeComponent;
-import org.apache.tuscany.core.component.event.AbstractEvent;
-import org.apache.tuscany.core.component.event.CompositeEvent;
+import org.apache.tuscany.spi.component.CompositeComponent;
 
 /**
  * Propagated when a composite starts
@@ -15,15 +13,16 @@
 
     /**
      * Creates a module stop event
+     *
      * @param source the source of the event
-     * @param ctx the composite component associated the module being stopped
+     * @param ctx    the composite component associated the module being stopped
      */
     public CompositeStart(Object source, CompositeComponent ctx) {
         super(source);
         component = ctx;
     }
 
-    public CompositeComponent getComposite(){
+    public CompositeComponent getComposite() {
         return component;
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java Fri Jun  2 22:12:47 2006
@@ -1,8 +1,6 @@
 package org.apache.tuscany.core.component.event;
 
-import org.apache.tuscany.spi.context.CompositeComponent;
-import org.apache.tuscany.core.component.event.AbstractEvent;
-import org.apache.tuscany.core.component.event.CompositeEvent;
+import org.apache.tuscany.spi.component.CompositeComponent;
 
 /**
  * Propagated when a composite stops
@@ -15,15 +13,16 @@
 
     /**
      * Creates a module stop event
+     *
      * @param source the source of the event
-     * @param ctx the composite component associated the module being stopped
+     * @param ctx    the composite component associated the module being stopped
      */
     public CompositeStop(Object source, CompositeComponent ctx) {
         super(source);
         component = ctx;
     }
 
-    public CompositeComponent getComposite(){
+    public CompositeComponent getComposite() {
         return component;
     }
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionEnd.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionEnd.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionEnd.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionEnd.java Fri Jun  2 22:12:47 2006
@@ -18,15 +18,16 @@
  *
  * @version $$Rev$$ $$Date$$
  */
-public class HttpSessionEnd extends HttpSessionEvent{
+public class HttpSessionEnd extends HttpSessionEvent {
 
     /**
      * Creates a new event
+     *
      * @param source the source of the event
-     * @param id the id of the HTTP session being ended
+     * @param id     the id of the HTTP session being ended
      */
     public HttpSessionEnd(Object source, Object id) {
-        super(source,id);
+        super(source, id);
     }
 
- }
+}

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionEvent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionEvent.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionEvent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionEvent.java Fri Jun  2 22:12:47 2006
@@ -13,8 +13,6 @@
  */
 package org.apache.tuscany.core.component.event;
 
-import org.apache.tuscany.core.component.event.AbstractEvent;
-
 /**
  * A base implementation of HTTP-based session events in the runtime
  *
@@ -26,7 +24,7 @@
 
     public HttpSessionEvent(Object source, Object id) {
         super(source);
-        assert (id !=null): "Session id was null";
+        assert (id != null): "Session id was null";
         this.id = id;
     }
 
@@ -35,7 +33,7 @@
         return source;
     }
 
-    public Object getId(){
+    public Object getId() {
         return id;
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionStart.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionStart.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionStart.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionStart.java Fri Jun  2 22:12:47 2006
@@ -1,7 +1,5 @@
 package org.apache.tuscany.core.component.event;
 
-import org.apache.tuscany.core.component.event.HttpSessionEvent;
-
 /**
  * Propagated when an HTTP-based session has started
  *
@@ -11,11 +9,12 @@
 
     /**
      * Creates a new event
+     *
      * @param source the source of the event
-     * @param id the id of the HTTP session being ended
+     * @param id     the id of the HTTP session being ended
      */
     public HttpSessionStart(Object source, Object id) {
-        super(source,id);
+        super(source, id);
     }
 
- }
+}

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/RequestEnd.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/RequestEnd.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/RequestEnd.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/RequestEnd.java Fri Jun  2 22:12:47 2006
@@ -13,8 +13,6 @@
  */
 package org.apache.tuscany.core.component.event;
 
-import org.apache.tuscany.core.component.event.AbstractRequestEvent;
-
 /**
  * Propagated when a request completes or is ended
  *
@@ -24,11 +22,12 @@
 
     /**
      * Creates a new event
+     *
      * @param source the source of the event
      */
-     public RequestEnd(Object source) {
-         super(source);
-     }
+    public RequestEnd(Object source) {
+        super(source);
+    }
 
 
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/RequestEvent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/RequestEvent.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/RequestEvent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/RequestEvent.java Fri Jun  2 22:12:47 2006
@@ -15,6 +15,7 @@
 
 /**
  * Implemented by runtime events associated request
+ *
  * @version $$Rev$$ $$Date$$
  */
 public interface RequestEvent {

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/RequestStart.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/RequestStart.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/RequestStart.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/RequestStart.java Fri Jun  2 22:12:47 2006
@@ -13,8 +13,6 @@
  */
 package org.apache.tuscany.core.component.event;
 
-import org.apache.tuscany.core.component.event.AbstractRequestEvent;
-
 /**
  * Propagated when a request is started in the runtime
  *
@@ -24,10 +22,11 @@
 
     /**
      * Creates a new event
+     *
      * @param source the source of the event
      */
-     public RequestStart(Object source) {
-         super(source);
-     }
+    public RequestStart(Object source) {
+        super(source);
+    }
 
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContext.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContext.java Fri Jun  2 22:12:47 2006
@@ -7,11 +7,11 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.apache.tuscany.spi.AbstractLifecycle;
-import org.apache.tuscany.spi.context.AtomicComponent;
-import org.apache.tuscany.spi.context.InstanceWrapper;
-import org.apache.tuscany.spi.context.ScopeContext;
-import org.apache.tuscany.spi.context.TargetException;
-import org.apache.tuscany.spi.context.WorkContext;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.InstanceWrapper;
+import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.event.Event;
 import org.apache.tuscany.spi.event.EventFilter;
 import org.apache.tuscany.spi.event.RuntimeEventListener;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContext.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContext.java Fri Jun  2 22:12:47 2006
@@ -8,16 +8,15 @@
 
 import org.apache.tuscany.core.component.event.HttpSessionEnd;
 import org.apache.tuscany.core.component.event.HttpSessionStart;
-import org.apache.tuscany.core.component.scope.AbstractScopeContext;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.context.AtomicComponent;
-import org.apache.tuscany.spi.context.InstanceWrapper;
-import org.apache.tuscany.spi.context.TargetException;
-import org.apache.tuscany.spi.context.WorkContext;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.InstanceWrapper;
+import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.spi.model.Scope;
 
 /**
- * An implementation of a request-scoped component container.
+ * A scope context which manages atomic component instances keyed on HTTP session
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  */
@@ -28,7 +27,7 @@
     private final Map<AtomicComponent, Map<Object, InstanceWrapper>> contexts;
     private final Map<Object, List<InstanceWrapper>> destroyQueues;
 
-    public HttpSessionScopeContext(){
+    public HttpSessionScopeContext() {
         this(null);
     }
 
@@ -47,8 +46,8 @@
         if (event instanceof HttpSessionStart) {
             Object key = ((HttpSessionStart) event).getId();
             for (Map.Entry<AtomicComponent, Map<Object, InstanceWrapper>> entry : contexts.entrySet()) {
-                if(entry.getKey().isEagerInit()){
-                    getInstance(entry.getKey(),key);
+                if (entry.getKey().isEagerInit()) {
+                    getInstance(entry.getKey(), key);
                 }
             }
         } else if (event instanceof HttpSessionEnd) {
@@ -65,7 +64,7 @@
 
     public synchronized void stop() {
         contexts.clear();
-        synchronized(destroyQueues){
+        synchronized (destroyQueues) {
             destroyQueues.clear();
         }
         lifecycleState = STOPPED;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java Fri Jun  2 22:12:47 2006
@@ -1,8 +1,7 @@
 package org.apache.tuscany.core.component.scope;
 
-import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.core.component.scope.HttpSessionScopeContext;
+import org.apache.tuscany.spi.ObjectFactory;
 
 /**
  * @version $$Rev$$ $$Date$$

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContext.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContext.java Fri Jun  2 22:12:47 2006
@@ -6,20 +6,19 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.tuscany.spi.AbstractLifecycle;
 import org.apache.tuscany.core.component.event.CompositeStart;
 import org.apache.tuscany.core.component.event.CompositeStop;
-import org.apache.tuscany.core.component.scope.AbstractScopeContext;
-import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.AbstractLifecycle;
 import org.apache.tuscany.spi.CoreRuntimeException;
-import org.apache.tuscany.spi.context.AtomicComponent;
-import org.apache.tuscany.spi.context.InstanceWrapper;
-import org.apache.tuscany.spi.context.TargetException;
-import org.apache.tuscany.spi.context.WorkContext;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.InstanceWrapper;
+import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.spi.model.Scope;
 
 /**
- * Manages instanceContexts whose implementations are module scoped
+ * A scope context which manages atomic component instances keyed by module
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  */
@@ -30,7 +29,7 @@
     private final List<InstanceWrapper> destroyQueue;
     private static final InstanceWrapper EMPTY = new EmptyWrapper();
 
-    public ModuleScopeContext(){
+    public ModuleScopeContext() {
         this(null);
     }
 
@@ -53,7 +52,7 @@
         } else if (event instanceof CompositeStop) {
             shutdownContexts();
         }
-     }
+    }
 
     public synchronized void start() {
         if (lifecycleState != UNINITIALIZED && lifecycleState != STOPPED) {
@@ -65,7 +64,7 @@
     public synchronized void stop() {
         checkInit();
         instanceContexts.clear();
-        synchronized (destroyQueue){
+        synchronized (destroyQueue) {
             destroyQueue.clear();
         }
         lifecycleState = STOPPED;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java Fri Jun  2 22:12:47 2006
@@ -2,7 +2,6 @@
 
 import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
 
 /**
  * @version $$Rev$$ $$Date$$

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContext.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContext.java Fri Jun  2 22:12:47 2006
@@ -8,16 +8,15 @@
 
 import org.apache.tuscany.core.component.event.RequestEnd;
 import org.apache.tuscany.core.component.event.RequestStart;
-import org.apache.tuscany.core.component.scope.AbstractScopeContext;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.context.AtomicComponent;
-import org.apache.tuscany.spi.context.InstanceWrapper;
-import org.apache.tuscany.spi.context.TargetException;
-import org.apache.tuscany.spi.context.WorkContext;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.InstanceWrapper;
+import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.spi.model.Scope;
 
 /**
- * An implementation of a request-scoped component container.
+ * A scope context which manages atomic component instances keyed on the current request context
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  */
@@ -26,7 +25,7 @@
     private final Map<AtomicComponent, Map<Thread, InstanceWrapper>> contexts;
     private final Map<Thread, List<InstanceWrapper>> destroyQueues;
 
-    public RequestScopeContext(){
+    public RequestScopeContext() {
         this(null);
     }
 
@@ -62,7 +61,7 @@
 
     public synchronized void stop() {
         contexts.clear();
-        synchronized(destroyQueues){
+        synchronized (destroyQueues) {
             destroyQueues.clear();
         }
         lifecycleState = STOPPED;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java Fri Jun  2 22:12:47 2006
@@ -1,8 +1,7 @@
 package org.apache.tuscany.core.component.scope;
 
-import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.core.component.scope.RequestScopeContext;
+import org.apache.tuscany.spi.ObjectFactory;
 
 /**
  * @version $$Rev$$ $$Date$$

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java Fri Jun  2 22:12:47 2006
@@ -4,10 +4,10 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.context.ScopeContext;
-import org.apache.tuscany.spi.context.ScopeNotFoundException;
-import org.apache.tuscany.spi.context.ScopeRegistry;
-import org.apache.tuscany.spi.context.WorkContext;
+import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeNotFoundException;
+import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.model.Scope;
 
 /**
@@ -52,7 +52,7 @@
             context = factory.getInstance();
             context.setWorkContext(workContext);
             context.start();
-            scopeCache.put(scope,context);
+            scopeCache.put(scope, context);
         }
         return context;
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContext.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContext.java Fri Jun  2 22:12:47 2006
@@ -13,22 +13,21 @@
  */
 package org.apache.tuscany.core.component.scope;
 
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.context.AtomicComponent;
-import org.apache.tuscany.spi.context.InstanceWrapper;
-import org.apache.tuscany.spi.context.TargetException;
-import org.apache.tuscany.spi.context.WorkContext;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.InstanceWrapper;
+import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.event.Event;
-import org.apache.tuscany.core.component.scope.AbstractScopeContext;
+import org.apache.tuscany.spi.model.Scope;
 
 /**
- * A container that manages stateless components in a non-pooled fashion so basically it does nothing
+ * A scope context which manages stateless atomic component instances in a non-pooled fashion
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  */
 public class StatelessScopeContext extends AbstractScopeContext {
 
-    public StatelessScopeContext(){
+    public StatelessScopeContext() {
         this(null);
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java Fri Jun  2 22:12:47 2006
@@ -1,8 +1,7 @@
 package org.apache.tuscany.core.component.scope;
 
-import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.core.component.scope.StatelessScopeContext;
+import org.apache.tuscany.spi.ObjectFactory;
 
 /**
  * @version $$Rev$$ $$Date$$

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/builder/CompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/builder/CompositeBuilder.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/builder/CompositeBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/builder/CompositeBuilder.java Fri Jun  2 22:12:47 2006
@@ -18,9 +18,9 @@
 
 import org.apache.tuscany.core.component.CompositeComponentImpl;
 import org.apache.tuscany.spi.builder.BuilderConfigException;
-import org.apache.tuscany.spi.context.Component;
-import org.apache.tuscany.spi.context.CompositeComponent;
-import org.apache.tuscany.spi.context.SCAObject;
+import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.SCAObject;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
 import org.apache.tuscany.spi.model.BoundReferenceDefinition;
@@ -39,10 +39,10 @@
 public class CompositeBuilder extends ComponentBuilderExtension<CompositeImplementation> {
 
     public Component<?> build(CompositeComponent<?> parent,
-                                  ComponentDefinition<CompositeImplementation> componentDefinition,
-                                  DeploymentContext deploymentContext) throws BuilderConfigException {
+                              ComponentDefinition<CompositeImplementation> componentDefinition,
+                              DeploymentContext deploymentContext) throws BuilderConfigException {
         CompositeImplementation implementation = componentDefinition.getImplementation();
-        CompositeComponentType<?,?,?> componentType = implementation.getComponentType();
+        CompositeComponentType<?, ?, ?> componentType = implementation.getComponentType();
         CompositeComponentImpl<?> context = new CompositeComponentImpl(componentDefinition.getName(), parent, null, wireService);
         for (ReferenceTarget target : componentDefinition.getReferenceTargets().values()) {
             ReferenceDefinition referenceDefinition = target.getReference();
@@ -51,7 +51,8 @@
                 context.register(refereceSCAObject);
             }
         }
-        for (ComponentDefinition<? extends Implementation<?>> child : componentType.getComponents().values()) {
+        for (ComponentDefinition<? extends Implementation<?>> child : componentType.getComponents().values())
+        {
             SCAObject<?> childSCAObject = builderRegistry.build(context, child, deploymentContext);
             context.register(childSCAObject);
         }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/loader/CompositeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/loader/CompositeLoader.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/loader/CompositeLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/loader/CompositeLoader.java Fri Jun  2 22:12:47 2006
@@ -22,18 +22,18 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.spi.model.CompositeComponentType;
-import org.apache.tuscany.spi.model.ModelObject;
-import org.apache.tuscany.spi.model.ServiceDefinition;
-import org.apache.tuscany.spi.model.ReferenceDefinition;
-import org.apache.tuscany.spi.model.Property;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.Implementation;
+import org.apache.tuscany.core.loader.AssemblyConstants;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.LoaderExtension;
 import org.apache.tuscany.spi.loader.LoaderException;
 import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.extension.LoaderExtension;
-import org.apache.tuscany.core.loader.AssemblyConstants;
+import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.CompositeComponentType;
+import org.apache.tuscany.spi.model.Implementation;
+import org.apache.tuscany.spi.model.ModelObject;
+import org.apache.tuscany.spi.model.Property;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
+import org.apache.tuscany.spi.model.ServiceDefinition;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java Fri Jun  2 22:12:47 2006
@@ -16,17 +16,17 @@
  */
 package org.apache.tuscany.core.deployer;
 
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
 import org.apache.tuscany.core.builder.Connector;
+import org.apache.tuscany.core.component.scope.ModuleScopeContext;
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.apache.tuscany.spi.builder.Builder;
-import org.apache.tuscany.spi.context.CompositeComponent;
-import org.apache.tuscany.spi.context.SCAObject;
-import org.apache.tuscany.spi.context.ScopeContext;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.ScopeContext;
 import org.apache.tuscany.spi.deployer.Deployer;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.loader.LoaderException;
 import org.apache.tuscany.spi.loader.Loader;
+import org.apache.tuscany.spi.loader.LoaderException;
 import org.apache.tuscany.spi.model.ComponentDefinition;
 import org.apache.tuscany.spi.model.Implementation;
 
@@ -66,11 +66,11 @@
     }
 
     /**
-     * Load the componentDefinition type information for the componentDefinition being deployed.
-     * For a typical deployment this will result in the SCDL definition being loaded.
+     * Load the componentDefinition type information for the componentDefinition being deployed. For a typical
+     * deployment this will result in the SCDL definition being loaded.
      *
-     * @param componentDefinition         the componentDefinition being deployed
-     * @param deploymentContext the current deployment context
+     * @param componentDefinition the componentDefinition being deployed
+     * @param deploymentContext   the current deployment context
      */
     protected <I extends Implementation<?>> void load(ComponentDefinition<I> componentDefinition, DeploymentContext deploymentContext) throws LoaderException {
         loader.loadComponentType(componentDefinition.getImplementation(), deploymentContext);
@@ -79,9 +79,9 @@
     /**
      * Build the runtime context for a loaded componentDefinition.
      *
-     * @param parent            the context that will be the parent of the new sub-context
-     * @param componentDefinition         the componentDefinition being deployed
-     * @param deploymentContext the current deployment context
+     * @param parent              the context that will be the parent of the new sub-context
+     * @param componentDefinition the componentDefinition being deployed
+     * @param deploymentContext   the current deployment context
      * @return the new runtime context
      */
     protected <I extends Implementation<?>> SCAObject<?> build(CompositeComponent<?> parent, ComponentDefinition<I> componentDefinition, DeploymentContext deploymentContext) {

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ArrayMultiplicityObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ArrayMultiplicityObjectFactory.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ArrayMultiplicityObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ArrayMultiplicityObjectFactory.java Fri Jun  2 22:12:47 2006
@@ -1,10 +1,10 @@
 package org.apache.tuscany.core.injection;
 
-import java.util.List;
 import java.lang.reflect.Array;
+import java.util.List;
 
-import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
 
 /**
  * Resolves targets configured in a multiplicity by delegating to object factories and returning an

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ContextInjector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ContextInjector.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ContextInjector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ContextInjector.java Fri Jun  2 22:12:47 2006
@@ -3,14 +3,13 @@
 import org.apache.tuscany.spi.ObjectCreationException;
 
 /**
- * Implementations inject a pre-configured context type (interface) on an instance. 
- *
+ * Implementations inject a pre-configured context type (interface) on an instance.
  *
  * @version $Rev: 399488 $ $Date: 2006-05-03 16:20:27 -0700 (Wed, 03 May 2006) $
- * @see org.apache.tuscany.core.injection.MethodInjector
- * @see org.apache.tuscany.core.injection.FieldInjector
+ * @see MethodInjector
+ * @see FieldInjector
  */
-public interface ContextInjector<S,T> extends Injector<T>{
+public interface ContextInjector<S,T> extends Injector<T> {
 
     void setContext(S context) throws ObjectCreationException;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java Fri Jun  2 22:12:47 2006
@@ -2,8 +2,8 @@
 
 import java.lang.reflect.Field;
 
-import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
 
 /**
  * Injects a value created by an {@link org.apache.tuscany.spi.ObjectFactory} on a given field
@@ -17,8 +17,8 @@
     private final ObjectFactory<?> objectFactory;
 
     /**
-     * Create an injector and have it use the given <code>ObjectFactory</code>
-     * to inject a value on the instance using the reflected <code>Field</code>
+     * Create an injector and have it use the given <code>ObjectFactory</code> to inject a value on the
+     * instance using the reflected <code>Field</code>
      */
     public FieldInjector(Field field, ObjectFactory<?> objectFactory) {
         this.field = field;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/InvalidAccessorException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/InvalidAccessorException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/InvalidAccessorException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/InvalidAccessorException.java Fri Jun  2 22:12:47 2006
@@ -3,7 +3,7 @@
 /**
  * @version $$Rev$$ $$Date$$
  */
-public class InvalidAccessorException extends InjectionRuntimeException{
+public class InvalidAccessorException extends InjectionRuntimeException {
     public InvalidAccessorException() {
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java Fri Jun  2 22:12:47 2006
@@ -19,12 +19,11 @@
 import javax.naming.Context;
 import javax.naming.NamingException;
 
-import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
 
 /**
- * An implementation of ObjectFactory that creates instances
- * by looking them up in a JNDI context.
+ * An implementation of ObjectFactory that creates instances by looking them up in a JNDI context.
  *
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ListMultiplicityObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ListMultiplicityObjectFactory.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ListMultiplicityObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ListMultiplicityObjectFactory.java Fri Jun  2 22:12:47 2006
@@ -1,7 +1,7 @@
 package org.apache.tuscany.core.injection;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.spi.ObjectFactory;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/MethodEventInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/MethodEventInvoker.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/MethodEventInvoker.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/MethodEventInvoker.java Fri Jun  2 22:12:47 2006
@@ -1,7 +1,7 @@
 package org.apache.tuscany.core.injection;
 
-import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 /**
  * Performs an wire on a method of a given instance

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java Fri Jun  2 22:12:47 2006
@@ -1,13 +1,14 @@
 package org.apache.tuscany.core.injection;
 
-import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.spi.ObjectFactory;
 
 /**
  * Injects a value created by an {@link org.apache.tuscany.spi.ObjectFactory} using a given method
+ *
  * @version $Rev: 399488 $ $Date: 2006-05-03 16:20:27 -0700 (Wed, 03 May 2006) $
  */
 public class MethodInjector<T> implements Injector<T> {
@@ -25,11 +26,11 @@
         } catch (IllegalAccessException e) {
             throw new AssertionError("Method is not accessible [" + method + "]");
         } catch (IllegalArgumentException e) {
-            ObjectCreationException oce= new ObjectCreationException("Exception thrown by setter", e);
+            ObjectCreationException oce = new ObjectCreationException("Exception thrown by setter", e);
             oce.setIdentifier(method.getName());
             throw oce;
         } catch (InvocationTargetException e) {
-            ObjectCreationException oce= new ObjectCreationException("Exception thrown by setter", e);
+            ObjectCreationException oce = new ObjectCreationException("Exception thrown by setter", e);
             oce.setIdentifier(method.getName());
             throw oce;
         }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/NoAccessorException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/NoAccessorException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/NoAccessorException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/NoAccessorException.java Fri Jun  2 22:12:47 2006
@@ -3,7 +3,7 @@
 /**
  * @version $$Rev$$ $$Date$$
  */
-public class NoAccessorException extends InjectionRuntimeException{
+public class NoAccessorException extends InjectionRuntimeException {
     public NoAccessorException() {
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java Fri Jun  2 22:12:47 2006
@@ -105,7 +105,7 @@
     protected void loadProperty(XMLStreamReader reader, DeploymentContext deploymentContext, ComponentDefinition<?> componentDefinition) throws XMLStreamException, LoaderException {
         String name = reader.getAttributeValue(null, "name");
         Implementation<?> implementation = componentDefinition.getImplementation();
-        ComponentType<?,?,?> componentType = implementation.getComponentType();
+        ComponentType<?, ?, ?> componentType = implementation.getComponentType();
         Property<?> property = componentType.getProperties().get(name);
         if (property == null) {
             LoaderException e = new UndefinedPropertyException(name);

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java Fri Jun  2 22:12:47 2006
@@ -22,15 +22,15 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.LoaderExtension;
+import org.apache.tuscany.spi.loader.LoaderException;
+import org.apache.tuscany.spi.loader.LoaderRegistry;
 import org.apache.tuscany.spi.model.ComponentType;
 import org.apache.tuscany.spi.model.ModelObject;
 import org.apache.tuscany.spi.model.Property;
 import org.apache.tuscany.spi.model.ReferenceDefinition;
 import org.apache.tuscany.spi.model.ServiceDefinition;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.extension.LoaderExtension;
 
 /**
  * @version $Rev$ $Date$
@@ -49,7 +49,7 @@
 
     public ComponentType load(XMLStreamReader reader, DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
         assert AssemblyConstants.COMPONENT_TYPE.equals(reader.getName());
-        ComponentType<ServiceDefinition,ReferenceDefinition,Property<?>> componentType = new ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
+        ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> componentType = new ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
 
         while (true) {
             switch (reader.next()) {

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java Fri Jun  2 22:12:47 2006
@@ -20,11 +20,11 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.spi.model.JavaServiceContract;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.LoaderExtension;
 import org.apache.tuscany.spi.loader.LoaderException;
 import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.extension.LoaderExtension;
+import org.apache.tuscany.spi.model.JavaServiceContract;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java Fri Jun  2 22:12:47 2006
@@ -23,12 +23,12 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.spi.services.wsdl.WSDLDefinitionRegistry;
-import org.apache.tuscany.spi.model.WSDLServiceContract;
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.loader.LoaderException;
 import org.apache.tuscany.spi.extension.LoaderExtension;
+import org.apache.tuscany.spi.loader.LoaderException;
+import org.apache.tuscany.spi.model.WSDLServiceContract;
+import org.apache.tuscany.spi.services.wsdl.WSDLDefinitionRegistry;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/JNDIPropertyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/JNDIPropertyFactory.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/JNDIPropertyFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/JNDIPropertyFactory.java Fri Jun  2 22:12:47 2006
@@ -16,34 +16,25 @@
  */
 package org.apache.tuscany.core.loader;
 
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
 
+import org.apache.tuscany.core.injection.JNDIObjectFactory;
 import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.model.Property;
-import org.apache.tuscany.spi.loader.StAXPropertyFactory;
 import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.core.injection.JNDIObjectFactory;
+import org.apache.tuscany.spi.loader.StAXPropertyFactory;
+import org.apache.tuscany.spi.model.Property;
 
 /**
- * A StAXPropertyFactory that creates property values by looking them
- * up in the default JNDI InitialContext.
- *
- * This can be used to locate resources in a J2EE environment and inject
- * them as configuration properties. For example, to access a database
- * a component could write:
- * <code>
- *     &at;Property DataSource myDB;
- * </code>
- * and configure with
- * <code>
- *     &lt;properties&gt;
- *       &lt;v:myDb&gt;java:comp/env/jdbc/MyDatabase&lt;/v:myDB&gt;
- *     &lt;/properties&gt;
- * </code>
+ * A StAXPropertyFactory that creates property values by looking them up in the default JNDI InitialContext.
+ * <p/>
+ * This can be used to locate resources in a J2EE environment and inject them as configuration properties. For
+ * example, to access a database a component could write: <code> &at;Property DataSource myDB; </code> and
+ * configure with <code> &lt;properties&gt; &lt;v:myDb&gt;java:comp/env/jdbc/MyDatabase&lt;/v:myDB&gt;
+ * &lt;/properties&gt; </code>
  *
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java Fri Jun  2 22:12:47 2006
@@ -16,24 +16,24 @@
  */
 package org.apache.tuscany.core.loader;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
-import java.net.URL;
-import java.io.InputStream;
-import java.io.IOException;
 import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLInputFactory;
 
-import org.apache.tuscany.spi.model.ModelObject;
-import org.apache.tuscany.spi.model.Implementation;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.loader.ComponentTypeLoader;
 import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.StAXElementLoader;
 import org.apache.tuscany.spi.loader.LoaderRegistry;
+import org.apache.tuscany.spi.loader.StAXElementLoader;
 import org.apache.tuscany.spi.loader.UnrecognizedElementException;
-import org.apache.tuscany.spi.loader.ComponentTypeLoader;
+import org.apache.tuscany.spi.model.Implementation;
+import org.apache.tuscany.spi.model.ModelObject;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java Fri Jun  2 22:12:47 2006
@@ -21,11 +21,11 @@
 import javax.xml.stream.XMLStreamReader;
 
 import static org.apache.tuscany.core.loader.AssemblyConstants.PROPERTY;
-import org.apache.tuscany.spi.model.Property;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.LoaderExtension;
 import org.apache.tuscany.spi.loader.LoaderException;
 import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.extension.LoaderExtension;
+import org.apache.tuscany.spi.model.Property;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java Fri Jun  2 22:12:47 2006
@@ -22,14 +22,14 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.LoaderExtension;
+import org.apache.tuscany.spi.loader.LoaderException;
+import org.apache.tuscany.spi.loader.LoaderRegistry;
 import org.apache.tuscany.spi.model.ModelObject;
 import org.apache.tuscany.spi.model.Multiplicity;
 import org.apache.tuscany.spi.model.ReferenceDefinition;
 import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.extension.LoaderExtension;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Fri Jun  2 22:12:47 2006
@@ -22,15 +22,15 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.spi.model.ModelObject;
-import org.apache.tuscany.spi.model.ServiceDefinition;
-import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.model.Binding;
-import org.apache.tuscany.spi.model.BoundServiceDefinition;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.LoaderExtension;
 import org.apache.tuscany.spi.loader.LoaderException;
 import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.extension.LoaderExtension;
+import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BoundServiceDefinition;
+import org.apache.tuscany.spi.model.ModelObject;
+import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.spi.model.ServiceDefinition;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java Fri Jun  2 22:12:47 2006
@@ -22,9 +22,9 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
+import org.apache.tuscany.spi.loader.MissingResourceException;
 import org.apache.tuscany.spi.model.InteractionScope;
 import org.apache.tuscany.spi.model.Multiplicity;
-import org.apache.tuscany.spi.loader.MissingResourceException;
 
 /**
  * Utility classes to support StAX-based loaders
@@ -77,9 +77,8 @@
     }
 
     /**
-     * Convert a "scope" attribute to the equivalent enum value.
-     * Returns CONVERSATIONAL if the value equals (ignoring case) "conversational",
-     * otherwise returns NONCONVERSATIONAL.
+     * Convert a "scope" attribute to the equivalent enum value. Returns CONVERSATIONAL if the value equals
+     * (ignoring case) "conversational", otherwise returns NONCONVERSATIONAL.
      *
      * @param scope the attribute to convert
      * @return the enum equivalent

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java Fri Jun  2 22:12:47 2006
@@ -2,28 +2,28 @@
 
 import java.lang.reflect.Member;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.tuscany.core.injection.EventInvoker;
 import org.apache.tuscany.core.injection.Injector;
 import org.apache.tuscany.spi.model.ComponentType;
+import org.apache.tuscany.spi.model.Property;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.model.ServiceDefinition;
-import org.apache.tuscany.spi.model.ReferenceDefinition;
-import org.apache.tuscany.spi.model.Property;
 
 /**
  * @version $$Rev$$ $$Date$$
  */
-public class PojoComponentType<S extends ServiceDefinition, R extends ReferenceDefinition, P extends Property<?>> extends ComponentType<S,R,P> {
+public class PojoComponentType<S extends ServiceDefinition, R extends ReferenceDefinition, P extends Property<?>> extends ComponentType<S, R, P> {
 
     private Scope lifecycleScope = Scope.UNDEFINED;
     private EventInvoker<Object> initInvoker;
     private EventInvoker<Object> destroyInvoker;
     private final List<Injector> injectors = new ArrayList<Injector>();
-    private final Map<String,Member> members = new HashMap<String,Member>();
+    private final Map<String, Member> members = new HashMap<String, Member>();
 
     public Scope getLifecycleScope() {
         return lifecycleScope;
@@ -62,10 +62,10 @@
     }
 
     public void addReferenceMember(String name, Member member) {
-        members.put(name,member);
+        members.put(name, member);
     }
 
-    public Map<String,Member> getReferenceMembers() {
+    public Map<String, Member> getReferenceMembers() {
         return members;
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java Fri Jun  2 22:12:47 2006
@@ -30,7 +30,7 @@
      * Constructor specifying the method name and the level affected.
      *
      * @param method the name of the method being monitored
-     * @param level the invalid log level value
+     * @param level  the invalid log level value
      */
     public InvalidLevelException(String method, String level) {
         super();
@@ -40,6 +40,7 @@
 
     /**
      * Returns the name of the method being monitored.
+     *
      * @return the name of the method being monitored
      */
     public String getMethod() {
@@ -48,6 +49,7 @@
 
     /**
      * Returns the invalid log level specified.
+     *
      * @return the invalid log level that was specified
      */
     public String getLevel() {

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java Fri Jun  2 22:12:47 2006
@@ -35,7 +35,8 @@
 import org.apache.tuscany.spi.monitor.MonitorFactory;
 
 /**
- * A factory for monitors that forwards events to a {@link java.util.logging.Logger Java Logging (JSR47) Logger}.
+ * A factory for monitors that forwards events to a {@link java.util.logging.Logger Java Logging (JSR47)
+ * Logger}.
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  * @see java.util.logging
@@ -48,13 +49,12 @@
     private final Map<Class<?>, WeakReference<?>> proxies = new WeakHashMap<Class<?>, WeakReference<?>>();
 
     /**
-     * Construct a MonitorFactory that will monitor the specified methods at the specified levels
-     * and generate messages using java.util.logging.
+     * Construct a MonitorFactory that will monitor the specified methods at the specified levels and generate
+     * messages using java.util.logging.
      * <p/>
-     * The supplied Properties can be used to specify custom log levels for specific monitor
-     * methods. The key should be the method name in form returned by
-     * <code>Class.getName() + '#' + Method.getName()</code> and the value the log level to use
-     * as defined by {@link java.util.logging.Level}.
+     * The supplied Properties can be used to specify custom log levels for specific monitor methods. The key
+     * should be the method name in form returned by <code>Class.getName() + '#' + Method.getName()</code> and
+     * the value the log level to use as defined by {@link java.util.logging.Level}.
      *
      * @param levels       definition of custom levels for specific monitored methods
      * @param defaultLevel the default log level to use



---------------------------------------------------------------------
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