Author: jboynes
Date: Thu Jul 20 11:01:15 2006
New Revision: 424005
URL: http://svn.apache.org/viewvc?rev=424005&view=rev
Log:
associate groovy components with the right scope container
Modified:
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
Modified:
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java?rev=424005&r1=424004&r2=424005&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
(original)
+++
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
Thu Jul 20 11:01:15 2006
@@ -44,12 +44,13 @@
public GroovyAtomicComponent(String name,
Class<? extends GroovyObject> groovyClass,
List<Class<?>>services,
- Scope scope,
List<PropertyInjector> injectors,
CompositeComponent parent,
ScopeContainer scopeContainer,
WireService wireService) {
super(name, parent, scopeContainer, wireService, 0);
+ this.scope = scopeContainer.getScope();
+
assert groovyClass != null;
assert services != null;
assert injectors != null;
@@ -57,8 +58,6 @@
this.groovyClass = groovyClass;
this.services = Collections.unmodifiableList(services);
this.injectors = injectors;
-
- this.scope = scope;
}
public List<Class<?>> getServiceInterfaces() {
Modified:
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java?rev=424005&r1=424004&r2=424005&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
(original)
+++
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
Thu Jul 20 11:01:15 2006
@@ -11,6 +11,7 @@
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
import org.apache.tuscany.spi.model.ComponentDefinition;
@@ -43,6 +44,7 @@
String script = implementation.getScript();
String name = componentDefinition.getName();
Scope scope = implementation.getComponentType().getLifecycleScope();
+ ScopeContainer scopeContainer = scopeRegistry.getScopeContainer(scope);
// get the Groovy classloader for this deployment context
GroovyClassLoader groovyClassLoader = (GroovyClassLoader)
deploymentContext.getExtension("groovy.classloader");
@@ -63,14 +65,7 @@
List<PropertyInjector> injectors = Collections.emptyList();
// todo set up injectors
- return new GroovyAtomicComponent(name,
- groovyClass,
- services,
- scope,
- injectors,
- parent,
- deploymentContext.getModuleScope(),
- wireService);
+ return new GroovyAtomicComponent(name, groovyClass, services,
injectors, parent, scopeContainer, wireService);
}
}
Modified:
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java?rev=424005&r1=424004&r2=424005&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
(original)
+++
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
Thu Jul 20 11:01:15 2006
@@ -8,7 +8,6 @@
import org.apache.tuscany.container.groovy.injectors.SingletonInjector;
import org.apache.tuscany.container.groovy.mock.Greeting;
import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
-import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.WireService;
import org.apache.tuscany.test.ArtifactFactory;
@@ -44,7 +43,6 @@
GroovyAtomicComponent<Greeting> context = new
GroovyAtomicComponent<Greeting>("source",
implClass,
services,
-
Scope.MODULE,
injectors,
null,
scope,
Modified:
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java?rev=424005&r1=424004&r2=424005&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
(original)
+++
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
Thu Jul 20 11:01:15 2006
@@ -10,7 +10,6 @@
import org.apache.tuscany.container.groovy.mock.Greeting;
import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
-import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.test.ArtifactFactory;
/**
@@ -35,7 +34,6 @@
new GroovyAtomicComponent<GroovyObject>("source",
implClass,
services,
- Scope.MODULE,
INJECTORS,
null,
scope,
Modified:
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java?rev=424005&r1=424004&r2=424005&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
(original)
+++
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
Thu Jul 20 11:01:15 2006
@@ -10,7 +10,6 @@
import org.apache.tuscany.container.groovy.mock.Greeting;
import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
-import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.Message;
@@ -65,7 +64,6 @@
new GroovyAtomicComponent<Greeting>("source",
implClass1,
services,
- Scope.MODULE,
INJECTORS,
null,
scope,
@@ -123,7 +121,6 @@
new GroovyAtomicComponent<Greeting>("source",
implClass2,
services,
- Scope.MODULE,
INJECTORS,
null,
scope,
@@ -148,7 +145,6 @@
new GroovyAtomicComponent<Greeting>("source",
implClass2,
services,
- Scope.MODULE,
INJECTORS,
null,
scope,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
