tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r453681 - in /incubator/tuscany/sandbox/ant/container.easy/src: main/java/org/apache/tuscany/container/easy/ test/java/org/apache/tuscany/container/easy/
Date Fri, 06 Oct 2006 17:10:07 GMT
Author: antelder
Date: Fri Oct  6 10:10:06 2006
New Revision: 453681

URL: http://svn.apache.org/viewvc?view=rev&rev=453681
Log:
Fix async by passing the workscheduler around everywhere

Modified:
    incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponent.java
    incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentBuilder.java
    incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTestCase.java
    incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyInvokerTestCase.java

Modified: incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponent.java?view=diff&rev=453681&r1=453680&r2=453681
==============================================================================
--- incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponent.java
(original)
+++ incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponent.java
Fri Oct  6 10:10:06 2006
@@ -32,6 +32,7 @@
 import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.extension.AtomicComponentExtension;
 import org.apache.tuscany.spi.model.Operation;
+import org.apache.tuscany.spi.services.work.WorkScheduler;
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.apache.tuscany.spi.wire.OutboundWire;
 import org.apache.tuscany.spi.wire.TargetInvoker;
@@ -49,9 +50,9 @@
     protected EasyInstanceFactory instanceFactory;
 
     public EasyComponent(String name, EasyInstanceFactory instanceFactory, Map<String,
Object> properties, List<Class<?>> services, CompositeComponent parent, ScopeContainer
scopeContainer,
-            WireService wireService, WorkContext workContext) {
+            WireService wireService, WorkContext workContext, WorkScheduler workScheduler)
{
 
-        super(name, parent, scopeContainer, wireService, workContext, null, 0);
+        super(name, parent, scopeContainer, wireService, workContext, workScheduler, 0);
 
         this.instanceFactory = instanceFactory;
         this.services = services;

Modified: incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentBuilder.java?view=diff&rev=453681&r1=453680&r2=453681
==============================================================================
--- incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentBuilder.java
(original)
+++ incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentBuilder.java
Fri Oct  6 10:10:06 2006
@@ -77,7 +77,7 @@
             scopeContainer = scopeRegistry.getScopeContainer(scope);
         }
 
-        return new EasyComponent(name, implementation.getScriptInstanceFactory(), properties,
services, parent, scopeContainer, wireService, workContext);
+        return new EasyComponent(name, implementation.getScriptInstanceFactory(), properties,
services, parent, scopeContainer, wireService, workContext, workScheduler);
     }
 
 }

Modified: incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTestCase.java?view=diff&rev=453681&r1=453680&r2=453681
==============================================================================
--- incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTestCase.java
(original)
+++ incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTestCase.java
Fri Oct  6 10:10:06 2006
@@ -33,7 +33,7 @@
 
     @SuppressWarnings("unchecked")
     public void testCreateTargetInvoker() {
-        EasyComponent component = new EasyComponent(null,null, null, null, null, scopeContainer,
null, null);
+        EasyComponent component = new EasyComponent(null,null, null, null, null, scopeContainer,
null, null, null);
         
         Operation operation = new Operation("hashCode", null,null,null,false,null);
         ServiceContract contract = new ServiceContract(List.class){};
@@ -45,7 +45,7 @@
 
     @SuppressWarnings("unchecked")
     public void testCreateInstance() throws IOException {
-        EasyComponent pc = new EasyComponent(null,createBSFEasy(), new HashMap(), null, null,
scopeContainer, null, null);
+        EasyComponent pc = new EasyComponent(null,createBSFEasy(), new HashMap(), null, null,
scopeContainer, null, null, null);
         Object o = pc.createInstance();
         assertNotNull(o);
         assertTrue(o instanceof EasyInstance);
@@ -60,7 +60,7 @@
             }
         });
        
-        EasyComponent pc = new EasyComponent(null,createBSFEasy(), new HashMap(), null, null,
scopeContainer, wireService, null);
+        EasyComponent pc = new EasyComponent(null,createBSFEasy(), new HashMap(), null, null,
scopeContainer, wireService, null, null);
         OutboundWire wire = new OutboundWireImpl();
         wire.setReferenceName("foo");
         pc.addOutboundWire(wire);
@@ -78,7 +78,7 @@
             }
         });
         replay(wireService);
-        EasyComponent pc = new EasyComponent(null,null, null, null, null, scopeContainer,
wireService, null);
+        EasyComponent pc = new EasyComponent(null,null, null, null, null, scopeContainer,
wireService, null, null);
         InboundWire wire = new InboundWireImpl();
         pc.addInboundWire(wire);
         assertEquals("foo", pc.getServiceInstance());
@@ -86,7 +86,7 @@
 
     @SuppressWarnings("unchecked")
     public void testGetServiceInstanceFail() {
-        EasyComponent pc = new EasyComponent(null,null, null, null, null, scopeContainer,
null, null);
+        EasyComponent pc = new EasyComponent(null,null, null, null, null, scopeContainer,
null, null, null);
         try {
             pc.getServiceInstance();
             fail();
@@ -97,20 +97,20 @@
 
     @SuppressWarnings("unchecked")
     public void testGetproperties() {
-        EasyComponent pc = new EasyComponent(null,null, new HashMap(), null, null, scopeContainer,
null, null);
+        EasyComponent pc = new EasyComponent(null,null, new HashMap(), null, null, scopeContainer,
null, null, null);
         assertNotNull(pc.getProperties());
     }
 
     @SuppressWarnings("unchecked")
     public void testGetServiceInterfaces() {
         List services = new ArrayList();
-        EasyComponent pc = new EasyComponent(null,null,null, services, null, scopeContainer,
null,null);
+        EasyComponent pc = new EasyComponent(null,null,null, services, null, scopeContainer,
null, null, null);
         assertEquals(services, pc.getServiceInterfaces());
     }
 
     @SuppressWarnings("unchecked")
     public void testCreateAsyncTargetInvoker() {
-        EasyComponent pc = new EasyComponent(null,null,null, new ArrayList<Class<?>>(),
null, scopeContainer, null,null);
+        EasyComponent pc = new EasyComponent(null,null,null, new ArrayList<Class<?>>(),
null, scopeContainer, null, null, null);
         assertNotNull(pc.createAsyncTargetInvoker(null, new Operation("foo", null,null,null)));
     }
     

Modified: incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyInvokerTestCase.java?view=diff&rev=453681&r1=453680&r2=453681
==============================================================================
--- incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyInvokerTestCase.java
(original)
+++ incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyInvokerTestCase.java
Fri Oct  6 10:10:06 2006
@@ -56,6 +56,6 @@
         });
         replay(scopeContainer);
 
-        this.component = new EasyComponent(null, null, null, null, null, scopeContainer,
null, null);
+        this.component = new EasyComponent(null, null, null, null, null, scopeContainer,
null, null, null);
     }
 }



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