tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r399161 [3/7] - in /incubator/tuscany/sandbox/jboynes/sca: ./ bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/mocks/tuscany/ core/src/main/java/org/apache/tuscany/core/async/builder/ core/src/main/java/org/apache/t...
Date Wed, 03 May 2006 06:09:51 GMT
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/OneWayInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/OneWayInterceptor.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/OneWayInterceptor.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/OneWayInterceptor.java Tue May  2 23:09:37 2006
@@ -16,9 +16,9 @@
  */
 package org.apache.tuscany.core.wire.impl;
 
-import org.apache.tuscany.core.wire.Interceptor;
-import org.apache.tuscany.core.wire.MessageChannel;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.MessageChannel;
+import org.apache.tuscany.spi.wire.Message;
 
 /**
  * An interceptor that sends the wire Message down its request channel and does not expect a response.

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/RequestResponseInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/RequestResponseInterceptor.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/RequestResponseInterceptor.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/impl/RequestResponseInterceptor.java Tue May  2 23:09:37 2006
@@ -16,9 +16,9 @@
  */
 package org.apache.tuscany.core.wire.impl;
 
-import org.apache.tuscany.core.wire.Interceptor;
-import org.apache.tuscany.core.wire.MessageChannel;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.MessageChannel;
+import org.apache.tuscany.spi.wire.Message;
 
 /**
  * An interceptor that first sends a message down its request channel then extracts the response from the
@@ -43,7 +43,7 @@
      * @param targetResponseChannel the channel to sent response messages down
      */
     public RequestResponseInterceptor(MessageChannel sourceRequestChannel, MessageChannel targetRequestChannel,
-            MessageChannel sourceResponseChannel, MessageChannel targetResponseChannel) {
+                                      MessageChannel sourceResponseChannel, MessageChannel targetResponseChannel) {
         this.sourceRequestChannel = sourceRequestChannel;
         this.sourceResponseChannel = sourceResponseChannel;
         this.targetRequestChannel = targetRequestChannel;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java Tue May  2 23:09:37 2006
@@ -16,11 +16,11 @@
  */
 package org.apache.tuscany.core.wire.jdk;
 
-import org.apache.tuscany.core.context.TargetException;
-import org.apache.tuscany.core.wire.Interceptor;
+import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.spi.wire.Interceptor;
 import org.apache.tuscany.core.wire.InvocationConfiguration;
-import org.apache.tuscany.core.wire.TargetInvoker;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.Message;
 import org.apache.tuscany.core.message.MessageFactory;
 
 import java.lang.reflect.InvocationHandler;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWireFactory.java Tue May  2 23:09:37 2006
@@ -14,9 +14,9 @@
 package org.apache.tuscany.core.wire.jdk;
 
 import org.apache.tuscany.core.wire.MethodHashMap;
-import org.apache.tuscany.core.wire.WireFactoryInitException;
+import org.apache.tuscany.spi.wire.WireFactoryInitException;
 import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
-import org.apache.tuscany.core.wire.SourceWireFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
 import org.apache.tuscany.core.wire.WireSourceConfiguration;
 
 import java.lang.reflect.InvocationHandler;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWireFactory.java Tue May  2 23:09:37 2006
@@ -1,9 +1,9 @@
 package org.apache.tuscany.core.wire.jdk;
 
 import org.apache.tuscany.core.wire.MethodHashMap;
-import org.apache.tuscany.core.wire.WireFactoryInitException;
+import org.apache.tuscany.spi.wire.WireFactoryInitException;
 import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
 import org.apache.tuscany.core.wire.WireTargetConfiguration;
 
 import java.lang.reflect.InvocationHandler;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactory.java Tue May  2 23:09:37 2006
@@ -13,9 +13,9 @@
  */
 package org.apache.tuscany.core.wire.jdk;
 
-import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.apache.tuscany.core.wire.TargetWireFactory;
-import org.apache.tuscany.core.wire.WireFactoryFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.WireFactoryFactory;
 import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
@@ -24,7 +24,7 @@
 import java.lang.reflect.Proxy;
 
 /**
- * A system service that creates JDK dynamic proxy-based {@link org.apache.tuscany.core.wire.WireFactory}s
+ * A system service that creates JDK dynamic proxy-based {@link org.apache.tuscany.spi.wire.WireFactory}s
  *
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/service/DefaultWireFactoryService.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/service/DefaultWireFactoryService.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/service/DefaultWireFactoryService.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/service/DefaultWireFactoryService.java Tue May  2 23:09:37 2006
@@ -14,20 +14,20 @@
 package org.apache.tuscany.core.wire.service;
 
 import org.apache.tuscany.core.config.JavaIntrospectionHelper;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.builder.BuilderConfigException;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.system.annotation.Autowire;
 import org.apache.tuscany.core.wire.MethodHashMap;
-import org.apache.tuscany.core.wire.WireFactoryFactory;
+import org.apache.tuscany.spi.wire.WireFactoryFactory;
 import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
-import org.apache.tuscany.core.wire.SourceWireFactory;
 import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
 import org.apache.tuscany.core.wire.WireSourceConfiguration;
 import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
 import org.apache.tuscany.core.builder.system.PolicyBuilderRegistry;
-import org.apache.tuscany.core.builder.BuilderConfigException;
 import org.apache.tuscany.model.assembly.ConfiguredService;
 import org.apache.tuscany.model.assembly.ConfiguredReference;
 import org.apache.tuscany.model.assembly.EntryPoint;
@@ -85,7 +85,7 @@
     public void init() {
     }
 
-    public List<SourceWireFactory> createSourceFactory(ConfiguredReference configuredReference) throws BuilderConfigException{
+    public List<SourceWireFactory> createSourceFactory(ConfiguredReference configuredReference) throws BuilderConfigException {
         String referenceName = configuredReference.getPort().getName();
         Class interfaze;
         // FIXME hack for NPE when entry points with no set service contract on their configuredReference

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/service/WireFactoryService.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/service/WireFactoryService.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/service/WireFactoryService.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/wire/service/WireFactoryService.java Tue May  2 23:09:37 2006
@@ -13,19 +13,19 @@
  */
 package org.apache.tuscany.core.wire.service;
 
-import org.apache.tuscany.core.builder.BuilderConfigException;
-import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.spi.builder.BuilderConfigException;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
 import org.apache.tuscany.model.assembly.ConfiguredReference;
 import org.apache.tuscany.model.assembly.ConfiguredService;
 
 import java.util.List;
 
 /**
- * Implementations provide a system service that creates {@link org.apache.tuscany.core.wire.SourceWireFactory}s
- * and {@link org.apache.tuscany.core.wire.TargetWireFactory}s. This service is used by {@link
+ * Implementations provide a system service that creates {@link org.apache.tuscany.spi.wire.SourceWireFactory}s
+ * and {@link org.apache.tuscany.spi.wire.TargetWireFactory}s. This service is used by {@link
  * org.apache.tuscany.core.builder.ContextFactoryBuilder}s to provide {@link org.apache.tuscany.core.builder.ContextFactory}s with
- * {@link org.apache.tuscany.core.wire.WireFactory}s for their references and target services. This service is typically autowired
+ * {@link org.apache.tuscany.spi.wire.WireFactory}s for their references and target services. This service is typically autowired
  * to.
  *
  * @version $$Rev$$ $$Date$$
@@ -36,7 +36,7 @@
      * Creates the source-side wire factory for a reference
      *
      * @param configuredReference the configured reference to create the wire factory for
-     * @throws BuilderConfigException
+     * @throws org.apache.tuscany.spi.builder.BuilderConfigException
      */
     public List<SourceWireFactory> createSourceFactory(ConfiguredReference configuredReference) throws BuilderConfigException;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/system.module
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/system.module?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/system.module (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/system.module Tue May  2 23:09:37 2006
@@ -71,7 +71,7 @@
          <system:implementation.system class="org.apache.tuscany.core.message.impl.MessageFactoryImpl"/>
     </component>
 
-    <component name="org.apache.tuscany.core.wire.WireFactoryFactory">
+    <component name="org.apache.tuscany.spi.wire.WireFactoryFactory">
          <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKWireFactoryFactory"/>
      </component>
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/invocation/AsyncInvocationConfigurationTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/invocation/AsyncInvocationConfigurationTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/invocation/AsyncInvocationConfigurationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/invocation/AsyncInvocationConfigurationTestCase.java Tue May  2 23:09:37 2006
@@ -25,7 +25,7 @@
 import org.apache.tuscany.core.async.wire.mock.SimpleTarget;
 import org.apache.tuscany.core.async.wire.mock.SimpleTargetImpl;
 import org.apache.tuscany.core.async.work.DefaultWorkManager;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.Message;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
 import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
@@ -39,7 +39,7 @@
     private Method hello;
 
     private MessageFactory factory = new MessageFactoryImpl();
-    
+
     public AsyncInvocationConfigurationTestCase() {
         super();
     }
@@ -50,15 +50,15 @@
 
     protected void setUp() throws Exception {
         hello = SimpleTarget.class.getMethod("hello", String.class);
-        
+
         workManager=new DefaultWorkManager();
         workManager.setScheduledMaximumPoolSize(5);
         workManager.init();
     }
-    
+
     protected void tearDown() throws Exception {
         workManager.destroy();
-        
+
         super.tearDown();
     }
 
@@ -69,7 +69,7 @@
         SourceInvocationConfiguration source = new SourceInvocationConfiguration(hello);
 
         source.addInterceptor(new AsyncInterceptor(workManager, factory));
-        
+
         MockHandler sourceRequestHandler = new MockHandler();
         MockHandler sourceResponseHandler = new MockHandler();
         MockSyncInterceptor sourceInterceptor = new MockSyncInterceptor();
@@ -91,7 +91,7 @@
         source.setTargetResponseChannel(new MessageChannelImpl(target.getResponseHandlers()));
         source.build();
         target.build();
-        
+
         CountDownLatch startSignal = new CountDownLatch(1);
         CountDownLatch doneSignal = new CountDownLatch(1);
         MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl(startSignal, doneSignal));
@@ -103,7 +103,7 @@
         Message response = source.getHeadInterceptor().invoke(msg);
         startSignal.countDown();
         doneSignal.await();
-        
+
         Assert.assertEquals(null, response.getBody());
         Assert.assertEquals(1, sourceRequestHandler.getCount());
         //FIXME why isn't the responseHandler invoked?
@@ -119,7 +119,7 @@
         SourceInvocationConfiguration source = new SourceInvocationConfiguration(hello);
 
         source.addInterceptor(new AsyncInterceptor(workManager, factory));
-        
+
         MockHandler sourceRequestHandler = new MockHandler();
         MockSyncInterceptor sourceInterceptor = new MockSyncInterceptor();
         source.addRequestHandler(sourceRequestHandler);
@@ -149,7 +149,7 @@
         Message response = source.getHeadInterceptor().invoke(msg);
         startSignal.countDown();
         doneSignal.await();
-        
+
         Assert.assertEquals(null, response.getBody());
         Assert.assertEquals(1, sourceRequestHandler.getCount());
         Assert.assertEquals(1, sourceInterceptor.getCount());
@@ -162,9 +162,9 @@
      */
     public void testInvokeWithInterceptorsOnly() throws Exception {
         SourceInvocationConfiguration source = new SourceInvocationConfiguration(hello);
-        
+
         source.addInterceptor(new AsyncInterceptor(workManager, factory));
-        
+
         MockSyncInterceptor sourceInterceptor = new MockSyncInterceptor();
         source.addInterceptor(sourceInterceptor);
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockHandler.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockHandler.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockHandler.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockHandler.java Tue May  2 23:09:37 2006
@@ -3,8 +3,8 @@
  */
 package org.apache.tuscany.core.async.wire.mock;
 
-import org.apache.tuscany.core.wire.MessageHandler;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.MessageHandler;
+import org.apache.tuscany.spi.wire.Message;
 
 /**
  *
@@ -12,13 +12,13 @@
 public class MockHandler implements MessageHandler {
 
     private int count =0;
-    
+
     public boolean processMessage(Message message) {
         //System.out.println("Invoking handler");
         count++;
         return true;
     }
-    
+
     public int getCount(){
         return count;
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockStaticInvoker.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockStaticInvoker.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockStaticInvoker.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockStaticInvoker.java Tue May  2 23:09:37 2006
@@ -3,10 +3,10 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.wire.Interceptor;
-import org.apache.tuscany.core.wire.InvocationRuntimeException;
-import org.apache.tuscany.core.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.InvocationRuntimeException;
+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

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockSyncInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockSyncInterceptor.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockSyncInterceptor.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/async/wire/mock/MockSyncInterceptor.java Tue May  2 23:09:37 2006
@@ -16,8 +16,8 @@
  */
 package org.apache.tuscany.core.async.wire.mock;
 
-import org.apache.tuscany.core.wire.Interceptor;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.Message;
 
 public class MockSyncInterceptor implements Interceptor {
 
@@ -37,7 +37,7 @@
     public int getCount() {
         return count;
     }
-    
+
     public void setNext(Interceptor next) {
         this.next=next;
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java Tue May  2 23:09:37 2006
@@ -2,15 +2,16 @@
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
 import org.apache.tuscany.core.wire.MethodHashMap;
 import org.apache.tuscany.core.wire.WireSourceConfiguration;
 import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
 import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
-import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.apache.tuscany.core.wire.WireFactoryFactory;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
+import org.apache.tuscany.spi.wire.WireFactoryFactory;
+import org.apache.tuscany.spi.wire.Message;
 import org.apache.tuscany.core.wire.mock.SimpleTarget;
 import org.apache.tuscany.core.wire.mock.MockHandler;
 import org.apache.tuscany.core.wire.mock.MockSyncInterceptor;
@@ -18,7 +19,6 @@
 import org.apache.tuscany.core.wire.mock.SimpleTargetImpl;
 import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
 import org.apache.tuscany.core.wire.jdk.JDKWireFactoryFactory;
-import org.apache.tuscany.core.message.Message;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java Tue May  2 23:09:37 2006
@@ -1,16 +1,16 @@
 package org.apache.tuscany.core.builder.impl;
 
 import junit.framework.TestCase;
-import org.apache.tuscany.core.builder.BuilderConfigException;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.builder.BuilderConfigException;
+import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.core.wire.MethodHashMap;
 import org.apache.tuscany.core.wire.WireSourceConfiguration;
 import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
 import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
-import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.apache.tuscany.core.wire.TargetWireFactory;
-import org.apache.tuscany.core.wire.WireFactoryFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.WireFactoryFactory;
 import org.apache.tuscany.core.wire.jdk.JDKWireFactoryFactory;
 import org.apache.tuscany.core.wire.mock.SimpleTarget;
 import org.apache.tuscany.core.message.MessageFactory;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java Tue May  2 23:09:37 2006
@@ -28,6 +28,7 @@
 import org.apache.tuscany.model.assembly.EntryPoint;
 import org.apache.tuscany.model.assembly.Scope;
 import org.apache.tuscany.model.assembly.impl.AssemblyContextImpl;
+import org.apache.tuscany.spi.QualifiedName;
 import org.osoa.sca.ModuleContext;
 import org.osoa.sca.ServiceUnavailableException;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/QualifiedNameTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/QualifiedNameTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/QualifiedNameTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/QualifiedNameTestCase.java Tue May  2 23:09:37 2006
@@ -14,6 +14,8 @@
 package org.apache.tuscany.core.context;
  
 import junit.framework.TestCase;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.InvalidNameException;
 
 /**
  * Tests parsing of naming patters

Added: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/SimpleCompositeContextTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/SimpleCompositeContextTestCase.java?rev=399161&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/SimpleCompositeContextTestCase.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/SimpleCompositeContextTestCase.java Tue May  2 23:09:37 2006
@@ -0,0 +1,87 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation or its licensors as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tuscany.core.context;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.core.context.event.ModuleStart;
+import org.apache.tuscany.core.context.event.ModuleStop;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class SimpleCompositeContextTestCase extends TestCase implements RuntimeEventListener {
+    private SimpleCompositeContext context;
+    private List<Event> events;
+
+    public void testRegisterChild() {
+        SimpleCompositeContext child = new SimpleCompositeContext("child");
+        context.registerContext(child);
+        assertSame(context, child.getParent());
+        assertSame(child, context.getContext("child"));
+        try {
+            context.registerContext(child);
+            fail();
+        } catch (IllegalStateException e) {
+            // ok
+        }
+    }
+
+    public void testStartEventSent() {
+        context.addListener(this);
+        context.start();
+        assertEquals(1, events.size());
+        Event event = events.get(0);
+        assertTrue(event instanceof ModuleStart);
+        assertSame(context, event.getSource());
+    }
+
+    public void testStopEventSent() {
+        context.start();
+        context.addListener(this);
+        context.stop();
+        assertEquals(1, events.size());
+        Event event = events.get(0);
+        assertTrue(event instanceof ModuleStop);
+        assertSame(context, event.getSource());
+    }
+
+    public void testDuplicateNameException() {
+        SimpleCompositeContext child1 = new SimpleCompositeContext("child");
+        SimpleCompositeContext child2 = new SimpleCompositeContext("child");
+        context.registerContext(child1);
+        try {
+            context.registerContext(child2);
+            fail();
+        } catch (DuplicateNameException e) {
+            // ok
+        }
+    }
+
+    public void onEvent(Event event) {
+        events.add(event);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        context = new SimpleCompositeContext("parent");
+        events = new ArrayList<Event>();
+    }
+}

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

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

Added: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeManagerTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeManagerTestCase.java?rev=399161&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeManagerTestCase.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/context/scope/ModuleScopeManagerTestCase.java Tue May  2 23:09:37 2006
@@ -0,0 +1,68 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation or its licensors as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tuscany.core.context.scope;
+
+import junit.framework.TestCase;
+import org.apache.tuscany.core.context.InstanceContext;
+import org.apache.tuscany.core.context.InstanceContextFactory;
+import org.apache.tuscany.core.context.Lifecycle;
+import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.core.context.impl.AbstractLifecycle;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ModuleScopeManagerTestCase extends TestCase {
+    private ModuleScopeManager scopeManager;
+    private MockInstanceFactory factory1;
+
+    public void testLifecycle() {
+        InstanceContext instanceContext = scopeManager.getInstance(factory1);
+        assertSame(factory1.instanceContext, instanceContext);
+        assertEquals(Lifecycle.STARTED, instanceContext.getLifecycleState());
+        scopeManager.stop();
+        assertEquals(Lifecycle.STOPPED, instanceContext.getLifecycleState());
+    }
+
+    public void testCaching() {
+        InstanceContext instanceContext = scopeManager.getInstance(factory1);
+        assertSame(factory1.instanceContext, instanceContext);
+        InstanceContext instanceContext2 = scopeManager.getInstance(factory1);
+        assertSame(instanceContext, instanceContext2);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        scopeManager = new ModuleScopeManager();
+        factory1 = new MockInstanceFactory();
+    }
+
+    private class MockInstanceFactory implements InstanceContextFactory {
+        private MockInstanceContext instanceContext;
+
+        public InstanceContext createContext() throws TargetException {
+            instanceContext = new MockInstanceContext();
+            return instanceContext;
+        }
+    }
+
+    private class MockInstanceContext extends AbstractLifecycle implements InstanceContext {
+        public Object getInstance() {
+            return null;
+        }
+    }
+}

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

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

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java Tue May  2 23:09:37 2006
@@ -2,14 +2,14 @@
 
 import junit.framework.TestCase;
 import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.core.context.ScopeContext;
-import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.wire.Interceptor;
+import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.Interceptor;
 import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
-import org.apache.tuscany.core.wire.TargetInvoker;
-import org.apache.tuscany.core.wire.TargetWireFactory;
 import org.apache.tuscany.core.wire.WireTargetConfiguration;
+import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
 import org.apache.tuscany.core.wire.jdk.JDKTargetWireFactory;
 import org.apache.tuscany.core.wire.mock.MockScopeContext;
 import org.apache.tuscany.model.assembly.Implementation;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java Tue May  2 23:09:37 2006
@@ -33,7 +33,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.core.config.ConfigurationLoadException;
 import org.apache.tuscany.core.loader.impl.JNDIPropertyFactory;
 import org.apache.tuscany.model.assembly.AssemblyFactory;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java Tue May  2 23:09:37 2006
@@ -17,7 +17,7 @@
 package org.apache.tuscany.core.loader;
 
 import junit.framework.TestCase;
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.core.config.ConfigurationLoadException;
 import org.apache.tuscany.core.loader.impl.StringParserPropertyFactory;
 import org.apache.tuscany.model.assembly.AssemblyFactory;

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

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java Tue May  2 23:09:37 2006
@@ -13,13 +13,13 @@
  */
 package org.apache.tuscany.core.mock;
 
-import org.apache.tuscany.core.builder.BuilderConfigException;
+import org.apache.tuscany.spi.builder.BuilderConfigException;
+import org.apache.tuscany.spi.wire.TargetWireFactory;
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.builder.impl.AssemblyVisitorImpl;
 import org.apache.tuscany.core.context.ConfigurationContext;
 import org.apache.tuscany.core.context.ScopeContext;
-import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.spi.wire.SourceWireFactory;
 import org.apache.tuscany.model.assembly.AssemblyObject;
 
 import java.util.ArrayList;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java Tue May  2 23:09:37 2006
@@ -69,17 +69,17 @@
      * Creates an composite component with the given name
      */
     public static ModuleComponent createCompositeComponent(String name) {
-        ModuleComponent sc = systemFactory.createModuleComponent();
-        Module impl = systemFactory.createModule();
-        impl.setName(name);
-        //impl.setImplementationClass(CompositeContextImpl.class);
-        sc.setImplementation(impl);
         Service s = systemFactory.createService();
         JavaServiceContract ji = systemFactory.createJavaServiceContract();
         s.setServiceContract(ji);
         ji.setScope(Scope.AGGREGATE);
+
+        Module impl = systemFactory.createModule();
+        impl.setName(name);
         impl.setComponentInfo(systemFactory.createComponentInfo());
         impl.getComponentInfo().getServices().add(s);
+
+        ModuleComponent sc = systemFactory.createModuleComponent();
         sc.setName(name);
         sc.setImplementation(impl);
         return sc;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java Tue May  2 23:09:37 2006
@@ -19,7 +19,7 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.core.builder.BuilderException;
+import org.apache.tuscany.spi.builder.BuilderException;
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.builder.impl.AssemblyVisitorImpl;
 import org.apache.tuscany.core.mock.component.ModuleScopeSystemComponent;
@@ -53,7 +53,7 @@
 
     private SystemAssemblyFactory factory = new SystemAssemblyFactoryImpl();
     private AssemblyContext assemblyContext = new AssemblyContextImpl(factory, null, null);
-     
+
     public void testModelVisit() throws Exception {
         ComponentInfo componentType;
         Service service;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java Tue May  2 23:09:37 2006
@@ -17,7 +17,7 @@
 import junit.framework.TestCase;
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.context.CompositeContext;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.core.context.event.ModuleStart;
 import org.apache.tuscany.core.context.event.ModuleStop;
 import org.apache.tuscany.core.context.impl.EventContextImpl;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java Tue May  2 23:09:37 2006
@@ -3,7 +3,7 @@
 import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Scope;
 
-import org.apache.tuscany.core.builder.BuilderException;
+import org.apache.tuscany.spi.builder.BuilderException;
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
 import org.apache.tuscany.core.system.annotation.Autowire;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java Tue May  2 23:09:37 2006
@@ -22,9 +22,11 @@
 import org.apache.tuscany.core.wire.mock.MockSyncInterceptor;
 import org.apache.tuscany.core.wire.mock.SimpleTargetImpl;
 import org.apache.tuscany.core.wire.mock.MockStaticInvoker;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.Message;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
+import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
+import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
 
 import java.lang.reflect.Method;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java Tue May  2 23:09:37 2006
@@ -22,9 +22,11 @@
 import org.apache.tuscany.core.wire.mock.MockSyncInterceptor;
 import org.apache.tuscany.core.wire.mock.MockStaticInvoker;
 import org.apache.tuscany.core.wire.mock.SimpleTargetImpl;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.Message;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
+import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
+import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
 
 import java.lang.reflect.Method;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java Tue May  2 23:09:37 2006
@@ -24,6 +24,9 @@
 import org.apache.tuscany.core.wire.mock.MockStaticInvoker;
 import org.apache.tuscany.core.wire.mock.MockSyncInterceptor;
 import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
+import org.apache.tuscany.core.wire.InvocationConfiguration;
+import org.apache.tuscany.core.wire.MethodHashMap;
+import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java Tue May  2 23:09:37 2006
@@ -15,11 +15,11 @@
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.core.wire.MethodHashMap;
-import org.apache.tuscany.core.wire.WireSourceConfiguration;
 import org.apache.tuscany.core.wire.SourceInvocationConfiguration;
 import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
+import org.apache.tuscany.core.wire.WireSourceConfiguration;
 import org.apache.tuscany.core.wire.WireTargetConfiguration;
 import org.apache.tuscany.core.wire.impl.InvokerInterceptor;
 import org.apache.tuscany.core.wire.mock.MockStaticInvoker;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockHandler.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockHandler.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockHandler.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockHandler.java Tue May  2 23:09:37 2006
@@ -3,8 +3,8 @@
  */
 package org.apache.tuscany.core.wire.mock;
 
-import org.apache.tuscany.core.wire.MessageHandler;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.MessageHandler;
+import org.apache.tuscany.spi.wire.Message;
 
 /**
  *
@@ -12,13 +12,13 @@
 public class MockHandler implements MessageHandler {
 
     private int count =0;
-    
+
     public boolean processMessage(Message message) {
         //System.out.println("Invoking handler");
         count++;
         return true;
     }
-    
+
     public int getCount(){
         return count;
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockScopeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockScopeContext.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockScopeContext.java Tue May  2 23:09:37 2006
@@ -19,13 +19,13 @@
 import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.ScopeContext;
 import org.apache.tuscany.core.context.RuntimeEventListener;
-import org.apache.tuscany.core.context.ContextRuntimeException;
+import org.apache.tuscany.spi.context.ContextRuntimeException;
 import org.apache.tuscany.core.context.AtomicContext;
 import org.apache.tuscany.core.context.ScopeRuntimeException;
-import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.core.context.Context;
-import org.apache.tuscany.core.context.EventFilter;
-import org.apache.tuscany.core.context.event.Event;
+import org.apache.tuscany.spi.event.EventFilter;
+import org.apache.tuscany.spi.event.Event;
 import org.apache.tuscany.model.assembly.AtomicComponent;
 
 import java.util.HashMap;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockStaticInvoker.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockStaticInvoker.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockStaticInvoker.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockStaticInvoker.java Tue May  2 23:09:37 2006
@@ -1,9 +1,9 @@
 package org.apache.tuscany.core.wire.mock;
 
-import org.apache.tuscany.core.wire.Interceptor;
-import org.apache.tuscany.core.wire.InvocationRuntimeException;
-import org.apache.tuscany.core.wire.TargetInvoker;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.InvocationRuntimeException;
+import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.Message;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockSyncInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockSyncInterceptor.java?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockSyncInterceptor.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockSyncInterceptor.java Tue May  2 23:09:37 2006
@@ -16,8 +16,8 @@
  */
 package org.apache.tuscany.core.wire.mock;
 
-import org.apache.tuscany.core.wire.Interceptor;
-import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.Message;
 
 public class MockSyncInterceptor implements Interceptor {
 
@@ -37,7 +37,7 @@
     public int getCount() {
         return count;
     }
-    
+
     public void setNext(Interceptor next) {
         this.next=next;
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/model/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/model/pom.xml?rev=399161&r1=398535&r2=399161&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/model/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/model/pom.xml Tue May  2 23:09:37 2006
@@ -28,45 +28,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>sca-api</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany</groupId>
-            <artifactId>tuscany-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commonj</groupId>
-            <artifactId>sdo-api</artifactId>
-            <version>SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-wsdl4j</artifactId>
-            <version>1.2</version>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>1.5.2</version>
             <scope>compile</scope>
         </dependency>
         
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>2.2</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>



Mime
View raw message