You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/05/26 20:59:43 UTC
svn commit: r409722 - in /incubator/tuscany/sandbox/jboynes/sca:
core2/src/main/java/org/apache/tuscany/core/bootstrap/
core2/src/main/java/org/apache/tuscany/core/builder/
core2/src/main/java/org/apache/tuscany/core/context/
core2/src/test/java/org/ap...
Author: jboynes
Date: Fri May 26 11:59:41 2006
New Revision: 409722
URL: http://svn.apache.org/viewvc?rev=409722&view=rev
Log:
do not wire components twice :-)
Modified:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/AbstractCompositeContext.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/CompositeContext.java
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?rev=409722&r1=409721&r2=409722&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Fri May 26 11:59:41 2006
@@ -34,6 +34,7 @@
import org.apache.tuscany.core.system.model.SystemBinding;
import org.apache.tuscany.core.system.model.SystemCompositeImplementation;
import org.apache.tuscany.core.system.model.SystemImplementation;
+import org.apache.tuscany.core.system.context.SystemCompositeContext;
import org.apache.tuscany.core.wire.jdk.JDKWireFactoryService;
import org.apache.tuscany.core.wire.system.WireServiceImpl;
import org.apache.tuscany.spi.builder.BuilderRegistry;
@@ -103,7 +104,8 @@
composite.add(createdeployer());
Component<SystemCompositeImplementation> deployerComposite = new Component<SystemCompositeImplementation>(name, new SystemCompositeImplementation(composite));
- Context<Deployer> context = builderRegistry.build(parent, deployerComposite, deploymentContext);
+ SystemCompositeContext<Deployer> context = (SystemCompositeContext<Deployer>) builderRegistry.build(parent, deployerComposite, deploymentContext);
+ context.setScopeContext(moduleScope);
connector.connect(context);
return context;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?rev=409722&r1=409721&r2=409722&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java Fri May 26 11:59:41 2006
@@ -99,19 +99,7 @@
}
ComponentContext context = componentBuilder.build(parent, component, deploymentContext);
- ComponentType componentType = component.getImplementation().getComponentType();
- assert(componentType != null): "Component type must be set";
- // create target wires
- for (Service service : componentType.getServices().values()) {
- TargetWire wire = wireService.createTargetWire(service);
- context.addTargetWire(wire);
- }
- // create source wires
- for (Reference reference : componentType.getReferences().values()) {
- SourceWire wire = wireService.createSourceWire(reference);
- context.addSourceWire(wire);
- }
-
+ assert(component.getImplementation().getComponentType() != null): "Component type must be set";
return context;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/AbstractCompositeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/AbstractCompositeContext.java?rev=409722&r1=409721&r2=409722&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/AbstractCompositeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/AbstractCompositeContext.java Fri May 26 11:59:41 2006
@@ -12,10 +12,11 @@
import org.apache.tuscany.spi.context.AtomicContext;
import org.apache.tuscany.spi.context.CompositeContext;
import org.apache.tuscany.spi.context.Context;
+import org.apache.tuscany.spi.context.DuplicateNameException;
import org.apache.tuscany.spi.context.IllegalTargetException;
import org.apache.tuscany.spi.context.ReferenceContext;
+import org.apache.tuscany.spi.context.ScopeContext;
import org.apache.tuscany.spi.context.ServiceContext;
-import org.apache.tuscany.spi.context.DuplicateNameException;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.extension.CompositeContextExtension;
@@ -43,6 +44,8 @@
protected AutowireContext<?> autowireContext;
+ protected ScopeContext scopeContext;
+
public AbstractCompositeContext(String name, CompositeContext parent, AutowireContext autowireContext) {
super(name, parent);
this.autowireContext = autowireContext;
@@ -53,11 +56,19 @@
autowireContext = context;
}
+ public void setScopeContext(ScopeContext scopeContext) {
+ this.scopeContext = scopeContext;
+ }
+
public void start() {
synchronized (lock) {
if (lifecycleState != UNINITIALIZED && lifecycleState != STOPPED) {
throw new IllegalStateException("Context not in UNINITIALIZED state");
}
+
+ if (scopeContext != null) {
+ scopeContext.start();
+ }
for (Context child : children.values()) {
child.start();
}
@@ -74,6 +85,10 @@
for (Context child : children.values()) {
child.stop();
}
+ if (scopeContext != null) {
+ scopeContext.stop();
+ }
+
// need to block a start until reset is complete
initializeLatch = new CountDownLatch(2);
lifecycleState = STOPPING;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java?rev=409722&r1=409721&r2=409722&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java Fri May 26 11:59:41 2006
@@ -34,6 +34,8 @@
SystemCompositeContext<Deployer> context =
(SystemCompositeContext<Deployer>) bootstrapper.createDeployer(ContextNames.TUSCANY_DEPLOYER, parent);
assertEquals("tuscany.deployer", context.getName());
+ context.start();
+
// todo this should work
// Deployer deployer = context.getService();
// assertNotNull(deployer);
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/CompositeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/CompositeContext.java?rev=409722&r1=409721&r2=409722&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/CompositeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/CompositeContext.java Fri May 26 11:59:41 2006
@@ -57,4 +57,5 @@
*/
List<ReferenceContext> getReferenceContexts();
+ void setScopeContext(ScopeContext scopeContext);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org