You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/05/24 08:23:07 UTC

svn commit: r409079 - in /incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src: main/java/org/apache/tuscany/container/extension/loader/ main/java/org/apache/tuscany/container/groovy/ test/java/org/apache/tuscany/container/groovy/

Author: jmarino
Date: Tue May 23 23:23:06 2006
New Revision: 409079

URL: http://svn.apache.org/viewvc?rev=409079&view=rev
Log:
changes to accomodate scope refactors

Modified:
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/extension/loader/AbstractImplementationLoader.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/extension/loader/AbstractImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/extension/loader/AbstractImplementationLoader.java?rev=409079&r1=409078&r2=409079&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/extension/loader/AbstractImplementationLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/extension/loader/AbstractImplementationLoader.java Tue May 23 23:23:06 2006
@@ -28,7 +28,6 @@
 import org.apache.tuscany.spi.model.Implementation;
 import org.apache.tuscany.spi.model.ComponentType;
 import org.apache.tuscany.spi.loader.StAXElementLoader;
-import org.apache.tuscany.spi.loader.LoaderContext;
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.osoa.sca.annotations.Scope;
 

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java?rev=409079&r1=409078&r2=409079&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java Tue May 23 23:23:06 2006
@@ -27,6 +27,7 @@
 import org.apache.tuscany.spi.context.CompositeContext;
 import org.apache.tuscany.spi.context.InstanceWrapper;
 import org.apache.tuscany.spi.context.TargetException;
+import org.apache.tuscany.spi.context.ScopeContext;
 import org.apache.tuscany.spi.extension.AtomicContextExtension;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.SourceWire;
@@ -44,8 +45,8 @@
     private List<PropertyInjector> injectors;
 
     public GroovyAtomicContext(String name, String script, List<Class<?>>services, Scope scope,
-                               List<PropertyInjector> injectors, CompositeContext parent) {
-        super(name, parent);
+                               List<PropertyInjector> injectors, CompositeContext parent, ScopeContext scopeContext) {
+        super(name, parent, scopeContext);
         this.script = script;
         this.services = services;
         this.scope = scope;

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java?rev=409079&r1=409078&r2=409079&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java Tue May 23 23:23:06 2006
@@ -11,6 +11,7 @@
 import org.apache.tuscany.spi.context.ComponentContext;
 import org.apache.tuscany.spi.context.CompositeContext;
 import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
 
 /**
  * Extension point for creating {@link GroovyAtomicContext}s from an assembly configuration
@@ -23,7 +24,7 @@
         return GroovyImplementation.class;
     }
 
-    public ComponentContext build(CompositeContext parent, Component<GroovyImplementation> component) throws BuilderConfigException {
+    public ComponentContext build(CompositeContext parent, Component<GroovyImplementation> component, DeploymentContext deploymentContext) throws BuilderConfigException {
         List<Class<?>> services = new ArrayList<Class<?>>();
         Collection<Service> collection = component.getImplementation().getComponentType().getServices().values();
         for (Service service : collection) {
@@ -32,6 +33,7 @@
         String script = component.getImplementation().getScript();
         String name = component.getName();
         Scope scope = component.getImplementation().getComponentType().getLifecycleScope();
-        return new GroovyAtomicContext(name, script, services, scope, null,parent);
+        return new GroovyAtomicContext(name, script, services, scope, null,parent, deploymentContext.getModuleScope());
     }
+
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java?rev=409079&r1=409078&r2=409079&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java Tue May 23 23:23:06 2006
@@ -33,8 +33,8 @@
         List<PropertyInjector> injectors = new ArrayList<PropertyInjector>();
         injectors.add(new SingletonInjector("property", "bar"));
         GroovyAtomicContext<Greeting> context = new GroovyAtomicContext<Greeting>("source", PropertyTestCase.SCRIPT,
-                services, Scope.MODULE, injectors, null);
-        context.setScopeContext(scope);
+                services, Scope.MODULE, injectors, null,scope);
+        scope.register(context);
         Greeting greeting = context.getService();
         assertEquals("bar", greeting.greet("foo"));
         scope.stop();

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java?rev=409079&r1=409078&r2=409079&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java Tue May 23 23:23:06 2006
@@ -25,8 +25,8 @@
         List<Class<?>> services = new ArrayList<Class<?>>();
         services.add(Greeting.class);
         GroovyAtomicContext<GroovyObject> context = new GroovyAtomicContext<GroovyObject>("source", script2,
-                services, Scope.MODULE, null, null);
-        context.setScopeContext(scope);
+                services, Scope.MODULE, null, null,scope);
+        scope.register(context);
         GroovyObject object = context.getService();
         assertEquals("foo", object.invokeMethod("greet", "foo"));
         scope.stop();

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java?rev=409079&r1=409078&r2=409079&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java Tue May 23 23:23:06 2006
@@ -43,8 +43,9 @@
         scope.start();
         List<Class<?>> services = new ArrayList<Class<?>>();
         services.add(Greeting.class);
-        GroovyAtomicContext<Greeting> context = new GroovyAtomicContext<Greeting>("source", SCRIPT, services, Scope.MODULE,null, null);
-        context.setScopeContext(scope);
+        GroovyAtomicContext<Greeting> context = new GroovyAtomicContext<Greeting>("source", SCRIPT, services,
+                Scope.MODULE,null, null,scope);
+        scope.register(context);
         Mock mock = mock(SourceWire.class);
         mock.expects(atLeastOnce()).method("getTargetService").will(
                 returnValue(new Greeting() {
@@ -70,8 +71,8 @@
         List<Class<?>> services = new ArrayList<Class<?>>();
         services.add(Greeting.class);
         GroovyAtomicContext<Greeting> context = new GroovyAtomicContext<Greeting>("source", SCRIPT2, services,
-                Scope.MODULE,null, null);
-        context.setScopeContext(scope);
+                Scope.MODULE,null, null,scope);
+        scope.register(context);
         TargetInvoker invoker = context.createTargetInvoker("greeting",Greeting.class.getMethod("greet", String.class));
         assertEquals("foo", invoker.invokeTarget(new String[]{"foo"}));
         scope.stop();
@@ -87,8 +88,9 @@
         scope.start();
         List<Class<?>> services = new ArrayList<Class<?>>();
         services.add(Greeting.class);
-        final GroovyAtomicContext<Greeting> context = new GroovyAtomicContext<Greeting>("source", SCRIPT2, services, Scope.MODULE,null, null);
-        context.setScopeContext(scope);
+        final GroovyAtomicContext<Greeting> context = new GroovyAtomicContext<Greeting>("source", SCRIPT2,
+                services, Scope.MODULE,null, null,scope);
+        scope.register(context);
         Mock mock = mock(TargetWire.class);
         mock.stubs().method("getServiceName").will(returnValue("Greeting"));
         mock.expects(atLeastOnce()).method("getTargetService").will(



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org