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/25 04:07:18 UTC
svn commit: r511419 - in
/incubator/tuscany/java/sca/extensions/spring/container/src:
main/java/org/apache/tuscany/container/spring/impl/
main/java/org/apache/tuscany/container/spring/loader/
test/java/org/apache/tuscany/container/spring/impl/
Author: jmarino
Date: Sat Feb 24 19:07:17 2007
New Revision: 511419
URL: http://svn.apache.org/viewvc?view=rev&rev=511419
Log:
remove passing of parent
Modified:
incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java
incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java
incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringXMLComponentTypeLoader.java
incubator/tuscany/java/sca/extensions/spring/container/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java
Modified: incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java?view=diff&rev=511419&r1=511418&r2=511419
==============================================================================
--- incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java Sat Feb 24 19:07:17 2007
@@ -36,9 +36,8 @@
*/
public class SpringCompositeBuilder extends ComponentBuilderExtension<SpringImplementation> {
- public Component build(Component parent,
- ComponentDefinition<SpringImplementation> componentDefinition,
- DeploymentContext deploymentContext) throws BuilderException {
+ public Component build(ComponentDefinition<SpringImplementation> componentDefinition, DeploymentContext context)
+ throws BuilderException {
URI uri = componentDefinition.getUri();
SpringImplementation implementation = componentDefinition.getImplementation();
Resource resource = implementation.getApplicationResource();
Modified: incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java?view=diff&rev=511419&r1=511418&r2=511419
==============================================================================
--- incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java Sat Feb 24 19:07:17 2007
@@ -37,7 +37,6 @@
import org.osoa.sca.Constants;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -78,9 +77,9 @@
}
@SuppressWarnings("unchecked")
- public SpringImplementation load(Component parent,
- ModelObject object, XMLStreamReader reader,
- DeploymentContext deploymentContext)
+ public SpringImplementation load(
+ ModelObject object, XMLStreamReader reader,
+ DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
String locationAttr = reader.getAttributeValue(null, "location");
@@ -91,7 +90,7 @@
ClassLoader classLoader = deploymentContext.getClassLoader();
SpringImplementation implementation = new SpringImplementation(classLoader);
implementation.setApplicationResource(getApplicationContextResource(locationAttr, classLoader));
- registry.loadComponentType(parent, implementation, deploymentContext);
+ registry.loadComponentType(implementation, deploymentContext);
SpringComponentType type = implementation.getComponentType();
while (true) {
switch (reader.next()) {
@@ -99,7 +98,7 @@
QName qname = reader.getName();
if (SERVICE_ELEMENT.equals(qname)) {
ServiceDefinition service =
- (ServiceDefinition) registry.load(parent, null, reader, deploymentContext);
+ (ServiceDefinition) registry.load(null, reader, deploymentContext);
if (!type.isExposeAllBeans()) {
URI name = service.getUri();
if (!type.getServiceDeclarations().containsKey(name)) {
@@ -109,7 +108,7 @@
type.getDeclaredServices().put(service.getUri(), service);
} else if (REFERENCE_ELEMENT.equals(qname)) {
ReferenceDefinition reference =
- (ReferenceDefinition) registry.load(parent, null, reader, deploymentContext);
+ (ReferenceDefinition) registry.load(null, reader, deploymentContext);
type.getDeclaredReferences().put(reference.getUri(), reference);
}
break;
Modified: incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringXMLComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringXMLComponentTypeLoader.java?view=diff&rev=511419&r1=511418&r2=511419
==============================================================================
--- incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringXMLComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringXMLComponentTypeLoader.java Sat Feb 24 19:07:17 2007
@@ -27,7 +27,6 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -62,9 +61,9 @@
return SpringImplementation.class;
}
- public void load(Component parent,
- SpringImplementation implementation,
- DeploymentContext context) throws LoaderException {
+ public void load(
+ SpringImplementation implementation,
+ DeploymentContext context) throws LoaderException {
if (implementation.getComponentType() != null) {
// FIXME hack since the builder registry loads the implementation type and the Spring implementation
// loader needs to as well. The second call is done by the builder registry and we just ignore it.
Modified: incubator/tuscany/java/sca/extensions/spring/container/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/spring/container/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java?view=diff&rev=511419&r1=511418&r2=511419
==============================================================================
--- incubator/tuscany/java/sca/extensions/spring/container/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/extensions/spring/container/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java Sat Feb 24 19:07:17 2007
@@ -50,14 +50,14 @@
Service service = EasyMock.createMock(Service.class);
// Configure the mock builder registry
BuilderRegistry registry = EasyMock.createMock(BuilderRegistry.class);
- EasyMock.expect(registry.build(EasyMock.isA(Component.class),
+ EasyMock.expect(registry.build(
EasyMock.isA(ServiceDefinition.class),
EasyMock.isA(DeploymentContext.class))).andStubReturn(service);
EasyMock.replay(registry);
SpringCompositeBuilder builder = new SpringCompositeBuilder();
builder.setBuilderRegistry(registry);
ComponentDefinition<SpringImplementation> definition = createDefinitionWithService();
- Component component = builder.build(null, definition, null);
+ Component component = builder.build(definition, null);
assertNotNull(component);
EasyMock.verify(registry);
}
@@ -70,14 +70,14 @@
Service service = EasyMock.createMock(Service.class);
// Configure the mock builder registry
BuilderRegistry registry = EasyMock.createMock(BuilderRegistry.class);
- EasyMock.expect(registry.build(EasyMock.isA(Component.class),
+ EasyMock.expect(registry.build(
EasyMock.isA(ServiceDefinition.class),
EasyMock.isA(DeploymentContext.class))).andStubReturn(service);
EasyMock.replay(registry);
SpringCompositeBuilder builder = new SpringCompositeBuilder();
builder.setBuilderRegistry(registry);
ComponentDefinition<SpringImplementation> definition = createDefinitionWithReference();
- Component component = builder.build(null, definition, null);
+ Component component = builder.build(definition, null);
assertNotNull(component);
EasyMock.verify(registry);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org