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 2007/02/27 03:02:39 UTC
svn commit: r512108 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/deployer/
core/src/main/java/org/apache/tuscany/core/implementation/composite/
core/src/main/java/org/apache/tuscany/core/implementation/system/load...
Author: jmarino
Date: Mon Feb 26 18:02:37 2007
New Revision: 512108
URL: http://svn.apache.org/viewvc?view=rev&rev=512108
Log:
add support for SCA 1.0 autowire in the kernel
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/AbstractDeploymentContext.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/ChildDeploymentContext.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/RootDeploymentContext.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemCompositeComponentTypeLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/XMLChangeSetHandler.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/ScdlContributionProcessor.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/AbstractDeploymentContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/AbstractDeploymentContext.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/AbstractDeploymentContext.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/AbstractDeploymentContext.java Mon Feb 26 18:02:37 2007
@@ -33,6 +33,7 @@
*/
public abstract class AbstractDeploymentContext implements DeploymentContext {
private final URI componentId;
+ private boolean autowire;
private final ClassLoader classLoader;
private final URL scdlLocation;
private final Map<URI, Component> components = new HashMap<URI, Component>();
@@ -43,8 +44,9 @@
* @param classLoader the classloader for loading application resources
* @param scdlLocation the location of the SCDL defining this composite
* @param componentId the id of the component being deployed
+ * @param autowire if autowire is enabled
*/
- protected AbstractDeploymentContext(ClassLoader classLoader, URL scdlLocation, URI componentId) {
+ protected AbstractDeploymentContext(ClassLoader classLoader, URL scdlLocation, URI componentId, boolean autowire) {
this.classLoader = classLoader;
this.scdlLocation = scdlLocation;
this.componentId = componentId;
@@ -60,6 +62,10 @@
public URI getComponentId() {
return componentId;
+ }
+
+ public boolean isAutowire() {
+ return autowire;
}
@Deprecated
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/ChildDeploymentContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/ChildDeploymentContext.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/ChildDeploymentContext.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/ChildDeploymentContext.java Mon Feb 26 18:02:37 2007
@@ -41,12 +41,14 @@
* @param classLoader the classloader for loading application resources
* @param scdlLocation the location of the SCDL defining this composite
* @param componentId the id of the component being deployed
+ * @param autowire if autowire is enabled
*/
public ChildDeploymentContext(DeploymentContext parent,
ClassLoader classLoader,
URL scdlLocation,
- URI componentId) {
- super(classLoader, scdlLocation, componentId);
+ URI componentId,
+ boolean autowire) {
+ super(classLoader, scdlLocation, componentId, autowire);
assert parent != null;
this.parent = parent;
}
@@ -62,4 +64,5 @@
public ScopeContainer getCompositeScope() {
return parent.getCompositeScope();
}
+
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java Mon Feb 26 18:02:37 2007
@@ -117,7 +117,7 @@
final ScopeContainer scopeContainer = new CompositeScopeContainer(monitor);
scopeContainer.start();
DeploymentContext deploymentContext =
- new RootDeploymentContext(null, null, componentDefinition.getUri(), xmlFactory, scopeContainer);
+ new RootDeploymentContext(null, null, componentDefinition.getUri(), xmlFactory, scopeContainer, false);
// load the model
load(parent, componentDefinition, deploymentContext);
// resolve autowires
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/RootDeploymentContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/RootDeploymentContext.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/RootDeploymentContext.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/RootDeploymentContext.java Mon Feb 26 18:02:37 2007
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.core.deployer;
-import java.net.URL;
import java.net.URI;
+import java.net.URL;
import javax.xml.stream.XMLInputFactory;
import org.apache.tuscany.spi.component.ScopeContainer;
@@ -38,18 +38,20 @@
/**
* Constructor defining properties of this context.
*
- * @param classLoader the classloader for loading application resources
- * @param scdlLocation the location of the SCDL defining this composite
- * @param componentId the id of the component being deployed
+ * @param classLoader the classloader for loading application resources
+ * @param scdlLocation the location of the SCDL defining this composite
+ * @param componentId the id of the component being deployed
* @param xmlFactory a factory that can be used to obtain an StAX XMLStreamReader
* @param scopeContainer the scope context representing this deployment's COMPOSITE scope
+ * @param autowire if autowire is enabled
*/
public RootDeploymentContext(ClassLoader classLoader,
URL scdlLocation,
URI componentId,
XMLInputFactory xmlFactory,
- ScopeContainer scopeContainer) {
- super(classLoader, scdlLocation, componentId);
+ ScopeContainer scopeContainer,
+ boolean autowire) {
+ super(classLoader, scdlLocation, componentId, autowire);
this.xmlFactory = xmlFactory;
this.scopeContainer = scopeContainer;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java Mon Feb 26 18:02:37 2007
@@ -52,7 +52,7 @@
URL scdlLocation = implementation.getScdlLocation();
ClassLoader cl = new CompositeClassLoader(implementation.getClassLoader());
URI componentId = URI.create(context.getComponentId().toString() + '/');
- DeploymentContext childContext = new ChildDeploymentContext(context, cl, scdlLocation, componentId);
+ DeploymentContext childContext = new ChildDeploymentContext(context, cl, scdlLocation, componentId, false);
CompositeComponentType componentType = loadFromSidefile(scdlLocation, childContext);
implementation.setComponentType(componentType);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemCompositeComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemCompositeComponentTypeLoader.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemCompositeComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemCompositeComponentTypeLoader.java Mon Feb 26 18:02:37 2007
@@ -57,7 +57,8 @@
}
ClassLoader cl = implementation.getClassLoader();
URI componentId = deploymentContext.getComponentId();
- DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, scdlLocation, componentId);
+ DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, scdlLocation, componentId,
+ false);
CompositeComponentType componentType = loadFromSidefile(scdlLocation, childContext);
implementation.setComponentType(componentType);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java Mon Feb 26 18:02:37 2007
@@ -106,18 +106,18 @@
assert COMPONENT.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
String initLevel = reader.getAttributeValue(null, "initLevel");
- String autowire = reader.getAttributeValue(null, "autowire");
+ boolean autowire = Boolean.parseBoolean(reader.getAttributeValue(null, "autowire")) || context.isAutowire();
URI componentId = URI.create(context.getComponentId() + "/").resolve(name);
ClassLoader loader = context.getClassLoader();
URL location = context.getScdlLocation();
- DeploymentContext childContext = new ChildDeploymentContext(context, loader, location, componentId);
+ DeploymentContext childContext = new ChildDeploymentContext(context, loader, location, componentId, autowire);
Implementation<?> impl = loadImplementation(reader, childContext);
registry.loadComponentType(impl, childContext);
ComponentDefinition<Implementation<?>> componentDefinition =
new ComponentDefinition<Implementation<?>>(componentId, impl);
- componentDefinition.setAutowire(Boolean.parseBoolean(autowire));
+ componentDefinition.setAutowire(autowire);
if (initLevel != null) {
if (initLevel.length() == 0) {
componentDefinition.setInitLevel(0);
@@ -150,12 +150,16 @@
(ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>) componentDefinition
.getImplementation().getComponentType();
for (ReferenceDefinition ref : type.getReferences().values()) {
- if (ref.isAutowire()) {
- ReferenceTarget referenceTarget = new ReferenceTarget();
- String compName = componentDefinition.getUri().toString();
- URI refName = URI.create(compName + ref.getUri().toString());
- referenceTarget.setReferenceName(refName);
- componentDefinition.add(referenceTarget);
+ // add reference target definitions if autowire is enabled for references that are not
+ // explicitly configured with autowire by the component
+ if (!componentDefinition.getReferenceTargets().containsKey(ref.getUri().getFragment())) {
+ if (ref.isAutowire() || autowire) {
+ ReferenceTarget referenceTarget = new ReferenceTarget();
+ String compName = componentDefinition.getUri().toString();
+ URI refName = URI.create(compName + ref.getUri().toString());
+ referenceTarget.setReferenceName(refName);
+ componentDefinition.add(referenceTarget);
+ }
}
}
validate(componentDefinition);
@@ -203,7 +207,6 @@
}
}
ObjectFactory<Type> objectFactory = propertyFactory.createObjectFactory(property, propertyValue);
- // propertyValue.setValueFactory(new SimplePropertyObjectFactory(property, propertyValue.getValue()));
propertyValue.setValueFactory(objectFactory);
definition.add(propertyValue);
}
@@ -215,7 +218,6 @@
if (name == null) {
throw new InvalidReferenceException("No name specified");
}
-
String target = reader.getAttributeValue(null, "target");
boolean autowire = Boolean.parseBoolean(reader.getAttributeValue(null, "autowire"));
URI componentId = context.getComponentId();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java Mon Feb 26 18:02:37 2007
@@ -88,7 +88,7 @@
// when we include, the componentId remains that of the parent
URI componentId = deploymentContext.getComponentId();
- DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, url, componentId);
+ DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, url, componentId, false);
CompositeComponentType composite;
composite = loadFromSidefile(url, childContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/XMLChangeSetHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/XMLChangeSetHandler.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/XMLChangeSetHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/XMLChangeSetHandler.java Mon Feb 26 18:02:37 2007
@@ -100,7 +100,7 @@
}
public void createComponent(XMLStreamReader xmlReader) throws XMLStreamException {
- DeploymentContext deploymentContext = new RootDeploymentContext(null, null, null, xmlFactory, null);
+ DeploymentContext deploymentContext = new RootDeploymentContext(null, null, null, xmlFactory, null, false);
try {
ComponentDefinition<?> componentDefinition =
(ComponentDefinition<?>) loader.load(null, xmlReader, deploymentContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/ScdlContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/ScdlContributionProcessor.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/ScdlContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/ScdlContributionProcessor.java Mon Feb 26 18:02:37 2007
@@ -74,7 +74,8 @@
CompositeClassLoader cl = new CompositeClassLoader(getClass().getClassLoader());
cl.addURL(contribution.getLocation());
- DeploymentContext deploymentContext = new RootDeploymentContext(cl, scdlLocation , contributionId, this.xmlFactory, null);
+ DeploymentContext deploymentContext = new RootDeploymentContext(cl, scdlLocation , contributionId, this.xmlFactory, null,
+ false);
CompositeComponentType componentType = this.registry.load(null, scdlLocation, CompositeComponentType.class, deploymentContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java Mon Feb 26 18:02:37 2007
@@ -161,7 +161,7 @@
Bootstrapper bootstrapper =
new DefaultBootstrapper(monitorFactory, xmlFactory, manager, resolver, connector);
deployer = (DeployerImpl) bootstrapper.createDeployer();
- deploymentContext = new RootDeploymentContext(null, null, componentId, xmlFactory, null);
+ deploymentContext = new RootDeploymentContext(null, null, componentId, xmlFactory, null, false);
implementation = new SystemCompositeImplementation();
implementation.setClassLoader(getClass().getClassLoader());
componentDefinition = new ComponentDefinition<SystemCompositeImplementation>(implementation);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java Mon Feb 26 18:02:37 2007
@@ -92,7 +92,7 @@
ScopeContainerMonitor monitor = EasyMock.createNiceMock(ScopeContainerMonitor.class);
CompositeScopeContainer container = new CompositeScopeContainer(monitor);
container.start();
- deploymentContext = new RootDeploymentContext(null, null, TOP_COMPONENT, null, container);
+ deploymentContext = new RootDeploymentContext(null, null, TOP_COMPONENT, null, container, false);
}
private ComponentDefinition createTopComponentDef() throws Exception {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java Mon Feb 26 18:02:37 2007
@@ -92,6 +92,7 @@
EasyMock.replay(reader);
ctx = EasyMock.createMock(DeploymentContext.class);
EasyMock.expect(ctx.getClassLoader()).andReturn(null);
+ EasyMock.expect(ctx.isAutowire()).andReturn(false);
EasyMock.expect(ctx.getScdlLocation()).andReturn(null);
EasyMock.expect(ctx.getComponentId()).andReturn(componentId);
EasyMock.replay(ctx);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java Mon Feb 26 18:02:37 2007
@@ -86,6 +86,7 @@
loader = new ComponentLoader(mockRegistry, null);
ctx = EasyMock.createMock(DeploymentContext.class);
EasyMock.expect(ctx.getClassLoader()).andReturn(null);
+ EasyMock.expect(ctx.isAutowire()).andReturn(false);
EasyMock.expect(ctx.getScdlLocation()).andReturn(null);
EasyMock.expect(ctx.getComponentId()).andReturn(componentId);
EasyMock.replay(ctx);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java Mon Feb 26 18:02:37 2007
@@ -236,6 +236,7 @@
EasyMock.replay(parent);
ctx = EasyMock.createMock(DeploymentContext.class);
+ EasyMock.expect(ctx.isAutowire()).andReturn(false);
EasyMock.expect(ctx.getClassLoader()).andReturn(null);
EasyMock.expect(ctx.getScdlLocation()).andReturn(null);
EasyMock.expect(ctx.getComponentId()).andReturn(componentId);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java Mon Feb 26 18:02:37 2007
@@ -118,7 +118,7 @@
protected void setUp() throws Exception {
super.setUp();
name = new QName("http://mock", "test");
- deploymentContext = new RootDeploymentContext(null, null, null, null, null);
+ deploymentContext = new RootDeploymentContext(null, null, null, null, null, false);
mockMonitor = EasyMock.createMock(LoaderRegistryImpl.Monitor.class);
registry = new LoaderRegistryImpl(mockMonitor);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java?view=diff&rev=512108&r1=512107&r2=512108
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java Mon Feb 26 18:02:37 2007
@@ -75,6 +75,13 @@
*/
URI getComponentId();
+ /**
+ * Returns true if the autowire is enabled for the current deployment.
+ *
+ * @return true if the autowire is enabled for the current deployment
+ */
+ boolean isAutowire();
+
@Deprecated
Map<URI, Component> getComponents();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org