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 2007/02/17 16:45:52 UTC
svn commit: r508773 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/deployer/
kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/
kernel/core/src/main/java/org/apache/tuscany/core/implementati...
Author: jboynes
Date: Sat Feb 17 07:45:51 2007
New Revision: 508773
URL: http://svn.apache.org/viewvc?view=rev&rev=508773
Log:
refactor DeploymentContext constructors to pass in componentId
Modified:
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/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/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.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/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java
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=508773&r1=508772&r2=508773
==============================================================================
--- 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 Sat Feb 17 07:45:51 2007
@@ -35,18 +35,6 @@
private final DeploymentContext parent;
/**
- * Constructor specifying the loader for application resources.
- *
- * @param parent the parent of this context
- * @param classLoader the loader for application resources
- * @param scdlLocation the location of the SCDL being deployed
- */
- @Deprecated
- public ChildDeploymentContext(DeploymentContext parent, ClassLoader classLoader, URL scdlLocation) {
- this(parent, classLoader, scdlLocation, null);
- }
-
- /**
* Constructor defining properties of this context.
*
* @param parent the parent of this context
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=508773&r1=508772&r2=508773
==============================================================================
--- 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 Sat Feb 17 07:45:51 2007
@@ -105,7 +105,8 @@
throws LoaderException, BuilderException, ResolutionException {
final ScopeContainer scopeContainer = new CompositeScopeContainer(monitor);
scopeContainer.start();
- DeploymentContext deploymentContext = new RootDeploymentContext(null, xmlFactory, scopeContainer, null);
+ DeploymentContext deploymentContext =
+ new RootDeploymentContext(null, null, componentDefinition.getUri(), xmlFactory, scopeContainer);
deploymentContext.getPathNames().add(componentDefinition.getUri().toString());
// load the model
load(parent, componentDefinition, deploymentContext);
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=508773&r1=508772&r2=508773
==============================================================================
--- 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 Sat Feb 17 07:45:51 2007
@@ -36,20 +36,6 @@
private final ScopeContainer scopeContainer;
/**
- * Constructor specifying the loader for application resources.
- *
- * @param classLoader the loader for application resources
- * @param scdlLocation the location of the SCDL being deployed
- */
- @Deprecated
- public RootDeploymentContext(ClassLoader classLoader,
- XMLInputFactory xmlFactory,
- ScopeContainer scopeContainer,
- URL scdlLocation) {
- this(classLoader, scdlLocation, null, xmlFactory, scopeContainer);
- }
-
- /**
* Constructor defining properties of this context.
*
* @param classLoader the classloader for loading application resources
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=508773&r1=508772&r2=508773
==============================================================================
--- 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 Sat Feb 17 07:45:51 2007
@@ -53,7 +53,7 @@
throws LoaderException {
URL scdlLocation = implementation.getScdlLocation();
ClassLoader cl = new CompositeClassLoader(implementation.getClassLoader());
- DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, scdlLocation);
+ DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, scdlLocation, null);
childContext.getPathNames().addAll(deploymentContext.getPathNames());
CompositeComponentType componentType = loadFromSidefile(parent, 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=508773&r1=508772&r2=508773
==============================================================================
--- 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 Sat Feb 17 07:45:51 2007
@@ -56,7 +56,7 @@
throw new LoaderException("SCDL location not found");
}
ClassLoader cl = implementation.getClassLoader();
- DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, scdlLocation);
+ DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, scdlLocation, null);
childContext.getPathNames().addAll(deploymentContext.getPathNames());
CompositeComponentType componentType = loadFromSidefile(parent, scdlLocation, childContext);
implementation.setComponentType(componentType);
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=508773&r1=508772&r2=508773
==============================================================================
--- 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 Sat Feb 17 07:45:51 2007
@@ -86,7 +86,7 @@
throw new MissingIncludeException("No SCDL location or resource specified", name);
}
- DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, url);
+ DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, url, null);
childContext.getPathNames().addAll(deploymentContext.getPathNames());
CompositeComponentType composite;
try {
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=508773&r1=508772&r2=508773
==============================================================================
--- 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 Sat Feb 17 07:45:51 2007
@@ -104,7 +104,7 @@
}
public void createComponent(XMLStreamReader xmlReader) throws XMLStreamException {
- DeploymentContext deploymentContext = new RootDeploymentContext(null, xmlFactory, null, null);
+ DeploymentContext deploymentContext = new RootDeploymentContext(null, null, null, xmlFactory, null);
CompositeComponent parent = runtime.getRootComponent();
try {
ComponentDefinition<?> componentDefinition =
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java?view=diff&rev=508773&r1=508772&r2=508773
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java Sat Feb 17 07:45:51 2007
@@ -47,7 +47,6 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.component.ComponentManager;
-import org.apache.tuscany.core.deployer.RootDeploymentContext;
import org.easymock.EasyMock;
/**
@@ -168,7 +167,7 @@
protected void setUp() throws Exception {
super.setUp();
- deploymentContext = new RootDeploymentContext(null, null, null, null);
+ deploymentContext = EasyMock.createMock(DeploymentContext.class);
parent = EasyMock.createNiceMock(CompositeComponent.class);
EasyMock.replay(parent);
}
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=508773&r1=508772&r2=508773
==============================================================================
--- 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 Sat Feb 17 07:45:51 2007
@@ -156,7 +156,7 @@
Bootstrapper bootstrapper =
new DefaultBootstrapper(monitorFactory, xmlFactory, manager, resolver, connector);
deployer = (DeployerImpl) bootstrapper.createDeployer();
- deploymentContext = new RootDeploymentContext(null, xmlFactory, null, null);
+ deploymentContext = new RootDeploymentContext(null, null, null, xmlFactory, null);
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=508773&r1=508772&r2=508773
==============================================================================
--- 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 Sat Feb 17 07:45:51 2007
@@ -96,7 +96,7 @@
ScopeContainerMonitor monitor = EasyMock.createNiceMock(ScopeContainerMonitor.class);
CompositeScopeContainer container = new CompositeScopeContainer(monitor);
container.start();
- deploymentContext = new RootDeploymentContext(null, null, container, null);
+ deploymentContext = new RootDeploymentContext(null, null, null, null, container);
}
private ComponentDefinition createTopComponentDef() throws Exception {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java?view=diff&rev=508773&r1=508772&r2=508773
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java Sat Feb 17 07:45:51 2007
@@ -31,7 +31,6 @@
import org.apache.tuscany.spi.model.ServiceDefinition;
import junit.framework.TestCase;
-import org.apache.tuscany.core.deployer.RootDeploymentContext;
import org.apache.tuscany.core.implementation.system.builder.SystemComponentBuilder;
import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
import org.apache.tuscany.core.injection.SingletonObjectFactory;
@@ -70,7 +69,7 @@
protected void setUp() throws Exception {
super.setUp();
- deploymentContext = new RootDeploymentContext(null, null, null, null);
+ deploymentContext = EasyMock.createMock(DeploymentContext.class);
parent = EasyMock.createNiceMock(CompositeComponent.class);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java?view=diff&rev=508773&r1=508772&r2=508773
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java Sat Feb 17 07:45:51 2007
@@ -134,7 +134,7 @@
mockReader = EasyMock.createStrictMock(XMLStreamReader.class);
mockRegistry = EasyMock.createMock(LoaderRegistry.class);
loader = new ReferenceLoader(mockRegistry);
- deploymentContext = new RootDeploymentContext(null, null, null, null);
+ deploymentContext = new RootDeploymentContext(null, null, null, null, null);
deploymentContext.getPathNames().add("parent");
parent = EasyMock.createMock(CompositeComponent.class);
EasyMock.expect(parent.getUri()).andReturn(URI.create(PARENT_NAME));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java?view=diff&rev=508773&r1=508772&r2=508773
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java Sat Feb 17 07:45:51 2007
@@ -162,7 +162,7 @@
mockReader = EasyMock.createStrictMock(XMLStreamReader.class);
mockRegistry = EasyMock.createMock(LoaderRegistry.class);
loader = new ServiceLoader(mockRegistry);
- deploymentContext = new RootDeploymentContext(null, null, null, null);
+ deploymentContext = new RootDeploymentContext(null, null, null, null, null);
deploymentContext.getPathNames().add(PARENT_NAME);
parent = EasyMock.createMock(CompositeComponent.class);
URI uri = URI.create(PARENT_NAME);
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=508773&r1=508772&r2=508773
==============================================================================
--- 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 Sat Feb 17 07:45:51 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);
+ deploymentContext = new RootDeploymentContext(null, null, null, null, null);
mockMonitor = EasyMock.createMock(LoaderRegistryImpl.Monitor.class);
registry = new LoaderRegistryImpl(mockMonitor);
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java?view=diff&rev=508773&r1=508772&r2=508773
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java Sat Feb 17 07:45:51 2007
@@ -59,7 +59,7 @@
event = reader.nextTag();
}
DataObjectLoader loader = new DataObjectLoader(name);
- DeploymentContext context = new RootDeploymentContext(getClass().getClassLoader(), inputFactory, new CompositeScopeContainer(null), null);
+ DeploymentContext context = new RootDeploymentContext(getClass().getClassLoader(), null, null, inputFactory, new CompositeScopeContainer(null));
ModelDataObject modelObject = (ModelDataObject) loader.load(null, null, reader, context);
Assert.assertNotNull(modelObject.getDataObject());
Assert.assertTrue(modelObject.getDataObject().getString("myAttr").equals("helloworld.HelloWorldImpl"));
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java?view=diff&rev=508773&r1=508772&r2=508773
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java Sat Feb 17 07:45:51 2007
@@ -68,7 +68,7 @@
super.setUp();
loader = new ImportSDOLoader(null);
xmlFactory = XMLInputFactory.newInstance();
- deploymentContext = new RootDeploymentContext(getClass().getClassLoader(), xmlFactory, null, null);
+ deploymentContext = new RootDeploymentContext(getClass().getClassLoader(), null, null, xmlFactory, null);
}
protected XMLStreamReader getReader(String xml) throws XMLStreamException {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org