tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmar...@apache.org
Subject svn commit: r411384 [4/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/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java Fri Jun  2 22:12:47 2006
@@ -2,15 +2,10 @@
 
 import junit.framework.TestCase;
 import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.component.scope.HttpSessionScopeContext;
-import org.apache.tuscany.core.component.scope.HttpSessionScopeObjectFactory;
-import org.apache.tuscany.core.component.scope.RequestScopeContext;
-import org.apache.tuscany.core.component.scope.RequestScopeObjectFactory;
-import org.apache.tuscany.core.component.scope.ScopeRegistryImpl;
+import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.context.ScopeRegistry;
-import org.apache.tuscany.spi.context.WorkContext;
-import org.apache.tuscany.spi.context.ScopeContext;
 
 /**
  * @version $$Rev$$ $$Date$$
@@ -23,10 +18,10 @@
         scopeRegistry.registerFactory(Scope.SESSION, new HttpSessionScopeObjectFactory());
         ScopeContext request = scopeRegistry.getScopeContext(Scope.REQUEST);
         assertTrue(request instanceof RequestScopeContext);
-        assertSame(request,scopeRegistry.getScopeContext(Scope.REQUEST));
+        assertSame(request, scopeRegistry.getScopeContext(Scope.REQUEST));
         ScopeContext session = scopeRegistry.getScopeContext(Scope.SESSION);
         assertTrue(session instanceof HttpSessionScopeContext);
-        assertSame(session,scopeRegistry.getScopeContext(Scope.SESSION));
-        assertNotSame(request,session);
+        assertSame(session, scopeRegistry.getScopeContext(Scope.SESSION));
+        assertNotSame(request, session);
     }
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java Fri Jun  2 22:12:47 2006
@@ -21,7 +21,6 @@
 import javax.xml.stream.XMLInputFactory;
 
 import junit.framework.TestCase;
-
 import org.apache.tuscany.core.bootstrap.DefaultBootstrapper;
 import org.apache.tuscany.core.mock.component.BasicInterface;
 import org.apache.tuscany.core.monitor.NullMonitorFactory;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java Fri Jun  2 22:12:47 2006
@@ -4,25 +4,25 @@
 import org.apache.tuscany.core.builder.Connector;
 import org.apache.tuscany.core.builder.ConnectorImpl;
 import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
 import org.apache.tuscany.core.component.event.CompositeStart;
 import org.apache.tuscany.core.component.event.CompositeStop;
-import org.apache.tuscany.core.mock.factories.MockComponentFactory;
+import org.apache.tuscany.core.component.scope.ModuleScopeContext;
 import org.apache.tuscany.core.mock.component.Source;
 import org.apache.tuscany.core.mock.component.Target;
+import org.apache.tuscany.core.mock.factories.MockComponentFactory;
 import org.apache.tuscany.core.system.builder.SystemBindingBuilder;
 import org.apache.tuscany.core.system.builder.SystemComponentBuilder;
 import org.apache.tuscany.core.system.component.SystemCompositeComponent;
 import org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
 import org.apache.tuscany.core.system.model.SystemBinding;
 import org.apache.tuscany.core.system.model.SystemImplementation;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.model.BoundReferenceDefinition;
 import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.context.AtomicComponent;
-import org.apache.tuscany.spi.context.Reference;
-import org.apache.tuscany.spi.context.ScopeContext;
-import org.apache.tuscany.spi.context.WorkContext;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
 
 /**
  * Validates that system builders create autowired contexts from a set of model objects

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java Fri Jun  2 22:12:47 2006
@@ -4,9 +4,9 @@
 import org.apache.tuscany.core.builder.Connector;
 import org.apache.tuscany.core.builder.ConnectorImpl;
 import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
 import org.apache.tuscany.core.component.event.CompositeStart;
 import org.apache.tuscany.core.component.event.CompositeStop;
+import org.apache.tuscany.core.component.scope.ModuleScopeContext;
 import org.apache.tuscany.core.mock.component.Source;
 import org.apache.tuscany.core.mock.component.Target;
 import org.apache.tuscany.core.mock.factories.MockComponentFactory;
@@ -16,11 +16,11 @@
 import org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
 import org.apache.tuscany.core.system.model.SystemBinding;
 import org.apache.tuscany.core.system.model.SystemImplementation;
-import org.apache.tuscany.spi.context.AtomicComponent;
-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.context.WorkContext;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.model.BoundReferenceDefinition;
 import org.apache.tuscany.spi.model.BoundServiceDefinition;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java Fri Jun  2 22:12:47 2006
@@ -21,12 +21,11 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.spi.model.ServiceDefinition;
-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.model.ServiceContract;
+import org.apache.tuscany.spi.model.ServiceDefinition;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
 
@@ -51,7 +50,8 @@
 
     public void testWithInterface() throws LoaderException, XMLStreamException {
         String name = "serviceDefinition";
-        ServiceContract sc = new ServiceContract(){};
+        ServiceContract sc = new ServiceContract() {
+        };
         mockReader.expects(once()).method("getName").will(returnValue(AssemblyConstants.SERVICE));
         mockReader.expects(once()).method("getAttributeValue").with(NULL, eq("name")).will(returnValue(name));
         mockReader.expects(atLeastOnce()).method("next").will(onConsecutiveCalls(returnValue(START_ELEMENT), returnValue(END_ELEMENT)));

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java Fri Jun  2 22:12:47 2006
@@ -20,12 +20,11 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.spi.loader.StAXElementLoader;
-import org.apache.tuscany.spi.loader.LoaderException;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.loader.LoaderException;
+import org.apache.tuscany.spi.loader.StAXElementLoader;
 import org.apache.tuscany.spi.loader.UnrecognizedElementException;
 import org.apache.tuscany.spi.model.ModelObject;
-
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/BasicInterfaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/BasicInterfaceImpl.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/BasicInterfaceImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/BasicInterfaceImpl.java Fri Jun  2 22:12:47 2006
@@ -47,7 +47,7 @@
     public BasicInterface returnsReference() {
         return privateReference;
     }
-    
+
     public int returnsInt() {
         return 0;
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/GenericComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/GenericComponent.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/GenericComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/GenericComponent.java Fri Jun  2 22:12:47 2006
@@ -22,7 +22,7 @@
 import org.osoa.sca.ModuleContext;
 
 /**
- * Generic test component 
+ * Generic test component
  *
  * @version $Rev: 368822 $ $Date: 2006-01-13 10:54:38 -0800 (Fri, 13 Jan 2006) $
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/HelloWorldClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/HelloWorldClient.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/HelloWorldClient.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/HelloWorldClient.java Fri Jun  2 22:12:47 2006
@@ -14,20 +14,18 @@
 package org.apache.tuscany.core.mock.component;
 
 /**
- * 
- * 
  * @version $Rev$ $Date$
  */
-public class HelloWorldClient implements HelloWorldService{
+public class HelloWorldClient implements HelloWorldService {
 
     private int count;
-    
+
     public HelloWorldClient() {
     }
 
     private HelloWorldService service;
-    
-    public void setHelloWorldService(HelloWorldService service){
+
+    public void setHelloWorldService(HelloWorldService service) {
         this.service = service;
     }
 
@@ -39,6 +37,6 @@
     public int count() {
         return count;
     }
-    
+
 }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitDestroyComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitDestroyComponent.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitDestroyComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitDestroyComponent.java Fri Jun  2 22:12:47 2006
@@ -28,7 +28,7 @@
 
     @Destroy
     public void destroy() {
-        if (destroyed){
+        if (destroyed) {
             throw new AssertionError("Destroy called more than once");
         }
         destroyed = true;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitOnlyComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitOnlyComponent.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitOnlyComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitOnlyComponent.java Fri Jun  2 22:12:47 2006
@@ -32,7 +32,7 @@
 
     @Init
     public void init() {
-        if (initialized){
+        if (initialized) {
             throw new AssertionError("Init called more than once");
         }
         initialized = true;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OrderedDependentPojo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OrderedDependentPojo.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OrderedDependentPojo.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OrderedDependentPojo.java Fri Jun  2 22:12:47 2006
@@ -3,7 +3,7 @@
 /**
  * @version $$Rev$$ $$Date$$
  */
-public interface OrderedDependentPojo extends OrderedInitPojo{
+public interface OrderedDependentPojo extends OrderedInitPojo {
 
     OrderedInitPojo getPojo();
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OtherTarget.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OtherTarget.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OtherTarget.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OtherTarget.java Fri Jun  2 22:12:47 2006
@@ -15,13 +15,13 @@
 
 /**
  * Implementations are used in wiring tests
- * 
+ *
  * @version $Rev$ $Date$
  */
 public interface OtherTarget {
 
     public String getString();
-    
+
     public void setString(String val);
 }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OtherTargetImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OtherTargetImpl.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OtherTargetImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OtherTargetImpl.java Fri Jun  2 22:12:47 2006
@@ -14,8 +14,8 @@
 package org.apache.tuscany.core.mock.component;
 
 /**
- * A target used for testing wires with a different source and target interface 
- * 
+ * A target used for testing wires with a different source and target interface
+ *
  * @version $Rev$ $Date$
  */
 public class OtherTargetImpl implements OtherTarget {

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/Target.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/Target.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/Target.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/Target.java Fri Jun  2 22:12:47 2006
@@ -15,13 +15,13 @@
 
 /**
  * Implementations are used in wiring tests
- * 
+ *
  * @version $Rev$ $Date$
  */
 public interface Target {
 
     public String getString();
-    
+
     public void setString(String val);
 }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/TargetImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/TargetImpl.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/TargetImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/TargetImpl.java Fri Jun  2 22:12:47 2006
@@ -15,7 +15,7 @@
 
 /**
  * Mock system component implementation used in wiring tests
- * 
+ *
  * @version $Rev$ $Date$
  */
 public class TargetImpl implements Target {

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java Fri Jun  2 22:12:47 2006
@@ -16,8 +16,8 @@
 import org.apache.tuscany.spi.model.ReferenceDefinition;
 import org.apache.tuscany.spi.model.ReferenceTarget;
 import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.ServiceDefinition;
 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/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java Fri Jun  2 22:12:47 2006
@@ -15,16 +15,16 @@
 import org.apache.tuscany.core.system.component.SystemAtomicComponent;
 import org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
 import org.apache.tuscany.core.system.wire.SystemInboundWireImpl;
-import org.apache.tuscany.core.system.wire.SystemOutboundWireImpl;
 import org.apache.tuscany.core.system.wire.SystemOutboundWire;
+import org.apache.tuscany.core.system.wire.SystemOutboundWireImpl;
 import org.apache.tuscany.core.util.MethodHashMap;
 import org.apache.tuscany.core.wire.InboundInvocationChainImpl;
 import org.apache.tuscany.core.wire.InboundWireImpl;
 import org.apache.tuscany.core.wire.InvokerInterceptor;
 import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.context.AtomicComponent;
-import org.apache.tuscany.spi.context.ScopeContext;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.ScopeContext;
 import org.apache.tuscany.spi.wire.InboundInvocationChain;
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.osoa.sca.annotations.Destroy;
@@ -39,7 +39,7 @@
     }
 
     public static Map<String, AtomicComponent> createWiredContexts(String source, Class<?> sourceClass, ScopeContext sourceScopeCtx,
-                                                                 String target, Class<?> targetClass, ScopeContext targetScopeCtx) throws NoSuchMethodException {
+                                                                   String target, Class<?> targetClass, ScopeContext targetScopeCtx) throws NoSuchMethodException {
         List<Class<?>> sourceClasses = new ArrayList<Class<?>>();
         sourceClasses.add(sourceClass);
         return createWiredContexts(source, sourceClasses, sourceClass, sourceScopeCtx, target, targetClass, targetScopeCtx);
@@ -53,12 +53,12 @@
      * @throws NoSuchMethodException
      */
     public static Map<String, AtomicComponent> createWiredContexts(String source,
-                                                                 List<Class<?>> sourceInterfaces,
-                                                                 Class<?> sourceClass,
-                                                                 ScopeContext sourceScopeCtx,
-                                                                 String target,
-                                                                 Class<?> targetClass,
-                                                                 ScopeContext targetScopeCtx) throws NoSuchMethodException {
+                                                                   List<Class<?>> sourceInterfaces,
+                                                                   Class<?> sourceClass,
+                                                                   ScopeContext sourceScopeCtx,
+                                                                   String target,
+                                                                   Class<?> targetClass,
+                                                                   ScopeContext targetScopeCtx) throws NoSuchMethodException {
 
         Map<String, AtomicComponent> contexts = new HashMap<String, AtomicComponent>();
         SystemAtomicComponent targetCtx = createSystemAtomicContext(target, targetScopeCtx, targetClass);//, targetEager, targetInitInvoker, targetDestroyInvoker, null);
@@ -109,11 +109,11 @@
     }
 
     public static SystemAtomicComponent createSystemAtomicContext(String name,
-                                                                ScopeContext scopeContext,
-                                                                List<Class<?>> serviceInterfaces,
-                                                                Class<?> clazz,
-                                                                List<Injector> injectors,
-                                                                Map<String, Member> members) throws NoSuchMethodException {
+                                                                  ScopeContext scopeContext,
+                                                                  List<Class<?>> serviceInterfaces,
+                                                                  Class<?> clazz,
+                                                                  List<Injector> injectors,
+                                                                  Map<String, Member> members) throws NoSuchMethodException {
         Method[] methods = clazz.getMethods();
         EventInvoker<Object> initInvoker = null;
         EventInvoker<Object> destroyInvoker = null;
@@ -143,14 +143,14 @@
      * @throws NoSuchMethodException
      */
     public static SystemAtomicComponentImpl createSystemAtomicContext(String name,
-                                                                    ScopeContext scopeContext,
-                                                                    List<Class<?>> serviceInterfaces,
-                                                                    Class<?> clazz,
-                                                                    boolean eagerInit,
-                                                                    EventInvoker<Object> initInvoker,
-                                                                    EventInvoker<Object> destroyInvoker,
-                                                                    List<Injector> injectors,
-                                                                    Map<String, Member> members) throws NoSuchMethodException {
+                                                                      ScopeContext scopeContext,
+                                                                      List<Class<?>> serviceInterfaces,
+                                                                      Class<?> clazz,
+                                                                      boolean eagerInit,
+                                                                      EventInvoker<Object> initInvoker,
+                                                                      EventInvoker<Object> destroyInvoker,
+                                                                      List<Injector> injectors,
+                                                                      Map<String, Member> members) throws NoSuchMethodException {
         return new SystemAtomicComponentImpl(name, null, scopeContext, serviceInterfaces, createObjectFactory(clazz), eagerInit, initInvoker, destroyInvoker, injectors, members);
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockHandler.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockHandler.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockHandler.java Fri Jun  2 22:12:47 2006
@@ -3,15 +3,15 @@
  */
 package org.apache.tuscany.core.mock.wire;
 
-import org.apache.tuscany.spi.wire.MessageHandler;
 import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.MessageHandler;
 
 /**
  *
  */
 public class MockHandler implements MessageHandler {
 
-    private int count =0;
+    private int count = 0;
 
     public boolean processMessage(Message message) {
         //System.out.println("Invoking handler");
@@ -19,7 +19,7 @@
         return true;
     }
 
-    public int getCount(){
+    public int getCount() {
         return count;
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java Fri Jun  2 22:12:47 2006
@@ -5,8 +5,8 @@
 
 import org.apache.tuscany.spi.wire.Interceptor;
 import org.apache.tuscany.spi.wire.InvocationRuntimeException;
-import org.apache.tuscany.spi.wire.TargetInvoker;
 import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.TargetInvoker;
 
 /**
  * Caches component instances that do not need to be resolved for every wire, e.g. an wire originating from a

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockSyncInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockSyncInterceptor.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockSyncInterceptor.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockSyncInterceptor.java Fri Jun  2 22:12:47 2006
@@ -39,7 +39,7 @@
     }
 
     public void setNext(Interceptor next) {
-        this.next=next;
+        this.next = next;
     }
 
     public Interceptor getNext() {

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java Fri Jun  2 22:12:47 2006
@@ -25,13 +25,12 @@
 import java.util.logging.Logger;
 
 import junit.framework.TestCase;
-
 import org.apache.tuscany.spi.monitor.LogLevel;
 import org.apache.tuscany.spi.monitor.MonitorFactory;
 
 /**
  * Test case for the JavaLoggingMonitorFactory.
- * 
+ *
  * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
  */
 public class JavaLoggingTestCase extends TestCase {

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java Fri Jun  2 22:12:47 2006
@@ -5,9 +5,9 @@
 import org.apache.geronimo.connector.work.GeronimoWorkManager;
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.tuscany.core.monitor.NullMonitorFactory;
-import org.apache.tuscany.spi.wire.MessageImpl;
 import org.apache.tuscany.spi.wire.Interceptor;
 import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.MessageImpl;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
 import org.jmock.core.Invocation;
@@ -34,6 +34,7 @@
                 doneSignal.countDown();
                 return null;
             }
+
             public StringBuffer describeTo(StringBuffer stringBuffer) {
                 return null;
             }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/DefaultWorkManagerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/DefaultWorkManagerTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/DefaultWorkManagerTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/DefaultWorkManagerTestCase.java Fri Jun  2 22:12:47 2006
@@ -49,10 +49,12 @@
     private class Worker implements Work {
         private final CountDownLatch startSignal;
         private final CountDownLatch doneSignal;
+
         Worker(CountDownLatch startSignal, CountDownLatch doneSignal) {
             this.startSignal = startSignal;
             this.doneSignal = doneSignal;
         }
+
         public void run() {
             try {
                 startSignal.await();

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireTestCase.java Fri Jun  2 22:12:47 2006
@@ -5,11 +5,6 @@
 
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
-import org.apache.tuscany.core.system.component.SystemAtomicComponent;
-import org.apache.tuscany.core.system.component.SystemCompositeComponent;
-import org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
-import org.apache.tuscany.core.system.component.SystemReference;
-import org.apache.tuscany.core.system.component.SystemService;
 
 /**
  * Performs basic autowiring tests to composite artifacts

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/ChildLocateTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/ChildLocateTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/ChildLocateTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/ChildLocateTestCase.java Fri Jun  2 22:12:47 2006
@@ -7,7 +7,7 @@
  */
 public class ChildLocateTestCase extends TestCase {
 
-     public void testChildLocate() throws Exception {
+    public void testChildLocate() throws Exception {
 //         WorkContext workContext = new WorkContextImpl();
 //         ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
 //         scopeContext.start();

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/CompositePropagationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/CompositePropagationTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/CompositePropagationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/CompositePropagationTestCase.java Fri Jun  2 22:12:47 2006
@@ -4,9 +4,6 @@
 import java.util.List;
 
 import org.apache.tuscany.core.mock.component.Source;
-import org.apache.tuscany.core.system.component.SystemAtomicComponent;
-import org.apache.tuscany.core.system.component.SystemCompositeComponent;
-import org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/DuplicateRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/DuplicateRegistrationTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/DuplicateRegistrationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/DuplicateRegistrationTestCase.java Fri Jun  2 22:12:47 2006
@@ -3,11 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.tuscany.spi.context.DuplicateNameException;
 import org.apache.tuscany.core.mock.component.Source;
-import org.apache.tuscany.core.system.component.SystemAtomicComponent;
-import org.apache.tuscany.core.system.component.SystemCompositeComponent;
-import org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
+import org.apache.tuscany.spi.component.DuplicateNameException;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemAtomicComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemAtomicComponentTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemAtomicComponentTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemAtomicComponentTestCase.java Fri Jun  2 22:12:47 2006
@@ -4,8 +4,6 @@
 import org.apache.tuscany.core.injection.EventInvoker;
 import org.apache.tuscany.core.injection.MethodEventInvoker;
 import org.apache.tuscany.core.injection.PojoObjectFactory;
-import org.apache.tuscany.core.system.component.SystemAtomicComponent;
-import org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
 import org.apache.tuscany.spi.ObjectFactory;
 
 /**

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeComponentResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeComponentResolutionTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeComponentResolutionTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeComponentResolutionTestCase.java Fri Jun  2 22:12:47 2006
@@ -5,10 +5,7 @@
 
 import org.apache.tuscany.core.mock.component.Source;
 import org.apache.tuscany.core.mock.component.SourceImpl;
-import org.apache.tuscany.core.system.component.SystemAtomicComponent;
-import org.apache.tuscany.core.system.component.SystemCompositeComponent;
-import org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
-import org.apache.tuscany.spi.context.AtomicComponent;
+import org.apache.tuscany.spi.component.AtomicComponent;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeComponentTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeComponentTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeComponentTestCase.java Fri Jun  2 22:12:47 2006
@@ -16,13 +16,10 @@
  */
 package org.apache.tuscany.core.system.component;
 
+import org.apache.tuscany.core.component.AutowireComponent;
+import org.apache.tuscany.spi.component.CompositeComponent;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
-
-import org.apache.tuscany.core.component.AutowireComponent;
-import org.apache.tuscany.core.system.component.SystemCompositeComponent;
-import org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
-import org.apache.tuscany.spi.context.CompositeComponent;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeLifecycleTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeLifecycleTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeLifecycleTestCase.java Fri Jun  2 22:12:47 2006
@@ -5,10 +5,7 @@
 
 import org.apache.tuscany.core.mock.component.Source;
 import org.apache.tuscany.core.mock.component.SourceImpl;
-import org.apache.tuscany.core.system.component.SystemAtomicComponent;
-import org.apache.tuscany.core.system.component.SystemCompositeComponent;
-import org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
-import org.apache.tuscany.spi.context.AtomicComponent;
+import org.apache.tuscany.spi.component.AtomicComponent;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemObjectRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemObjectRegistrationTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemObjectRegistrationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemObjectRegistrationTestCase.java Fri Jun  2 22:12:47 2006
@@ -2,12 +2,10 @@
 
 import javax.naming.ConfigurationException;
 
+import junit.framework.TestCase;
 import org.apache.tuscany.core.component.event.CompositeStart;
 import org.apache.tuscany.core.component.event.CompositeStop;
-import org.apache.tuscany.core.system.component.SystemCompositeComponent;
-import org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
-import org.apache.tuscany.spi.context.DuplicateNameException;
-import junit.framework.TestCase;
+import org.apache.tuscany.spi.component.DuplicateNameException;
 
 /**
  * @version $Rev$ $Date$
@@ -18,7 +16,7 @@
     public void testRegistration() throws Exception {
         MockComponent instance = new MockComponent();
         systemContext.registerJavaObject("foo", MockComponent.class, instance);
-        MockComponent resolvedInstance = (MockComponent)systemContext.getChild("foo").getService();
+        MockComponent resolvedInstance = (MockComponent) systemContext.getChild("foo").getService();
         assertSame(instance, resolvedInstance);
     }
 
@@ -33,7 +31,7 @@
         }
     }
 
-    public void testAutowireToObject()  {
+    public void testAutowireToObject() {
         MockComponent instance = new MockComponent();
         systemContext.registerJavaObject("foo", MockComponent.class, instance);
         assertSame(instance, systemContext.resolveInstance(MockComponent.class));
@@ -44,11 +42,11 @@
         super.setUp();
         systemContext = new SystemCompositeComponentImpl(null, null, null);
         systemContext.start();
-        systemContext.publish(new CompositeStart(this,null));
+        systemContext.publish(new CompositeStart(this, null));
     }
 
     protected void tearDown() throws Exception {
-        systemContext.publish(new CompositeStop(this,null));
+        systemContext.publish(new CompositeStop(this, null));
         systemContext.stop();
         super.tearDown();
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemInboundtoOutboundTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemInboundtoOutboundTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemInboundtoOutboundTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemInboundtoOutboundTestCase.java Fri Jun  2 22:12:47 2006
@@ -2,7 +2,6 @@
 
 import org.apache.tuscany.core.mock.component.Target;
 import org.apache.tuscany.core.mock.component.TargetImpl;
-import org.apache.tuscany.spi.wire.OutboundWire;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean1.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean1.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean1.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean1.java Fri Jun  2 22:12:47 2006
@@ -5,7 +5,7 @@
 
     public static final int ALL_BEAN1_FIELDS = 6 + ALL_SUPER_FIELDS;
     public static final int ALL_BEAN1_PUBLIC_PROTECTED_FIELDS = 5 + ALL_SUPER_PUBLIC_PROTECTED_FIELDS;
- 
+
     public static final int ALL__BEAN1_METHODS = 4 + ALL_SUPER_METHODS - 1;
 
     private String field1;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean2.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean2.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean2.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean2.java Fri Jun  2 22:12:47 2006
@@ -1,9 +1,9 @@
 package org.apache.tuscany.core.util;
 
-import junit.framework.AssertionFailedError;
-
 import java.util.List;
 
+import junit.framework.AssertionFailedError;
+
 public class Bean2 {
 
     private List methodList;
@@ -23,8 +23,8 @@
     }
 
     public void setfieldList(List list) {
-       throw new AssertionFailedError("setter inadvertantly called");
+        throw new AssertionFailedError("setter inadvertantly called");
     }
 
-     
+
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java Fri Jun  2 22:12:47 2006
@@ -35,10 +35,10 @@
         chain.build();
         chains.put(echo, chain);
         JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(chains);
-        assertEquals("foo",handler.invoke(null,echo,new String[]{"foo"}));
-        assertEquals(1,interceptor.getCount());
-        assertEquals(1,requestHandler.getCount());
-        assertEquals(1,responseHandler.getCount());
+        assertEquals("foo", handler.invoke(null, echo, new String[]{"foo"}));
+        assertEquals(1, interceptor.getCount());
+        assertEquals(1, requestHandler.getCount());
+        assertEquals(1, responseHandler.getCount());
     }
 
     public void setUp() throws Exception {

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java Fri Jun  2 22:12:47 2006
@@ -16,15 +16,15 @@
 import java.lang.reflect.Method;
 
 import junit.framework.TestCase;
+import org.apache.tuscany.core.mock.component.SimpleTarget;
+import org.apache.tuscany.core.mock.component.SimpleTargetImpl;
 import org.apache.tuscany.core.mock.wire.MockHandler;
 import org.apache.tuscany.core.mock.wire.MockStaticInvoker;
 import org.apache.tuscany.core.mock.wire.MockSyncInterceptor;
-import org.apache.tuscany.core.mock.component.SimpleTarget;
-import org.apache.tuscany.core.mock.component.SimpleTargetImpl;
-import org.apache.tuscany.spi.wire.Message;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
 import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.Message;
 import org.apache.tuscany.spi.wire.MessageImpl;
+import org.apache.tuscany.spi.wire.OutboundInvocationChain;
 
 /**
  * Tests error propagation through an innvocation

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java Fri Jun  2 22:12:47 2006
@@ -16,15 +16,15 @@
 import java.lang.reflect.Method;
 
 import junit.framework.TestCase;
+import org.apache.tuscany.core.mock.component.SimpleTarget;
+import org.apache.tuscany.core.mock.component.SimpleTargetImpl;
 import org.apache.tuscany.core.mock.wire.MockHandler;
 import org.apache.tuscany.core.mock.wire.MockStaticInvoker;
 import org.apache.tuscany.core.mock.wire.MockSyncInterceptor;
-import org.apache.tuscany.core.mock.component.SimpleTarget;
-import org.apache.tuscany.core.mock.component.SimpleTargetImpl;
-import org.apache.tuscany.spi.wire.Message;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
 import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.Message;
 import org.apache.tuscany.spi.wire.MessageImpl;
+import org.apache.tuscany.spi.wire.OutboundInvocationChain;
 
 public class InvocationConfigurationTestCase extends TestCase {
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/JDKInboundInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/JDKInboundInvocationHandlerTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/JDKInboundInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/JDKInboundInvocationHandlerTestCase.java Fri Jun  2 22:12:47 2006
@@ -9,8 +9,8 @@
 import org.apache.tuscany.core.mock.wire.MockStaticInvoker;
 import org.apache.tuscany.core.mock.wire.MockSyncInterceptor;
 import org.apache.tuscany.core.util.MethodHashMap;
-import org.apache.tuscany.spi.wire.InboundInvocationChain;
 import org.apache.tuscany.core.wire.jdk.JDKInboundInvocationHandler;
+import org.apache.tuscany.spi.wire.InboundInvocationChain;
 import org.jmock.MockObjectTestCase;
 
 /**

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java Fri Jun  2 22:12:47 2006
@@ -18,7 +18,6 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 import org.apache.tuscany.core.mock.component.SimpleTargetImpl;
-import org.apache.tuscany.core.wire.StaticPojoTargetInvoker;
 
 /**
  * Tests invoking on a different interface from the one actually implemented by the target

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/StaticPojoInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/StaticPojoInvokerTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/StaticPojoInvokerTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/StaticPojoInvokerTestCase.java Fri Jun  2 22:12:47 2006
@@ -22,7 +22,6 @@
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
-import org.apache.tuscany.core.wire.StaticPojoTargetInvoker;
 
 public class StaticPojoInvokerTestCase extends TestCase {
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java Fri Jun  2 22:12:47 2006
@@ -3,18 +3,13 @@
 import java.lang.reflect.Method;
 
 import junit.framework.TestCase;
-import org.apache.tuscany.core.wire.OutboundInvocationChainImpl;
-import org.apache.tuscany.core.wire.InboundInvocationChainImpl;
-import org.apache.tuscany.core.wire.OutboundWireImpl;
-import org.apache.tuscany.core.wire.InboundWireImpl;
-import org.apache.tuscany.core.wire.StaticPojoTargetInvoker;
+import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.InboundWire;
 import org.apache.tuscany.spi.wire.Interceptor;
 import org.apache.tuscany.spi.wire.Message;
 import org.apache.tuscany.spi.wire.MessageHandler;
 import org.apache.tuscany.spi.wire.OutboundInvocationChain;
 import org.apache.tuscany.spi.wire.OutboundWire;
-import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.InboundInvocationChain;
 import org.apache.tuscany.spi.wire.TargetInvoker;
 
 /**
@@ -118,7 +113,7 @@
     public void testTargetWireNonTargetInvokerOptimization() throws Exception {
         InboundWire<?> wire = new InboundWireImpl();
         InboundInvocationChain chain = new InboundInvocationChainImpl(m);
-        TargetInvoker invoker = new StaticPojoTargetInvoker(m,new Object());
+        TargetInvoker invoker = new StaticPojoTargetInvoker(m, new Object());
         invoker.setCacheable(false);
         chain.setTargetInvoker(invoker);
         wire.addInvocationChain(m, chain);

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/resources/org/apache/tuscany/core/services/wsdl/example.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/resources/org/apache/tuscany/core/services/wsdl/example.wsdl?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/resources/org/apache/tuscany/core/services/wsdl/example.wsdl (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/resources/org/apache/tuscany/core/services/wsdl/example.wsdl Fri Jun  2 22:12:47 2006
@@ -15,7 +15,7 @@
   limitations under the License.
  -->
 <wsdl:definitions targetNamespace="http://www.example.org"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
                   name="example">
 
     <wsdl:portType name="HelloWorld">

Modified: incubator/tuscany/sandbox/jboynes/sca/runtime/equinox/src/test/java/org/apache/tuscany/equinox/EquinoxStartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/runtime/equinox/src/test/java/org/apache/tuscany/equinox/EquinoxStartTestCase.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/runtime/equinox/src/test/java/org/apache/tuscany/equinox/EquinoxStartTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/runtime/equinox/src/test/java/org/apache/tuscany/equinox/EquinoxStartTestCase.java Fri Jun  2 22:12:47 2006
@@ -15,6 +15,8 @@
         FrameworkAdaptor adaptor = new DefaultAdaptor(new String[]{});
         OSGi osgi = new OSGi(adaptor);
         osgi.launch();
+//        FileInputStream stream = new FileInputStream("/Users/jmarino/workspace/tuscany/tuscany/tuscany/sandbox/jboynes/sca/runtime/equinox/src/test/resources/http.jar");
+//        osgi.getBundleContext().installBundle("foo", stream);
         for (Bundle bundle : osgi.getBundleContext().getBundles()) {
 
         }

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java Fri Jun  2 22:12:47 2006
@@ -27,6 +27,7 @@
 
     /**
      * Set the current state of the Lifecycle.
+     *
      * @param lifecycleState the new state
      */
     protected void setLifecycleState(int lifecycleState) {
@@ -43,6 +44,7 @@
 
     /**
      * Returns the current lifecycle as a String (for example, "RUNNING").
+     *
      * @return the current lifecycle as a String
      */
     public String toString() {

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java Fri Jun  2 22:12:47 2006
@@ -17,7 +17,8 @@
 package org.apache.tuscany.spi;
 
 /**
- * The root exception for the runtime package. Exceptions occurring in the runtime are generally non-recoverable
+ * The root exception for the runtime package. Exceptions occurring in the runtime are generally
+ * non-recoverable
  *
  * @version $Rev: 380032 $ $Date: 2006-02-22 19:19:11 -0800 (Wed, 22 Feb 2006) $
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/QualifiedName.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/QualifiedName.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/QualifiedName.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/QualifiedName.java Fri Jun  2 22:12:47 2006
@@ -17,8 +17,8 @@
 package org.apache.tuscany.spi;
 
 /**
- * An evaluated name consisting of a part/port pair. In the runtime, a part generally 'contains' or 'provides' ports
- * such as a component/service point or a component/reference pair.
+ * An evaluated name consisting of a part/port pair. In the runtime, a part generally 'contains' or 'provides'
+ * ports such as a component/service point or a component/reference pair.
  *
  * @version $Rev: 394173 $ $Date: 2006-04-14 11:54:59 -0700 (Fri, 14 Apr 2006) $
  */
@@ -33,8 +33,9 @@
     public static final String NAME_SEPARATOR = "/";
 
     /**
-     * Constructs a new qualified name in the form of part/port where part is the parent context and port represents a
-     * child, which is either a service in the case of an atomic context or a contained context in the case of a composite.
+     * Constructs a new qualified name in the form of part/port where part is the parent context and port
+     * represents a child, which is either a service in the case of an atomic context or a contained context
+     * in the case of a composite.
      *
      * @throws InvalidNameException if the name is in an invalid format
      */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/TuscanyException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/TuscanyException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/TuscanyException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/TuscanyException.java Fri Jun  2 22:12:47 2006
@@ -54,8 +54,8 @@
     }
 
     /**
-     * Returns a collection of names representing the context call stack where the error occured.
-     * The top of the stack is the first element in the collection.
+     * Returns a collection of names representing the context call stack where the error occured. The top of
+     * the stack is the first element in the collection.
      *
      * @return a collection of names representing the context call stack
      */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/TuscanyRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/TuscanyRuntimeException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/TuscanyRuntimeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/TuscanyRuntimeException.java Fri Jun  2 22:12:47 2006
@@ -55,8 +55,8 @@
     }
 
     /**
-     * Returns a collection of names representing the context call stack where the error occured.
-     * The top of the stack is the first element in the collection.
+     * Returns a collection of names representing the context call stack where the error occured. The top of
+     * the stack is the first element in the collection.
      *
      * @return a collection of names representing the context call stack
      */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Autowire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Autowire.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Autowire.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Autowire.java Fri Jun  2 22:12:47 2006
@@ -21,10 +21,10 @@
 
 /**
  * A system annotation to inject an autowired instance
- * 
+ *
  * @version $Rev: 395110 $ $Date: 2006-04-18 19:32:30 -0700 (Tue, 18 Apr 2006) $
  */
-@Target( { METHOD, FIELD })
+@Target({METHOD, FIELD})
 @Retention(RUNTIME)
 public @interface Autowire {
 

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java Fri Jun  2 22:12:47 2006
@@ -26,7 +26,7 @@
  *
  * @version $Rev: 392146 $ $Date: 2006-04-06 18:11:28 -0700 (Thu, 06 Apr 2006) $
  */
-@Target( { ElementType.METHOD, ElementType.FIELD })
+@Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Monitor {
 }

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

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java Fri Jun  2 22:12:47 2006
@@ -16,8 +16,8 @@
  */
 package org.apache.tuscany.spi.builder;
 
-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;
@@ -25,8 +25,8 @@
 
 /**
  * Responsible for processing a service or reference in an assembly configured with a particular binding. The
- * builder will create and return corresponding {@link org.apache.tuscany.spi.context.Service} or
- * {@link org.apache.tuscany.spi.context.Reference}
+ * builder will create and return corresponding {@link org.apache.tuscany.spi.component.Service} or {@link
+ * org.apache.tuscany.spi.component.Reference}
  *
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java Fri Jun  2 22:12:47 2006
@@ -16,15 +16,15 @@
  */
 package org.apache.tuscany.spi.builder;
 
-import org.apache.tuscany.spi.model.Implementation;
-import org.apache.tuscany.spi.model.ComponentDefinition;
+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.model.Binding;
-import org.apache.tuscany.spi.model.BoundServiceDefinition;
 import org.apache.tuscany.spi.model.BoundReferenceDefinition;
-import org.apache.tuscany.spi.context.SCAObject;
-import org.apache.tuscany.spi.context.CompositeComponent;
-import org.apache.tuscany.spi.context.Component;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.model.BoundServiceDefinition;
+import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.Implementation;
 
 /**
  * Implementations build <code>SCAObject</code> types from model objects.
@@ -35,15 +35,15 @@
     /**
      * Builds a <code>Component</code> context from a <code>ComponentDefinition</code>
      *
-     * @param parent the composite that will be the parent of the newly built component
+     * @param parent              the composite that will be the parent of the newly built component
      * @param componentDefinition the component definition as parsed from an SCA assembly
-     * @param deploymentContext the current deployment context
+     * @param deploymentContext   the current deployment context
      * @return a newly created component
      */
     <I extends Implementation<?>> Component<?> build(CompositeComponent<?> parent, ComponentDefinition<I> componentDefinition, DeploymentContext deploymentContext);
 
     /**
-     * TODO: JavaDoc this when we know if we will still register Services as contexts 
+     * TODO: JavaDoc this when we know if we will still register Services as contexts
      */
     <B extends Binding> SCAObject build(CompositeComponent parent, BoundServiceDefinition<B> boundServiceDefinition, DeploymentContext deploymentContext);
 

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java Fri Jun  2 22:12:47 2006
@@ -27,8 +27,8 @@
  */
 public interface BuilderRegistry extends Builder {
     /**
-     * Register a builder based on an implementation type specified in an annotation.
-     * The implementation type is obtained by reflecting the generic definition.
+     * Register a builder based on an implementation type specified in an annotation. The implementation type
+     * is obtained by reflecting the generic definition.
      *
      * @param builder the builder to register
      */
@@ -38,12 +38,13 @@
      * Register a builder for an implementation type.
      *
      * @param implClass the type of implementation that this builder can handle
-     * @param builder the builder to be registered
+     * @param builder   the builder to be registered
      */
     <I extends Implementation<?>> void register(Class<I> implClass, ComponentBuilder<I> builder);
 
     /**
      * Unregister a builder for an implementation type.
+     *
      * @param implClass the implementation whose builder should be unregistered
      */
     <I extends Implementation<?>> void unregister(Class<I> implClass);

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java Fri Jun  2 22:12:47 2006
@@ -16,8 +16,8 @@
  */
 package org.apache.tuscany.spi.builder;
 
-import org.apache.tuscany.spi.context.Component;
-import org.apache.tuscany.spi.context.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.CompositeComponent;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.model.ComponentDefinition;
 import org.apache.tuscany.spi.model.Implementation;

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java Fri Jun  2 22:12:47 2006
@@ -11,7 +11,7 @@
  * 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 java.util.List;
 import java.util.Map;

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AtomicComponent.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AtomicComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AtomicComponent.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.ObjectCreationException;
 
@@ -45,7 +45,8 @@
     void destroy(Object instance) throws TargetException;
 
     /**
-     * Creates a new implementation instance, generally used as a callback by a {@link ScopeContext}
+     * Creates a new implementation instance, generally used as a callback by a {@link
+     * org.apache.tuscany.spi.component.ScopeContext}
      *
      * @throws ObjectCreationException
      */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Component.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Component.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Component.java Fri Jun  2 22:12:47 2006
@@ -1,12 +1,12 @@
-package org.apache.tuscany.spi.context;
+package org.apache.tuscany.spi.component;
 
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.OutboundWire;
 import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.TargetInvoker;
 
 /**
  * The runtime instantiation of an SCA component
@@ -54,7 +54,7 @@
     /**
      * Returns a map of source-side wires for references. There may be 1..n wires per reference.
      */
-    Map<String,List<OutboundWire>> getOutboundWires();
+    Map<String, List<OutboundWire>> getOutboundWires();
 
     /**
      * Callback to create a {@link org.apache.tuscany.spi.wire.TargetInvoker} which dispatches to a service

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ComponentNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ComponentNotFoundException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ComponentNotFoundException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ComponentNotFoundException.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 a component cannot be found

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java Fri Jun  2 22:12:47 2006
@@ -11,7 +11,7 @@
  * 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.CoreRuntimeException;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.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 java.util.List;
 
@@ -63,7 +63,6 @@
     List<Reference> getReferences();
 
     /**
-     *
      * @param scopeContext
      */
     void setScopeContext(ScopeContext scopeContext);

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/DuplicateNameException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/DuplicateNameException.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/DuplicateNameException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/DuplicateNameException.java Fri Jun  2 22:12:47 2006
@@ -1,4 +1,4 @@
-package org.apache.tuscany.spi.context;
+package org.apache.tuscany.spi.component;
 
 /**
  * Denotes an attempt to add an child to a composite component with a name equal to an existing child

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

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/InstanceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/InstanceWrapper.java?rev=411384&r1=411383&r2=411384&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/InstanceWrapper.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/InstanceWrapper.java Fri Jun  2 22:12:47 2006
@@ -14,13 +14,13 @@
  *  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;
 
 /**
- * Provides lifecycle management for an implementation instance associated with an {@link AtomicComponent} for use by the atomic context's
- * associated {@link ScopeContext}
+ * Provides lifecycle management for an implementation instance associated with an {@link AtomicComponent} for
+ * use by the atomic context's associated {@link ScopeContext}
  *
  * @version $Rev$ $Date$
  */



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