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 02:14:37 UTC
svn commit: r511393 - 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 17:14:37 2007
New Revision: 511393
URL: http://svn.apache.org/viewvc?view=rev&rev=511393
Log:
remove CompositeComponent references and replace with Component references
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/impl/SpringCompositeComponent.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=511393&r1=511392&r2=511393
==============================================================================
--- 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 17:14:37 2007
@@ -22,7 +22,6 @@
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
import org.apache.tuscany.spi.model.ComponentDefinition;
@@ -37,7 +36,7 @@
*/
public class SpringCompositeBuilder extends ComponentBuilderExtension<SpringImplementation> {
- public Component build(CompositeComponent parent,
+ public Component build(Component parent,
ComponentDefinition<SpringImplementation> componentDefinition,
DeploymentContext deploymentContext) throws BuilderException {
URI uri = componentDefinition.getUri();
Modified: incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java?view=diff&rev=511393&r1=511392&r2=511393
==============================================================================
--- incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java (original)
+++ incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java Sat Feb 24 17:14:37 2007
@@ -77,7 +77,7 @@
ProxyService proxyService,
Map<String, Document> propertyValues,
ClassLoader loader) {
- super(uri, propertyValues);
+ super(uri);
this.resource = resource;
this.proxyService = proxyService;
this.loader = loader;
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=511393&r1=511392&r2=511393
==============================================================================
--- 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 17:14:37 2007
@@ -37,7 +37,7 @@
import org.osoa.sca.Constants;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
+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,7 +78,7 @@
}
@SuppressWarnings("unchecked")
- public SpringImplementation load(CompositeComponent parent,
+ public SpringImplementation load(Component parent,
ModelObject object, XMLStreamReader reader,
DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
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=511393&r1=511392&r2=511393
==============================================================================
--- 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 17:14:37 2007
@@ -27,7 +27,7 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
+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,7 +62,7 @@
return SpringImplementation.class;
}
- public void load(CompositeComponent parent,
+ public void load(Component parent,
SpringImplementation implementation,
DeploymentContext context) throws LoaderException {
if (implementation.getComponentType() != null) {
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=511393&r1=511392&r2=511393
==============================================================================
--- 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 17:14:37 2007
@@ -22,7 +22,7 @@
import java.net.URL;
import org.apache.tuscany.spi.builder.BuilderRegistry;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.ComponentDefinition;
@@ -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(CompositeComponent.class),
+ EasyMock.expect(registry.build(EasyMock.isA(Component.class),
EasyMock.isA(ServiceDefinition.class),
EasyMock.isA(DeploymentContext.class))).andStubReturn(service);
EasyMock.replay(registry);
SpringCompositeBuilder builder = new SpringCompositeBuilder();
builder.setBuilderRegistry(registry);
ComponentDefinition<SpringImplementation> definition = createDefinitionWithService();
- CompositeComponent component = (CompositeComponent) builder.build(null, definition, null);
+ Component component = builder.build(null, 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(CompositeComponent.class),
+ EasyMock.expect(registry.build(EasyMock.isA(Component.class),
EasyMock.isA(ServiceDefinition.class),
EasyMock.isA(DeploymentContext.class))).andStubReturn(service);
EasyMock.replay(registry);
SpringCompositeBuilder builder = new SpringCompositeBuilder();
builder.setBuilderRegistry(registry);
ComponentDefinition<SpringImplementation> definition = createDefinitionWithReference();
- CompositeComponent component = (CompositeComponent) builder.build(null, definition, null);
+ Component component = builder.build(null, 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