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:13:27 UTC
svn commit: r511391 [3/3] - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/binding/local/
core/src/main/java/org/apache/tuscany/core/builder/
core/src/main/java/org/apache/tuscany/core/component/
core/src/main/java/or...
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java Sat Feb 24 17:13:22 2007
@@ -24,16 +24,17 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import junit.framework.TestCase;
-import org.easymock.EasyMock;
import org.osoa.sca.Constants;
-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.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.model.ServiceDefinition;
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
+
/**
* @version $Rev$ $Date$
*/
@@ -44,7 +45,7 @@
private URI componentId;
private ServiceLoader loader;
private XMLStreamReader mockReader;
- private CompositeComponent parent;
+ private Component parent;
private DeploymentContext ctx;
public void testReferenceNoFragment() throws LoaderException, XMLStreamException {
@@ -85,7 +86,7 @@
loader = new ServiceLoader(mockRegistry);
componentId = URI.create(COMPONENT_NAME);
- parent = EasyMock.createMock(CompositeComponent.class);
+ parent = EasyMock.createMock(Component.class);
EasyMock.expect(parent.getUri()).andReturn(componentId).atLeastOnce();
EasyMock.replay(parent);
ctx = EasyMock.createMock(DeploymentContext.class);
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=511391&r1=511390&r2=511391
==============================================================================
--- 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 24 17:13:22 2007
@@ -27,7 +27,7 @@
import static org.osoa.sca.Constants.SCA_NS;
-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.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -58,7 +58,7 @@
private DeploymentContext deploymentContext;
private XMLStreamReader mockReader;
private LoaderRegistry mockRegistry;
- private CompositeComponent parent;
+ private Component parent;
private URI componentId;
public void testWithNoInterface() throws LoaderException, XMLStreamException {
@@ -160,7 +160,7 @@
mockReader = EasyMock.createStrictMock(XMLStreamReader.class);
mockRegistry = EasyMock.createMock(LoaderRegistry.class);
loader = new ServiceLoader(mockRegistry);
- parent = EasyMock.createMock(CompositeComponent.class);
+ parent = EasyMock.createMock(Component.class);
componentId = URI.create(PARENT_NAME);
EasyMock.expect(parent.getUri()).andReturn(componentId).atLeastOnce();
EasyMock.replay(parent);
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=511391&r1=511390&r2=511391
==============================================================================
--- 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 24 17:13:22 2007
@@ -22,7 +22,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-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.loader.LoaderException;
import org.apache.tuscany.spi.loader.StAXElementLoader;
@@ -68,13 +68,13 @@
mockMonitor.registeringLoader(EasyMock.eq(name));
mockMonitor.elementLoad(EasyMock.eq(name));
EasyMock.replay(mockMonitor);
- EasyMock.expect(mockLoader.load(EasyMock.isA(CompositeComponent.class),
+ EasyMock.expect(mockLoader.load(EasyMock.isA(Component.class),
(ModelObject) isNull(),
EasyMock.eq(mockReader),
EasyMock.eq(deploymentContext))).andReturn(modelObject);
EasyMock.replay(mockLoader);
registry.registerLoader(name, (StAXElementLoader<ModelObject>) mockLoader);
- CompositeComponent parent = EasyMock.createNiceMock(CompositeComponent.class);
+ Component parent = EasyMock.createNiceMock(Component.class);
assertSame(modelObject, registry.load(parent, null, mockReader, deploymentContext));
EasyMock.verify(mockLoader);
EasyMock.verify(mockMonitor);
@@ -103,13 +103,13 @@
mockMonitor.registeringLoader(EasyMock.eq(name));
mockMonitor.elementLoad(EasyMock.eq(name));
EasyMock.replay(mockMonitor);
- EasyMock.expect(mockLoader.load(EasyMock.isA(CompositeComponent.class),
+ EasyMock.expect(mockLoader.load(EasyMock.isA(Component.class),
EasyMock.eq(modelObject),
EasyMock.eq(mockReader),
EasyMock.eq(deploymentContext))).andReturn(modelObject);
EasyMock.replay(mockLoader);
registry.registerLoader(name, (StAXElementLoader<ModelObject>) mockLoader);
- CompositeComponent parent = EasyMock.createNiceMock(CompositeComponent.class);
+ Component parent = EasyMock.createNiceMock(Component.class);
assertSame(modelObject, registry.load(parent, modelObject, mockReader, deploymentContext));
EasyMock.verify(mockLoader);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java Sat Feb 24 17:13:22 2007
@@ -27,7 +27,7 @@
import static org.osoa.sca.Constants.SCA_NS;
-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.loader.InvalidWireException;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -53,7 +53,7 @@
private WireLoader loader;
private XMLStreamReader reader;
private DeploymentContext context;
- private CompositeComponent composite;
+ private Component composite;
public void testValidWire() throws LoaderException, XMLStreamException {
expect(reader.getName()).andReturn(WIRE);
@@ -173,7 +173,7 @@
EasyMock.replay(location);
EasyMock.expect(reader.getLocation()).andReturn(location).anyTimes();
context = createMock(DeploymentContext.class);
- composite = createMock(CompositeComponent.class);
+ composite = createMock(Component.class);
loader = new WireLoader(registry);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java Sat Feb 24 17:13:22 2007
@@ -18,9 +18,9 @@
*/
package org.apache.tuscany.spi.builder;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ReferenceBinding;
import org.apache.tuscany.spi.component.ServiceBinding;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.ReferenceDefinition;
@@ -45,12 +45,12 @@
* @return a service binding
* @throws BuilderException
*/
- ServiceBinding build(CompositeComponent parent,
+ ServiceBinding build(Component parent,
ServiceDefinition serviceDefinition,
B bindingDefinition,
DeploymentContext deploymentContext) throws BuilderException;
- ReferenceBinding build(CompositeComponent parent,
+ ReferenceBinding build(Component parent,
ReferenceDefinition boundReferenceDefinition,
B bindingDefinition,
DeploymentContext deploymentContext) throws BuilderException;
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java Sat Feb 24 17:13:22 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.spi.builder;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -43,7 +42,7 @@
* @return the newly created component
* @throws BuilderException
*/
- <I extends Implementation<?>> Component build(CompositeComponent parent,
+ <I extends Implementation<?>> Component build(Component parent,
ComponentDefinition<I> definition,
DeploymentContext context) throws BuilderException;
@@ -56,7 +55,7 @@
* @return the newly created service
* @throws BuilderException
*/
- Service build(CompositeComponent parent, ServiceDefinition definition, DeploymentContext context)
+ Service build(Component parent, ServiceDefinition definition, DeploymentContext context)
throws BuilderException;
/**
@@ -68,7 +67,7 @@
* @return the newly created reference
* @throws BuilderException
*/
- Reference build(CompositeComponent parent, ReferenceDefinition definition, DeploymentContext context)
+ Reference build(Component parent, ReferenceDefinition definition, DeploymentContext context)
throws BuilderException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java Sat Feb 24 17:13:22 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.spi.builder;
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.model.ComponentDefinition;
import org.apache.tuscany.spi.model.Implementation;
@@ -30,7 +29,7 @@
* @version $Rev$ $Date$
*/
public interface ComponentBuilder<I extends Implementation<?>> {
- Component build(CompositeComponent parent,
+ Component build(Component parent,
ComponentDefinition<I> componentDefinition,
DeploymentContext deploymentContext) throws BuilderException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java Sat Feb 24 17:13:22 2007
@@ -80,12 +80,12 @@
/**
* Returns the composite where a remote request came in
*/
- CompositeComponent getRemoteComponent();
+ Component getRemoteComponent();
/**
* Sets the composite where a remote request came in
*/
- void setRemoteComponent(CompositeComponent component);
+ void setRemoteComponent(Component component);
/**
* Returns the current atomic component as a request is processed or null if it is not being tracked. Note that the
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java Sat Feb 24 17:13:22 2007
@@ -23,7 +23,6 @@
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ComponentException;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.Implementation;
@@ -45,7 +44,7 @@
* @param componentDefinition the component definition as parsed from an assembly
* @return the newly deployed component
*/
- <I extends Implementation<?>> Collection<Component> deploy(CompositeComponent parent,
+ <I extends Implementation<?>> Collection<Component> deploy(Component parent,
ComponentDefinition<I> componentDefinition)
throws LoaderException, BuilderException, ComponentException, ResolutionException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java Sat Feb 24 17:13:22 2007
@@ -25,9 +25,9 @@
import org.apache.tuscany.spi.builder.BindingBuilder;
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.builder.BuilderRegistry;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ReferenceBinding;
import org.apache.tuscany.spi.component.ServiceBinding;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.ReferenceDefinition;
@@ -53,14 +53,14 @@
builderRegistry.register(getBindingType(), this);
}
- public ServiceBinding build(CompositeComponent parent,
+ public ServiceBinding build(Component parent,
ServiceDefinition serviceDefinition,
B bindingDefinition,
DeploymentContext deploymentContext) throws BuilderException {
return null;
}
- public ReferenceBinding build(CompositeComponent parent,
+ public ReferenceBinding build(Component parent,
ReferenceDefinition boundReferenceDefinition,
B bindingDefinition,
DeploymentContext deploymentContext) throws BuilderException {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Sat Feb 24 17:13:22 2007
@@ -19,17 +19,14 @@
package org.apache.tuscany.spi.extension;
import java.net.URI;
-import java.util.Map;
-import org.w3c.dom.Document;
-
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.ReferenceBinding;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.spi.event.RuntimeEventListener;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.TargetInvoker;
@@ -39,12 +36,10 @@
*
* @version $$Rev$$ $$Date$$
*/
-public abstract class CompositeComponentExtension extends AbstractComponentExtension implements CompositeComponent {
- protected final Map<String, Document> propertyValues;
+public abstract class CompositeComponentExtension extends AbstractComponentExtension implements RuntimeEventListener {
- protected CompositeComponentExtension(URI name, Map<String, Document> propertyValues) {
+ protected CompositeComponentExtension(URI name) {
super(name);
- this.propertyValues = propertyValues;
}
public Scope getScope() {
@@ -53,10 +48,6 @@
public void onEvent(Event event) {
publish(event);
- }
-
- public Document getPropertyValue(String name) {
- return propertyValues.get(name);
}
public TargetInvoker createTargetInvoker(String name, Operation operation)
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java Sat Feb 24 17:13:22 2007
@@ -27,7 +27,8 @@
import java.util.Map;
import org.apache.tuscany.api.annotation.DataType;
-import org.apache.tuscany.spi.component.CompositeComponent;
+
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -45,7 +46,7 @@
this.service = service;
}
- public void visitMethod(CompositeComponent parent,
+ public void visitMethod(Component parent,
Method method,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
@@ -91,7 +92,7 @@
properties.put(name, property);
}
- public void visitField(CompositeComponent parent,
+ public void visitField(Component parent,
Field field,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
@@ -129,7 +130,7 @@
properties.put(name, property);
}
- public <T> void visitConstructor(CompositeComponent parent, Constructor<T> constructor,
+ public <T> void visitConstructor(Component parent, Constructor<T> constructor,
PojoComponentType<JavaMappedService,
JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
@@ -170,7 +171,7 @@
protected <T> void initProperty(JavaMappedProperty<T> property,
A annotation,
- CompositeComponent parent,
+ Component parent,
DeploymentContext context) throws ProcessingException {
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessor.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessor.java Sat Feb 24 17:13:22 2007
@@ -22,7 +22,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
/**
@@ -46,7 +46,7 @@
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- <T> void visitClass(CompositeComponent parent,
+ <T> void visitClass(Component parent,
Class<T> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException;
@@ -60,7 +60,7 @@
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- <T> void visitSuperClass(CompositeComponent parent,
+ <T> void visitSuperClass(Component parent,
Class<T> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException;
@@ -74,7 +74,7 @@
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- void visitMethod(CompositeComponent parent,
+ void visitMethod(Component parent,
Method method,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException;
@@ -90,7 +90,7 @@
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- <T> void visitConstructor(CompositeComponent parent,
+ <T> void visitConstructor(Component parent,
Constructor<T> constructor,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
@@ -105,7 +105,7 @@
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- void visitField(CompositeComponent parent,
+ void visitField(Component parent,
Field field,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException;
@@ -120,7 +120,7 @@
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- <T> void visitEnd(CompositeComponent parent,
+ <T> void visitEnd(Component parent,
Class<T> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException;
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessorExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessorExtension.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessorExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessorExtension.java Sat Feb 24 17:13:22 2007
@@ -30,7 +30,7 @@
import org.osoa.sca.annotations.Init;
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;
/**
@@ -57,38 +57,38 @@
registry.unregisterProcessor(this);
}
- public <T> void visitClass(CompositeComponent parent, Class<T> clazz,
+ public <T> void visitClass(Component parent, Class<T> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
- public <T> void visitSuperClass(CompositeComponent parent, Class<T> clazz,
+ public <T> void visitSuperClass(Component parent, Class<T> clazz,
PojoComponentType<JavaMappedService,
JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
- public void visitMethod(CompositeComponent parent, Method method,
+ public void visitMethod(Component parent, Method method,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
- public <T> void visitConstructor(CompositeComponent parent, Constructor<T> constructor,
+ public <T> void visitConstructor(Component parent, Constructor<T> constructor,
PojoComponentType<JavaMappedService,
JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
- public void visitField(CompositeComponent parent, Field field,
+ public void visitField(Component parent, Field field,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
}
- public <T> void visitEnd(CompositeComponent parent, Class<T> clazz,
+ public <T> void visitEnd(Component parent, Class<T> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/Introspector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/Introspector.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/Introspector.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/Introspector.java Sat Feb 24 17:13:22 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.spi.implementation.java;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
/**
@@ -38,7 +38,7 @@
* @return the updated component type
* @throws ProcessingException if an error is encountered evaluating the implementation class
*/
- PojoComponentType introspect(CompositeComponent parent,
+ PojoComponentType introspect(Component parent,
Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java Sat Feb 24 17:13:22 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.spi.loader;
-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.model.Implementation;
@@ -40,6 +40,6 @@
* @param deploymentContext the current deployment context
* @throws LoaderException if there was a problem loading the configuration type
*/
- void load(CompositeComponent parent, I implementation, DeploymentContext deploymentContext)
+ void load(Component parent, I implementation, DeploymentContext deploymentContext)
throws LoaderException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java Sat Feb 24 17:13:22 2007
@@ -22,7 +22,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-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.model.Implementation;
import org.apache.tuscany.spi.model.ModelObject;
@@ -49,7 +49,7 @@
* @return the model object obtained by parsing the current element on the stream
* @throws XMLStreamException if there was a problem reading the stream
*/
- ModelObject load(CompositeComponent parent,
+ ModelObject load(Component parent,
ModelObject object,
XMLStreamReader reader,
DeploymentContext deploymentContext)
@@ -67,7 +67,7 @@
* @return the model ojbect loaded from the document
* @throws LoaderException if there was a problem loading the document
*/
- <MO extends ModelObject> MO load(CompositeComponent parent,
+ <MO extends ModelObject> MO load(Component parent,
ModelObject object,
URL url,
Class<MO> type,
@@ -85,7 +85,7 @@
* @param deploymentContext the current deployment context
* @throws LoaderException if there was a problem loading the component type definition
*/
- <I extends Implementation<?>> void loadComponentType(CompositeComponent parent,
+ <I extends Implementation<?>> void loadComponentType(Component parent,
I implementation,
DeploymentContext deploymentContext)
throws LoaderException;
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java Sat Feb 24 17:13:22 2007
@@ -21,7 +21,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-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.model.ModelObject;
@@ -43,6 +43,6 @@
* @param deploymentContext the context for the load operation
* @return the model object for that element
*/
- T load(CompositeComponent parent, ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext)
+ T load(Component parent, ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtensionTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtensionTestCase.java Sat Feb 24 17:13:22 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.spi.extension;
-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.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -52,7 +52,7 @@
return Implementation.class;
}
- public void load(CompositeComponent parent, Implementation implementation,
+ public void load(Component parent, Implementation implementation,
DeploymentContext deploymentContext) throws LoaderException {
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java Sat Feb 24 17:13:22 2007
@@ -23,9 +23,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.ServiceBinding;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.Wire;
@@ -36,7 +36,7 @@
* @version $Rev$ $Date$
*/
public class CompositeComponentExtensionTestCase extends TestCase {
- private CompositeComponent composite;
+ private Component composite;
public void testCreateTargetInvoker() throws Exception {
@@ -59,7 +59,7 @@
protected void setUp() throws Exception {
super.setUp();
- composite = new CompositeComponentExtension(new URI("foo"), null) {
+ composite = new CompositeComponentExtension(new URI("foo")) {
public List<Wire> getWires(String name) {
throw new UnsupportedOperationException();
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java Sat Feb 24 17:13:22 2007
@@ -22,7 +22,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-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.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -62,7 +62,7 @@
return new QName("");
}
- public ModelObject load(CompositeComponent parent,
+ public ModelObject load(Component parent,
ModelObject object, XMLStreamReader reader,
DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
throw new AssertionError();
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessorTestCase.java?view=diff&rev=511391&r1=511390&r2=511391
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessorTestCase.java Sat Feb 24 17:13:22 2007
@@ -26,7 +26,7 @@
import java.util.List;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import junit.framework.TestCase;
@@ -135,7 +135,7 @@
@SuppressWarnings("unchecked")
protected <T> void initProperty(JavaMappedProperty<T> property,
Bar annotation,
- CompositeComponent parent,
+ Component parent,
DeploymentContext context) {
property.setDefaultValueFactory(EasyMock.createMock(ObjectFactory.class));
property.setName("test");
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org