tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmar...@apache.org
Subject svn commit: r411384 [5/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/spi/src/main/java/org/apache/tuscany/spi/component/InvalidComponentTypeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/InvalidComponentTypeException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/InvalidComponentTypeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/InvalidComponentTypeException.java Fri Jun  2 22:12:47 2006
@@ -1,4 +1,4 @@
-package org.apache.tuscany.spi.context;
+package org.apache.tuscany.spi.component;
 
 /**
  * Thrown when an operation is attempted using the wrong context type

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java Fri Jun  2 22:12:47 2006
@@ -1,4 +1,4 @@
-package org.apache.tuscany.spi.context;
+package org.apache.tuscany.spi.component;
 
 import java.lang.reflect.Method;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java Fri Jun  2 22:12:47 2006
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.tuscany.spi.context;
+package org.apache.tuscany.spi.component;
 
 import org.apache.tuscany.spi.Lifecycle;
 import org.apache.tuscany.spi.event.EventPublisher;

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContext.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContext.java Fri Jun  2 22:12:47 2006
@@ -14,11 +14,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.tuscany.spi.context;
+package org.apache.tuscany.spi.component;
 
-import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.Lifecycle;
 import org.apache.tuscany.spi.event.RuntimeEventListener;
+import org.apache.tuscany.spi.model.Scope;
 
 
 /**

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeNotFoundException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeNotFoundException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeNotFoundException.java Fri Jun  2 22:12:47 2006
@@ -1,10 +1,11 @@
-package org.apache.tuscany.spi.context;
+package org.apache.tuscany.spi.component;
 
 /**
  * Throw when a scope context cannot be found for a given scope
+ *
  * @version $$Rev$$ $$Date$$
  */
-public class ScopeNotFoundException extends ScopeRuntimeException{
+public class ScopeNotFoundException extends ScopeRuntimeException {
     public ScopeNotFoundException() {
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRegistry.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRegistry.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRegistry.java Fri Jun  2 22:12:47 2006
@@ -11,13 +11,14 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.tuscany.spi.context;
+package org.apache.tuscany.spi.component;
 
 import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.spi.model.Scope;
 
 /**
  * Manages {@link ScopeContext}s in the runtime
+ *
  * @version $$Rev$$ $$Date$$
  */
 public interface ScopeRegistry {

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRuntimeException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRuntimeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRuntimeException.java Fri Jun  2 22:12:47 2006
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.tuscany.spi.context;
+package org.apache.tuscany.spi.component;
 
 import org.apache.tuscany.spi.CoreRuntimeException;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Service.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Service.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Service.java Fri Jun  2 22:12:47 2006
@@ -1,4 +1,4 @@
-package org.apache.tuscany.spi.context;
+package org.apache.tuscany.spi.component;
 
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.apache.tuscany.spi.wire.OutboundWire;

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/TargetException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/TargetException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/TargetException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/TargetException.java Fri Jun  2 22:12:47 2006
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.tuscany.spi.context;
+package org.apache.tuscany.spi.component;
 
 import org.apache.tuscany.spi.CoreRuntimeException;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java Fri Jun  2 22:12:47 2006
@@ -1,10 +1,11 @@
-package org.apache.tuscany.spi.context;
+package org.apache.tuscany.spi.component;
 
 /**
  * Thrown when a target of an operation cannot be found
+ *
  * @version $$Rev$$ $$Date$$
  */
-public class TargetNotFoundException extends TargetException{
+public class TargetNotFoundException extends TargetException {
     public TargetNotFoundException() {
     }
 

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

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java Fri Jun  2 22:12:47 2006
@@ -1,14 +1,19 @@
-package org.apache.tuscany.spi.context;
+package org.apache.tuscany.spi.component;
 
 /**
- *
  * @version $Rev: 393567 $ $Date: 2006-04-12 11:28:58 -0700 (Wed, 12 Apr 2006) $
  */
 public interface WorkContext {
 
-    public CompositeComponent getRemoteContext();
+    /**
+     * Returns the composite where a remote request came in
+     */
+    public CompositeComponent getRemoteComponent();
 
-    public void setRemoteContext(CompositeComponent component);
+    /**
+     * Sets the composite where a remote request came in
+     */
+    public void setRemoteComponent(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=411384&r1=411383&r2=411384&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 22:12:47 2006
@@ -16,8 +16,8 @@
  */
 package org.apache.tuscany.spi.deployer;
 
-import org.apache.tuscany.spi.context.CompositeComponent;
-import org.apache.tuscany.spi.context.SCAObject;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.SCAObject;
 import org.apache.tuscany.spi.loader.LoaderException;
 import org.apache.tuscany.spi.model.ComponentDefinition;
 import org.apache.tuscany.spi.model.Implementation;
@@ -31,8 +31,8 @@
     /**
      * 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.
+     * 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 componentDefinition the component definition as parsed from an assembly

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=411384&r1=411383&r2=411384&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 22:12:47 2006
@@ -18,12 +18,12 @@
 
 import javax.xml.stream.XMLInputFactory;
 
-import org.apache.tuscany.spi.context.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeContext;
 
 /**
- * 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.
+ * 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$
  */
@@ -65,6 +65,7 @@
 
     /**
      * Returns the ScopeContext for the MODULE scope that will be associated with this deployment unit.
+     *
      * @return the ScopeContext for the MODULE scope that will be associated with this deployment unit
      */
     public ScopeContext getModuleScope() {

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java Fri Jun  2 22:12:47 2006
@@ -1,21 +1,21 @@
 package org.apache.tuscany.spi.extension;
 
-import java.util.Map;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ArrayList;
+import java.util.Map;
 
 import org.apache.tuscany.spi.CoreRuntimeException;
+import org.apache.tuscany.spi.component.AbstractSCAObject;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.wire.InboundInvocationChain;
 import org.apache.tuscany.spi.wire.InboundWire;
 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.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.AbstractSCAObject;
-import org.apache.tuscany.spi.model.Scope;
 
 /**
  * An extension point for atomic component type, which new implementation types may extend
@@ -27,7 +27,7 @@
     protected ScopeContext scopeContext;
     protected Scope scope;
     protected Map<String, InboundWire> serviceWires = new HashMap<String, InboundWire>();
-    protected Map<String, List<OutboundWire>> referenceWires = new HashMap<String,List<OutboundWire>>();
+    protected Map<String, List<OutboundWire>> referenceWires = new HashMap<String, List<OutboundWire>>();
     protected WireService wireService;
 
     protected AtomicComponentExtension(String name, CompositeComponent<?> parent, ScopeContext scopeContext, WireService wireService) {
@@ -77,7 +77,7 @@
         onReferenceWire(wire);
     }
 
-    public Map<String,List<OutboundWire>> getOutboundWires() {
+    public Map<String, List<OutboundWire>> getOutboundWires() {
         return referenceWires;
     }
 
@@ -96,10 +96,13 @@
         }
     }
 
-    protected void onReferenceWire(OutboundWire wire){}
+    protected void onReferenceWire(OutboundWire wire) {
+    }
 
-    protected void onReferenceWires(Class<?> multiplicityClass, List<OutboundWire> wires){}
+    protected void onReferenceWires(Class<?> multiplicityClass, List<OutboundWire> wires) {
+    }
 
-    protected void onServiceWire(InboundWire wire){}
+    protected void onServiceWire(InboundWire wire) {
+    }
 
 }

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=411384&r1=411383&r2=411384&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 22:12:47 2006
@@ -3,8 +3,8 @@
 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.CompositeComponent;
-import org.apache.tuscany.spi.context.SCAObject;
+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.model.Binding;
 import org.apache.tuscany.spi.model.BoundReferenceDefinition;

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java Fri Jun  2 22:12:47 2006
@@ -3,7 +3,7 @@
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
 import org.apache.tuscany.spi.builder.ComponentBuilder;
-import org.apache.tuscany.spi.context.ScopeRegistry;
+import org.apache.tuscany.spi.component.ScopeRegistry;
 import org.apache.tuscany.spi.model.Implementation;
 import org.apache.tuscany.spi.wire.WireService;
 import org.osoa.sca.annotations.Init;

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtension.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtension.java Fri Jun  2 22:12:47 2006
@@ -16,13 +16,12 @@
  */
 package org.apache.tuscany.spi.extension;
 
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.apache.tuscany.spi.loader.ComponentTypeLoader;
 import org.apache.tuscany.spi.loader.LoaderRegistry;
 import org.apache.tuscany.spi.model.Implementation;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Fri Jun  2 22:12:47 2006
@@ -6,17 +6,17 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-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.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.component.AbstractSCAObject;
+import org.apache.tuscany.spi.component.ComponentNotFoundException;
+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.InvalidComponentTypeException;
+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.component.TargetNotFoundException;
 import org.apache.tuscany.spi.event.Event;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.InboundWire;

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java Fri Jun  2 22:12:47 2006
@@ -18,13 +18,12 @@
 
 import javax.xml.namespace.QName;
 
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.apache.tuscany.spi.loader.LoaderRegistry;
 import org.apache.tuscany.spi.loader.StAXElementLoader;
 import org.apache.tuscany.spi.model.ModelObject;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
 
 /**
  * Support class for extending the Loader mechanism.
@@ -33,8 +32,8 @@
  */
 public abstract class LoaderExtension<T extends ModelObject> implements StAXElementLoader<T> {
     /**
-     * The LoaderRegistry that this loader should register with; usually set by injection.
-     * This registry may also be used to load sub-elements.
+     * The LoaderRegistry that this loader should register with; usually set by injection. This registry may
+     * also be used to load sub-elements.
      */
     protected LoaderRegistry registry;
 
@@ -55,6 +54,7 @@
 
     /**
      * Set the registry this loader should register with.
+     *
      * @param registry the registry this loader should register with
      */
     @Autowire
@@ -63,10 +63,9 @@
     }
 
     /**
-     * Initialize the loader.
-     * The base implementation registers this loader with the registry as a handler
-     * for the XML type returned by {@link #getXMLType()}. Implementations may override
-     * this to register the loader as a handler for multiple XML types.
+     * Initialize the loader. The base implementation registers this loader with the registry as a handler for
+     * the XML type returned by {@link #getXMLType()}. Implementations may override this to register the
+     * loader as a handler for multiple XML types.
      */
     @Init(eager = true)
     public void start() {
@@ -74,9 +73,8 @@
     }
 
     /**
-     * Destroy the loader.
-     * The base implementation unregisters the loader from the regsitry based on
-     * the type returned by {@link #getXMLType()}.
+     * Destroy the loader. The base implementation unregisters the loader from the regsitry based on the type
+     * returned by {@link #getXMLType()}.
      */
     @Destroy
     public void stop() {

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java Fri Jun  2 22:12:47 2006
@@ -13,10 +13,10 @@
  */
 package org.apache.tuscany.spi.extension;
 
-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.component.AbstractSCAObject;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.TargetException;
 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/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java Fri Jun  2 22:12:47 2006
@@ -1,10 +1,10 @@
 package org.apache.tuscany.spi.extension;
 
 import org.apache.tuscany.spi.CoreRuntimeException;
-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.component.AbstractSCAObject;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.TargetException;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.apache.tuscany.spi.wire.OutboundWire;
@@ -12,7 +12,7 @@
 import org.apache.tuscany.spi.wire.WireService;
 
 /**
- * The default implementation of an SCA service 
+ * The default implementation of an SCA service
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  */

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=411384&r1=411383&r2=411384&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 22:12:47 2006
@@ -3,19 +3,16 @@
 import javax.servlet.Servlet;
 
 /**
- * ServiceDefinition interface implemented by host environments that allow Servlets
- * to be registered.
+ * 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
- * inbound requests.
+ * This interface allows an SCA system component to register a servlet to handle inbound requests.
  *
  * @version $Rev$ $Date$
  */
 public interface ServletHost {
     /**
-     * Register a mapping for an instance of a Servlet.
-     * This requests that the servlet container direct all requests to the
-     * designated mapping to the supplied Servlet instance.
+     * Register a mapping for an instance of a Servlet. This requests that the servlet container direct all
+     * requests to the designated mapping to the supplied Servlet instance.
      *
      * @param mapping the uri-mapping for the Servlet
      * @param servlet the Servlet that should be invoked
@@ -23,9 +20,8 @@
     void registerMapping(String mapping, Servlet servlet);
 
     /**
-     * Unregister a servlet mapping.
-     * This directs the servlet contain not to direct any more requests to
-     * a previously registered Servlet.
+     * Unregister a servlet mapping. This directs the servlet contain not to direct any more requests to a
+     * previously registered Servlet.
      *
      * @param mapping the uri-mapping for the Servlet
      */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java Fri Jun  2 22:12:47 2006
@@ -20,13 +20,12 @@
 import org.apache.tuscany.spi.model.Implementation;
 
 /**
- * Loader that will load the ComponentType definition for the supplied implementation.
- * The actual mechanism used to load that definition is determined by the Client and
- * Implementation Specification for the implementaion type. In some cases the definition
- * may be contained in a XML file related to the implementation artifact in some well
- * defined manner; other implementations may obtain this information from introspection
- * of the artifact itself (for example, by examining Java annotations).
- * 
+ * Loader that will load the ComponentType definition for the supplied implementation. The actual mechanism
+ * used to load that definition is determined by the Client and Implementation Specification for the
+ * implementaion type. In some cases the definition may be contained in a XML file related to the
+ * implementation artifact in some well defined manner; other implementations may obtain this information from
+ * introspection of the artifact itself (for example, by examining Java annotations).
+ *
  * @version $Rev$ $Date$
  */
 public interface ComponentTypeLoader<I extends Implementation> {
@@ -35,7 +34,7 @@
      *
      * @param implementation    the implementation whose component type information should be loaded
      * @param deploymentContext the current deployment context
-     * @throws LoaderException  if there was a problem loading the configuration type
+     * @throws LoaderException if there was a problem loading the configuration type
      */
     void load(I implementation, DeploymentContext deploymentContext) throws LoaderException;
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java Fri Jun  2 22:12:47 2006
@@ -25,19 +25,18 @@
 import org.apache.tuscany.spi.model.ModelObject;
 
 /**
- * System service for loading physical artifacts that represent SCDL configurations
- * and creating the model objects that represent them.
+ * System service for loading physical artifacts that represent SCDL configurations and creating the model
+ * objects that represent them.
  *
  * @version $Rev$ $Date$
  */
 public interface Loader {
     /**
-     * Parse the supplied XML stream, dispatching to the appropriate registered loader
-     * for each element encountered in the stream.
+     * Parse the supplied XML stream, dispatching to the appropriate registered loader for each element
+     * encountered in the stream.
      * <p/>
-     * This method must be called with the XML cursor positioned on a START_ELEMENT event.
-     * When this method returns, the stream will be positioned on the corresponding
-     * END_ELEMENT event.
+     * This method must be called with the XML cursor positioned on a START_ELEMENT event. When this method
+     * returns, the stream will be positioned on the corresponding END_ELEMENT event.
      *
      * @param reader            the XML stream to parse
      * @param deploymentContext the current deployment context
@@ -58,10 +57,10 @@
     <MO extends ModelObject> MO load(URL url, Class<MO> type, DeploymentContext deploymentContext) throws LoaderException;
 
     /**
-     * Load the component type definition for a given implementation.
-     * How the component type information is located is defined by the implementation specification.
-     * It may include loading from an XML sidefile, introspection of some artifact related to the
-     * implementation, some combination of those techniques or any other implementation-defined mechanism.
+     * Load the component type definition for a given implementation. How the component type information is
+     * located is defined by the implementation specification. It may include loading from an XML sidefile,
+     * introspection of some artifact related to the implementation, some combination of those techniques or
+     * any other implementation-defined mechanism.
      *
      * @param implementation    the implementation whose component type should be loaded
      * @param deploymentContext the current deployment context

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java Fri Jun  2 22:12:47 2006
@@ -19,8 +19,8 @@
 import org.apache.tuscany.spi.TuscanyException;
 
 /**
- * Base class for Exceptions raised during the loading process.
- * Loader implementations should throw a subclass of this to indicate the actual problem.
+ * Base class for Exceptions raised during the loading process. Loader implementations should throw a subclass
+ * of this to indicate the actual problem.
  *
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java Fri Jun  2 22:12:47 2006
@@ -16,33 +16,26 @@
  */
 package org.apache.tuscany.spi.loader;
 
-import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.model.Implementation;
 import org.apache.tuscany.spi.model.ModelObject;
 
 /**
  * Registry for XML loaders that can parse a StAX input stream and return model objects.
  * <p/>
- * Loaders will typically be contributed to the system by any extension that needs to
- * handle extension specific information contained in some XML configuration file.
- * The loader can be contributed as a system component with an autowire reference
- * to this builderRegistry which is used during initialization to actually register.
- * </p>
- * This builderRegistry can also be used to parse an input stream, dispatching to the
- * appropriate loader for each element accepted. Loaders can call back to the
- * builderRegistry to load sub-elements that they are not able to handle directly.
+ * Loaders will typically be contributed to the system by any extension that needs to handle extension
+ * specific information contained in some XML configuration file. The loader can be contributed as a system
+ * component with an autowire reference to this builderRegistry which is used during initialization to
+ * actually register. </p> This builderRegistry can also be used to parse an input stream, dispatching to the
+ * appropriate loader for each element accepted. Loaders can call back to the builderRegistry to load
+ * sub-elements that they are not able to handle directly.
  *
  * @version $Rev$ $Date$
  */
 public interface LoaderRegistry extends Loader {
     /**
-     * Register a loader. This operation will typically be called by a loader
-     * during its initialization.
+     * Register a loader. This operation will typically be called by a loader during its initialization.
      *
      * @param element the element that should be delegated to the contibuted loader
      * @param loader  a loader that is being contributed to the system

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/MissingImplementationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/MissingImplementationException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/MissingImplementationException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/MissingImplementationException.java Fri Jun  2 22:12:47 2006
@@ -26,7 +26,6 @@
 
     /**
      * Default constructor.
-     *
      */
     public MissingImplementationException() {
         super();

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/MissingResourceException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/MissingResourceException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/MissingResourceException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/MissingResourceException.java Fri Jun  2 22:12:47 2006
@@ -17,8 +17,8 @@
 package org.apache.tuscany.spi.loader;
 
 /**
- * Exception that indicates an expected resource could not be found.
- * The message should be set to the name of the resource.
+ * Exception that indicates an expected resource could not be found. The message should be set to the name of
+ * the resource.
  *
  * @version $Rev: 392764 $ $Date: 2006-04-09 09:13:55 -0700 (Sun, 09 Apr 2006) $
  */
@@ -26,8 +26,8 @@
     private static final long serialVersionUID = 3775013318397916445L;
 
     /**
-     * Constructor that indicates which resource could not be found.
-     * The supplied parameter is also returned as the message.
+     * Constructor that indicates which resource could not be found. The supplied parameter is also returned
+     * as the message.
      *
      * @param resource the resource that could not be found
      */
@@ -36,8 +36,8 @@
     }
 
     /**
-     * Constructor that indicates which resource could not be found.
-     * The supplied parameter is also returned as the message.
+     * Constructor that indicates which resource could not be found. The supplied parameter is also returned
+     * as the message.
      *
      * @param resource the resource that could not be found
      */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java Fri Jun  2 22:12:47 2006
@@ -19,8 +19,8 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.spi.model.ModelObject;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.model.ModelObject;
 
 /**
  * A loader that creates a model object from a StAX input stream.
@@ -29,10 +29,10 @@
  */
 public interface StAXElementLoader<T extends ModelObject> {
     /**
-     * Create the model object for an element in an XML stream.
-     * When this method returns the stream will be positioned on the corresponding END_ELEMENT.
+     * Create the model object for an element in an XML stream. When this method returns the stream will be
+     * positioned on the corresponding END_ELEMENT.
      *
-     * @param reader the XML stream reader positioned on the applicable START_ELEMENT
+     * @param reader            the XML stream reader positioned on the applicable START_ELEMENT
      * @param deploymentContext the context for the load operation
      * @return the model object for that element
      */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java Fri Jun  2 22:12:47 2006
@@ -29,12 +29,10 @@
  */
 public interface StAXPropertyFactory {
     /**
-     * Return an ObjectFactory for instances of a property defined in an XML stream.
-     * The ObjectFactory must return instances that can safely be supplied to component
-     * implementations.
-     * If the instance is mutable and isolation between components is required,
-     * then the factory must clone or otherwise protect the implementation from
-     * unexpected modifications by other implementation instances.
+     * Return an ObjectFactory for instances of a property defined in an XML stream. The ObjectFactory must
+     * return instances that can safely be supplied to component implementations. If the instance is mutable
+     * and isolation between components is required, then the factory must clone or otherwise protect the
+     * implementation from unexpected modifications by other implementation instances.
      *
      * @param reader   the reader to use to access the XML stream
      * @param property the Property definition that the resulting ObjectFactory must be able to assign to

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/UnexpectedElementException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/UnexpectedElementException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/UnexpectedElementException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/UnexpectedElementException.java Fri Jun  2 22:12:47 2006
@@ -19,10 +19,9 @@
 import javax.xml.namespace.QName;
 
 /**
- * Exception that indicates that an element was found during loading
- * that when loaded resulted in an unexpected type.
- * This should not occur if the document being parsed conforms to its schema.
- * The messages set to the name of the element
+ * Exception that indicates that an element was found during loading that when loaded resulted in an
+ * unexpected type. This should not occur if the document being parsed conforms to its schema. The messages
+ * set to the name of the element
  *
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/UnrecognizedElementException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/UnrecognizedElementException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/UnrecognizedElementException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/UnrecognizedElementException.java Fri Jun  2 22:12:47 2006
@@ -28,8 +28,8 @@
     private final QName element;
 
     /**
-     * Constructor that indicates which resource could not be found.
-     * The supplied parameter is also returned as the message.
+     * Constructor that indicates which resource could not be found. The supplied parameter is also returned
+     * as the message.
      *
      * @param element the element that could not be handled
      */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java Fri Jun  2 22:12:47 2006
@@ -18,8 +18,6 @@
 
 import java.net.URI;
 
-import org.apache.tuscany.spi.model.Binding;
-
 /**
  * @version $Rev$ $Date$
  */

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=411384&r1=411383&r2=411384&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 22:12:47 2006
@@ -22,7 +22,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class CompositeComponentType<S extends ServiceDefinition, R extends ReferenceDefinition, 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, ComponentDefinition<? extends Implementation<?>>> components = new HashMap<String, ComponentDefinition<? extends Implementation<?>>>();
 

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedComponentType.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedComponentType.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedComponentType.java Fri Jun  2 22:12:47 2006
@@ -17,8 +17,8 @@
 package org.apache.tuscany.spi.model;
 
 /**
- * A specialized component type definition whose services, references and properties
- * can be mapped to the Java programming model.
+ * A specialized component type definition whose services, references and properties can be mapped to the Java
+ * programming model.
  *
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedProperty.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedProperty.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedProperty.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaMappedProperty.java Fri Jun  2 22:12:47 2006
@@ -20,8 +20,8 @@
 import javax.xml.namespace.QName;
 
 /**
- * A Property definition that is mapped to a specific location in the implementation class.
- * This location will typically be used to inject property values.
+ * A Property definition that is mapped to a specific location in the implementation class. This location will
+ * typically be used to inject property values.
  *
  * @version $Rev$ $Date$
  */

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=411384&r1=411383&r2=411384&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 22:12:47 2006
@@ -19,8 +19,8 @@
 import java.lang.reflect.Member;
 
 /**
- * A ReferenceDefinition definition that is mapped to a specific location in the implementation class.
- * This location will typically be used to inject reference values.
+ * 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$
  */

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=411384&r1=411383&r2=411384&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 22:12:47 2006
@@ -17,12 +17,10 @@
 package org.apache.tuscany.spi.model;
 
 /**
- * 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
- * case were the IDL is Java, to allow the service definition to be loaded
- * from a different classloader.
+ * 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 case were the IDL is Java, to allow the
+ * service definition to be loaded from a different classloader.
  *
  * @version $Rev$ $Date$
  */
@@ -46,8 +44,8 @@
     }
 
     /**
-     * Returns the Java interface for this service.
-     * This may be different from the interface that defines the service contract.
+     * Returns the Java interface for this service. This may be different from the interface that defines the
+     * service contract.
      *
      * @return the Java interface for this service
      */
@@ -56,8 +54,8 @@
     }
 
     /**
-     * Sets the Java interface for this service.
-     * This may be different from the interface used to define the service contract.
+     * Sets the Java interface for this service. This may be different from the interface used to define the
+     * service contract.
      *
      * @param serviceInterface the Java interface for this service
      */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ModelObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ModelObject.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ModelObject.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ModelObject.java Fri Jun  2 22:12:47 2006
@@ -16,14 +16,14 @@
  */
 package org.apache.tuscany.spi.model;
 
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @version $Rev$ $Date$
  */
 public abstract class ModelObject {
-    private final Map<?,?> extensions = new HashMap<Object, Object>();
+    private final Map<?, ?> extensions = new HashMap<Object, Object>();
 
     protected ModelObject() {
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Multiplicity.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Multiplicity.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Multiplicity.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Multiplicity.java Fri Jun  2 22:12:47 2006
@@ -21,14 +21,14 @@
  */
 public enum Multiplicity {
     /**
-     * Indicates a relationship that is optionally connected to the requestor and which, if supplied,
-     * must be connected to exactly one provider.
+     * Indicates a relationship that is optionally connected to the requestor and which, if supplied, must be
+     * connected to exactly one provider.
      */
     ZERO_ONE,
 
     /**
-     * Indicates a relationship that must be connected between exactly one requestor and
-     * exactly one provider.
+     * Indicates a relationship that must be connected between exactly one requestor and exactly one
+     * provider.
      */
     ONE_ONE,
 
@@ -38,8 +38,8 @@
     ZERO_N,
 
     /**
-     * Indicates a relationship that must be connected at the requestor and which connects it to
-     * zero to unbounded providers.
+     * Indicates a relationship that must be connected at the requestor and which connects it to zero to
+     * unbounded providers.
      */
     ONE_N
 

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Property.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Property.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Property.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Property.java Fri Jun  2 22:12:47 2006
@@ -18,8 +18,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.spi.model.ModelObject;
-
 /**
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java Fri Jun  2 22:12:47 2006
@@ -16,9 +16,6 @@
  */
 package org.apache.tuscany.spi.model;
 
-import org.apache.tuscany.spi.model.ModelObject;
-import org.apache.tuscany.spi.model.Multiplicity;
-
 /**
  * @version $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=411384&r1=411383&r2=411384&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 22:12:47 2006
@@ -17,11 +17,8 @@
 package org.apache.tuscany.spi.model;
 
 import java.net.URI;
-import java.util.List;
 import java.util.ArrayList;
-
-import org.apache.tuscany.spi.model.ModelObject;
-import org.apache.tuscany.spi.model.ReferenceDefinition;
+import java.util.List;
 
 /**
  * @version $Rev$ $Date$
@@ -44,15 +41,15 @@
     }
 
     public void addTarget(URI target) {
-       targets.add(target);
+        targets.add(target);
     }
 
-    public ReferenceDefinition getReference(){
+    public ReferenceDefinition getReference() {
         return referenceDefinition;
     }
 
-    public void setReference(ReferenceDefinition referenceDefinition){
-         this.referenceDefinition = referenceDefinition;
+    public void setReference(ReferenceDefinition referenceDefinition) {
+        this.referenceDefinition = referenceDefinition;
     }
 
 }

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

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WSDLServiceContract.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WSDLServiceContract.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WSDLServiceContract.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WSDLServiceContract.java Fri Jun  2 22:12:47 2006
@@ -18,8 +18,6 @@
 
 import javax.wsdl.PortType;
 
-import org.apache.tuscany.spi.model.ServiceContract;
-
 /**
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WireDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WireDefinition.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WireDefinition.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WireDefinition.java Fri Jun  2 22:12:47 2006
@@ -18,8 +18,6 @@
 
 import java.net.URI;
 
-import org.apache.tuscany.spi.model.ModelObject;
-
 /**
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java Fri Jun  2 22:12:47 2006
@@ -22,8 +22,8 @@
 import java.lang.annotation.Target;
 
 /**
- * Annotation that can be applied to methods in a monitoring interface
- * to indicate to logging frameworks the severity of the event.
+ * Annotation that can be applied to methods in a monitoring interface to indicate to logging frameworks the
+ * severity of the event.
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/MonitorFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/MonitorFactory.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/MonitorFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/MonitorFactory.java Fri Jun  2 22:12:47 2006
@@ -17,10 +17,9 @@
 package org.apache.tuscany.spi.monitor;
 
 /**
- * A MonitorFactory creates implementations of components' monitor interfaces
- * that interface with a its monitoring scheme. For example, a implementation
- * may create versions that emit appropriate logging events or which send
- * notifications to a management API.
+ * A MonitorFactory creates implementations of components' monitor interfaces that interface with a its
+ * monitoring scheme. For example, a implementation may create versions that emit appropriate logging events
+ * or which send notifications to a management API.
  *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  */

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=411384&r1=411383&r2=411384&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 22:12:47 2006
@@ -3,8 +3,8 @@
 import org.apache.tuscany.spi.builder.BuilderException;
 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;
+import org.apache.tuscany.spi.wire.OutboundWire;
 
 /**
  * A registry for policy builders that dispatches to the appropriate builder when converting an assembly to
@@ -35,8 +35,8 @@
     public void registerSourceBuilder(int phase, SourcePolicyBuilder builder);
 
     /**
-     * Evaluates source-side policy metadata for referenceDefinition and updates the curresponding collection of wire
-     * configurations
+     * Evaluates source-side policy metadata for referenceDefinition and updates the curresponding collection
+     * of wire configurations
      *
      * @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=411384&r1=411383&r2=411384&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 22:12:47 2006
@@ -1,7 +1,7 @@
 package org.apache.tuscany.spi.policy;
 
-import org.apache.tuscany.spi.model.ReferenceDefinition;
 import org.apache.tuscany.spi.builder.BuilderException;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
 import org.apache.tuscany.spi.wire.OutboundWire;
 
 /**

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=411384&r1=411383&r2=411384&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 22:12:47 2006
@@ -1,7 +1,7 @@
 package org.apache.tuscany.spi.policy;
 
-import org.apache.tuscany.spi.model.ServiceDefinition;
 import org.apache.tuscany.spi.builder.BuilderException;
+import org.apache.tuscany.spi.model.ServiceDefinition;
 import org.apache.tuscany.spi.wire.InboundWire;
 
 /**
@@ -10,7 +10,7 @@
  *
  * @version $$Rev$$ $$Date$$
  */
-public interface TargetPolicyBuilder{
+public interface TargetPolicyBuilder {
 
     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=411384&r1=411383&r2=411384&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 22:12:47 2006
@@ -16,8 +16,8 @@
  */
 package org.apache.tuscany.spi.services.wsdl;
 
-import java.net.URL;
 import java.io.IOException;
+import java.net.URL;
 import javax.wsdl.Definition;
 import javax.wsdl.PortType;
 import javax.wsdl.Service;
@@ -43,8 +43,8 @@
     /**
      * Load and register a WSDL definition as specified in a WSDL2.0 wsdlLocation attribute.
      *
-     * @param wsdlLocation   the value of the wsdlLocation attribute
-     * @param classLoader application classloader used to support relative locations
+     * @param wsdlLocation the value of the wsdlLocation attribute
+     * @param classLoader  application classloader used to support relative locations
      * @return the loaded Definition
      * @throws IOException   if there was a problem reading the document
      * @throws WSDLException if there was a problem parsing the definition
@@ -60,7 +60,8 @@
     PortType getPortType(QName name);
 
     /**
-     * Returns the ServiceDefinition 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 ServiceDefinition for the supplied name, or null if none has been defined
@@ -69,8 +70,7 @@
 
 
     /**
-     * Returns the ExtensionRegistry that is used when parsing WSDL documents during the
-     * loadDefinition call.
+     * Returns the ExtensionRegistry that is used when parsing WSDL documents during the loadDefinition call.
      *
      * @return the ExtensionRegistry that is used when parsing WSDL documents.
      */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InboundInvocationChain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InboundInvocationChain.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InboundInvocationChain.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InboundInvocationChain.java Fri Jun  2 22:12:47 2006
@@ -2,10 +2,10 @@
 
 /**
  * A set of interceptors and handlers (contained in request and response message channels) associated with the
- * inbound side of a wire for an operation. Inbound chains may start with request {@link
- * MessageHandler}s and contain at least one {@link Interceptor} processed after the handlers prior to
- * dipatching to the target instance. Inbound invocation chains may also contain a set of response
- * <code>MessageHandler</code>s which are processed after dispatching to the target instance.
+ * inbound side of a wire for an operation. Inbound chains may start with request {@link MessageHandler}s and
+ * contain at least one {@link Interceptor} processed after the handlers prior to dipatching to the target
+ * instance. Inbound invocation chains may also contain a set of response <code>MessageHandler</code>s which
+ * are processed after dispatching to the target instance.
  * <p/>
  *
  * @version $$Rev$$ $$Date$$

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=411384&r1=411383&r2=411384&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 22:12:47 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.Service} to an
- * {@link org.apache.tuscany.spi.context.AtomicComponent}.
+ * <code>InboundWire</code> when connecting a {@link org.apache.tuscany.spi.component.Service} to an {@link
+ * org.apache.tuscany.spi.component.AtomicComponent}.
  *
  * @version $$Rev$$ $$Date$$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Interceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Interceptor.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Interceptor.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Interceptor.java Fri Jun  2 22:12:47 2006
@@ -18,14 +18,14 @@
 
 /**
  * Synchronous, around-style mediation associated with a client- or target- side wire.
- * 
+ *
  * @version $Rev: 394379 $ $Date: 2006-04-15 15:01:36 -0700 (Sat, 15 Apr 2006) $
  */
 public interface Interceptor {
-    
+
     /**
      * Process a synchronous wire
-     * 
+     *
      * @param msg the request Message for the wire
      * @return the response Message from the wire
      */

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=411384&r1=411383&r2=411384&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 22:12:47 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.Service}
- * to an {@link org.apache.tuscany.spi.context.AtomicComponent}.
+ * target-side chains, for example, when invoking from a {@link org.apache.tuscany.spi.component.Service} to
+ * an {@link org.apache.tuscany.spi.component.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/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationRuntimeException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationRuntimeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationRuntimeException.java Fri Jun  2 22:12:47 2006
@@ -20,7 +20,7 @@
 
 /**
  * Denotes a runtime exception thrown during an invocation over a wire
- * 
+ *
  * @version $Rev: 396284 $ $Date: 2006-04-23 16:27:42 +0100 (Sun, 23 Apr 2006) $
  */
 public class InvocationRuntimeException extends ServiceRuntimeException {

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Message.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Message.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Message.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Message.java Fri Jun  2 22:12:47 2006
@@ -34,12 +34,14 @@
     void setBody(Object body);
 
     /**
-     * Sets the target invoker to dispatch to when the message passes through the request side of the invocation chain
+     * Sets the target invoker to dispatch to when the message passes through the request side of the
+     * invocation chain
      */
     public void setTargetInvoker(TargetInvoker invoker);
 
     /**
-     * Sets the target invoker to dispatch to when the message passes through the request side of the invocation chain
+     * Sets the target invoker to dispatch to when the message passes through the request side of the
+     * invocation chain
      */
     public TargetInvoker getTargetInvoker();
 

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageChannel.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageChannel.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageChannel.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageChannel.java Fri Jun  2 22:12:47 2006
@@ -18,7 +18,6 @@
 
 /**
  * Represents a one-way pipeline through which messages are sent during an invocation over a wire
- * 
  */
 public interface MessageChannel {
 

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageHandler.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageHandler.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/MessageHandler.java Fri Jun  2 22:12:47 2006
@@ -18,7 +18,6 @@
 
 /**
  * Performs a uni-directional mediation on a message
- *
  */
 public interface MessageHandler {
 

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java Fri Jun  2 22:12:47 2006
@@ -1,6 +1,6 @@
 package org.apache.tuscany.spi.wire;
 
-import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.spi.component.TargetException;
 
 /**
  * @version $$Rev$$ $$Date$$
@@ -11,7 +11,7 @@
      * Returns the non-proxied target instance for this wire
      */
     T getTargetService() throws TargetException;
-    
+
     /**
      * Sets the primary interface type generated proxies implement
      */



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