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/01/25 03:36:03 UTC
svn commit: r499647 - 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/implementation/composite/
core/src/mai...
Author: jmarino
Date: Wed Jan 24 18:36:02 2007
New Revision: 499647
URL: http://svn.apache.org/viewvc?view=rev&rev=499647
Log:
remove BoundReferenceDefinition
Removed:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/BoundReferenceDefinition.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalBindingBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.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/ReferenceLoader.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.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/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/ReferenceLoaderTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalBindingBuilder.java?view=diff&rev=499647&r1=499646&r2=499647
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalBindingBuilder.java Wed Jan 24 18:36:02 2007
@@ -24,7 +24,7 @@
import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ServiceDefinition;
/**
@@ -48,9 +48,9 @@
public ReferenceBinding build(CompositeComponent parent,
- BoundReferenceDefinition boundReferenceDefinition,
+ ReferenceDefinition referenceDefinition,
LocalBindingDefinition bindingDefinition,
DeploymentContext deploymentContext) throws BuilderException {
- return new LocalReferenceBinding(boundReferenceDefinition.getName(), parent);
+ return new LocalReferenceBinding(referenceDefinition.getName(), parent);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?view=diff&rev=499647&r1=499646&r2=499647
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java Wed Jan 24 18:36:02 2007
@@ -43,7 +43,6 @@
import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.BindingDefinition;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.ComponentType;
import org.apache.tuscany.spi.model.Implementation;
@@ -202,7 +201,7 @@
@SuppressWarnings("unchecked")
public Reference build(CompositeComponent parent,
- BoundReferenceDefinition referenceDefinition,
+ ReferenceDefinition referenceDefinition,
DeploymentContext context) throws BuilderException {
String name = referenceDefinition.getName();
ServiceContract<?> contract = referenceDefinition.getServiceContract();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java?view=diff&rev=499647&r1=499646&r2=499647
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java Wed Jan 24 18:36:02 2007
@@ -9,7 +9,6 @@
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.CompositeComponentType;
import org.apache.tuscany.spi.model.Implementation;
@@ -47,13 +46,8 @@
}
for (ReferenceDefinition definition : componentType.getReferences().values()) {
try {
- if (definition instanceof BoundReferenceDefinition) {
- BoundReferenceDefinition brd = (BoundReferenceDefinition) definition;
- Reference child = builderRegistry.build(component, brd, deploymentContext);
- component.register(child);
- } else {
- throw new UnsupportedOperationException();
- }
+ Reference child = builderRegistry.build(component, definition, deploymentContext);
+ component.register(child);
} catch (ComponentRegistrationException e) {
throw new BuilderInstantiationException("Error registering reference", e);
}
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=499647&r1=499646&r2=499647
==============================================================================
--- 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 Wed Jan 24 18:36:02 2007
@@ -54,7 +54,6 @@
import org.apache.tuscany.spi.loader.UndefinedReferenceException;
import org.apache.tuscany.spi.loader.UnrecognizedElementException;
import org.apache.tuscany.spi.model.BindingDefinition;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.ComponentType;
import org.apache.tuscany.spi.model.CompositeComponentType;
@@ -235,18 +234,16 @@
}
if (componentType instanceof CompositeComponentType) {
ReferenceDefinition definition = componentType.getReferences().get(name);
- assert definition instanceof BoundReferenceDefinition;
- BoundReferenceDefinition brd = (BoundReferenceDefinition) definition;
- if (brd.getBindings().isEmpty()) {
+ if (definition.getBindings().isEmpty()) {
// TODO JFM allow selection of a default binding
try {
LocalBindingDefinition binding = new LocalBindingDefinition(new URI(target));
- brd.addBinding(binding);
+ definition.addBinding(binding);
} catch (URISyntaxException e) {
throw new InvalidReferenceException(e);
}
} else {
- for (BindingDefinition binding : brd.getBindings()) {
+ for (BindingDefinition binding : definition.getBindings()) {
try {
// FIXME this is bad - clarify in the spec how URIs are overriden
binding.setTargetUri(new URI(target));
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java?view=diff&rev=499647&r1=499646&r2=499647
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java Wed Jan 24 18:36:02 2007
@@ -18,8 +18,6 @@
*/
package org.apache.tuscany.core.loader;
-import java.util.ArrayList;
-import java.util.List;
import javax.xml.namespace.QName;
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
@@ -37,9 +35,6 @@
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.UnrecognizedElementException;
import org.apache.tuscany.spi.model.BindingDefinition;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
-import org.apache.tuscany.spi.model.ComponentType;
-import org.apache.tuscany.spi.model.CompositeComponentType;
import org.apache.tuscany.spi.model.ModelObject;
import org.apache.tuscany.spi.model.Multiplicity;
import org.apache.tuscany.spi.model.ReferenceDefinition;
@@ -68,30 +63,25 @@
throws XMLStreamException, LoaderException {
assert REFERENCE.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
- Multiplicity multiplicity =
- StAXUtil.multiplicity(reader.getAttributeValue(null, "multiplicity"), Multiplicity.ONE_ONE);
- List<BindingDefinition> bindings = new ArrayList<BindingDefinition>();
- ServiceContract<?> contract = null;
+ String multiplicityVal = reader.getAttributeValue(null, "multiplicity");
+ Multiplicity multiplicity = StAXUtil.multiplicity(multiplicityVal, Multiplicity.ONE_ONE);
+ ReferenceDefinition referenceDefinition = new ReferenceDefinition();
+ referenceDefinition.setMultiplicity(multiplicity);
+ referenceDefinition.setName(name);
while (true) {
switch (reader.next()) {
case START_ELEMENT:
ModelObject o = registry.load(parent, null, reader, deploymentContext);
if (o instanceof ServiceContract) {
- contract = (ServiceContract) o;
+ referenceDefinition.setServiceContract((ServiceContract) o);
} else if (o instanceof BindingDefinition) {
- bindings.add((BindingDefinition) o);
+ referenceDefinition.addBinding((BindingDefinition) o);
} else {
throw new UnrecognizedElementException(reader.getName());
}
break;
case END_ELEMENT:
- if (object instanceof ComponentType && !(object instanceof CompositeComponentType)) {
- // loading a reference in a component type side file
- ReferenceDefinition referenceDefinition = new ReferenceDefinition(name, contract);
- referenceDefinition.setMultiplicity(multiplicity);
- return referenceDefinition;
- }
- return new BoundReferenceDefinition(name, contract, bindings, multiplicity);
+ return referenceDefinition;
}
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.java?view=diff&rev=499647&r1=499646&r2=499647
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryNoBindingsTestCase.java Wed Jan 24 18:36:02 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.core.builder;
import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.tuscany.spi.builder.BuilderRegistry;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -29,9 +27,8 @@
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.model.BindingDefinition;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.Multiplicity;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ServiceDefinition;
import junit.framework.TestCase;
@@ -63,9 +60,8 @@
public void testReferenceBindingBuilderDispatch() throws Exception {
ReferenceBinding binding = EasyMock.createNiceMock(ReferenceBinding.class);
EasyMock.replay(binding);
- List<BindingDefinition> bindingDefs = new ArrayList<BindingDefinition>();
- BoundReferenceDefinition definition =
- new BoundReferenceDefinition("foo", null, bindingDefs, Multiplicity.ONE_ONE);
+ ReferenceDefinition definition = new ReferenceDefinition("foo", null);
+ definition.setMultiplicity(Multiplicity.ONE_ONE);
Reference reference = registry.build(parent, definition, deploymentContext);
assertEquals(1, reference.getReferenceBindings().size());
assertTrue(reference.getReferenceBindings().get(0) instanceof LocalReferenceBinding);
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=499647&r1=499646&r2=499647
==============================================================================
--- 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 Wed Jan 24 18:36:02 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.core.builder;
import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.builder.BindingBuilder;
@@ -38,13 +36,13 @@
import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.BindingDefinition;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.ComponentType;
import org.apache.tuscany.spi.model.CompositeComponentType;
import org.apache.tuscany.spi.model.CompositeImplementation;
import org.apache.tuscany.spi.model.Implementation;
import static org.apache.tuscany.spi.model.Multiplicity.ONE_ONE;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.model.ServiceDefinition;
@@ -113,15 +111,14 @@
EasyMock.replay(binding);
BindingBuilder<MockBindingDefinition> builder = EasyMock.createMock(BindingBuilder.class);
EasyMock.expect(builder.build(EasyMock.isA(CompositeComponent.class),
- EasyMock.isA(BoundReferenceDefinition.class),
+ EasyMock.isA(ReferenceDefinition.class),
EasyMock.isA(MockBindingDefinition.class),
EasyMock.isA(DeploymentContext.class))).andReturn(binding).times(2);
EasyMock.replay(builder);
registry.register(MockBindingDefinition.class, builder);
- List<BindingDefinition> bindingDefs = new ArrayList<BindingDefinition>();
- bindingDefs.add(new MockBindingDefinition());
- bindingDefs.add(new MockBindingDefinition());
- BoundReferenceDefinition definition = new BoundReferenceDefinition("foo", null, bindingDefs, ONE_ONE);
+ ReferenceDefinition definition = new ReferenceDefinition("foo", null, ONE_ONE);
+ definition.addBinding(new MockBindingDefinition());
+ definition.addBinding(new MockBindingDefinition());
Reference reference = registry.build(parent, definition, deploymentContext);
assertEquals(2, reference.getReferenceBindings().size());
EasyMock.verify(wireService);
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=499647&r1=499646&r2=499647
==============================================================================
--- 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 Wed Jan 24 18:36:02 2007
@@ -32,7 +32,6 @@
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
import org.apache.tuscany.spi.implementation.java.JavaMappedService;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.CompositeComponentType;
import org.apache.tuscany.spi.model.CompositeImplementation;
@@ -110,7 +109,7 @@
CompositeComponentType<ServiceDefinition, ReferenceDefinition, JavaMappedProperty<?>> innerType =
new CompositeComponentType<ServiceDefinition, ReferenceDefinition, JavaMappedProperty<?>>();
innerType.add(createInnerSourceComponentDef());
- BoundReferenceDefinition reference = new BoundReferenceDefinition();
+ ReferenceDefinition reference = new ReferenceDefinition();
reference.setName("TargetComponentRef");
JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
JavaServiceContract targetContract = registry.introspect(Target.class);
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=499647&r1=499646&r2=499647
==============================================================================
--- 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 Wed Jan 24 18:36:02 2007
@@ -28,7 +28,6 @@
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.Implementation;
import org.apache.tuscany.spi.model.ModelObject;
import org.apache.tuscany.spi.model.Property;
@@ -47,7 +46,7 @@
private ComponentLoader loader;
private XMLStreamReader reader;
private ServiceDefinition service;
- private BoundReferenceDefinition reference;
+ private ReferenceDefinition reference;
public void testNoServiceBinding() throws Exception {
loader.load(null, null, reader, null);
@@ -62,7 +61,7 @@
protected void setUp() throws Exception {
super.setUp();
service = new ServiceDefinition();
- reference = new BoundReferenceDefinition();
+ reference = new ReferenceDefinition();
PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
type.add(service);
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=499647&r1=499646&r2=499647
==============================================================================
--- 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 Wed Jan 24 18:36:02 2007
@@ -29,7 +29,6 @@
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.model.BindingDefinition;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.ComponentType;
import org.apache.tuscany.spi.model.Property;
import org.apache.tuscany.spi.model.ReferenceDefinition;
@@ -95,8 +94,7 @@
EasyMock.expect(mockRegistry.load(null, null, mockReader, null)).andReturn(binding).times(2);
EasyMock.replay(mockRegistry);
- BoundReferenceDefinition referenceDefinition =
- (BoundReferenceDefinition) loader.load(null, null, mockReader, null);
+ ReferenceDefinition referenceDefinition = loader.load(null, null, mockReader, null);
assertEquals(2, referenceDefinition.getBindings().size());
}
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=499647&r1=499646&r2=499647
==============================================================================
--- 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 Wed Jan 24 18:36:02 2007
@@ -23,7 +23,7 @@
import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.BindingDefinition;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ServiceDefinition;
/**
@@ -38,10 +38,10 @@
/**
* Creates a service binding
*
- * @param parent the containing composite component
+ * @param parent the containing composite component
* @param serviceDefinition the service the binding is configured for
- * @param bindingDefinition the binding definition
- * @param deploymentContext the current deployment context
+ * @param bindingDefinition the binding definition
+ * @param deploymentContext the current deployment context
* @return a service binding
* @throws BuilderException
*/
@@ -51,7 +51,7 @@
DeploymentContext deploymentContext) throws BuilderException;
ReferenceBinding build(CompositeComponent parent,
- BoundReferenceDefinition boundReferenceDefinition,
+ 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=499647&r1=499646&r2=499647
==============================================================================
--- 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 Wed Jan 24 18:36:02 2007
@@ -23,9 +23,9 @@
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.Implementation;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ServiceDefinition;
/**
@@ -68,7 +68,7 @@
* @return the newly created reference
* @throws BuilderException
*/
- Reference build(CompositeComponent parent, BoundReferenceDefinition definition, DeploymentContext context)
+ Reference build(CompositeComponent parent, ReferenceDefinition definition, DeploymentContext context)
throws BuilderException;
}
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=499647&r1=499646&r2=499647
==============================================================================
--- 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 Wed Jan 24 18:36:02 2007
@@ -30,7 +30,7 @@
import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.BindingDefinition;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ServiceDefinition;
import org.apache.tuscany.spi.wire.WireService;
@@ -69,7 +69,7 @@
}
public ReferenceBinding build(CompositeComponent parent,
- BoundReferenceDefinition boundReferenceDefinition,
+ ReferenceDefinition boundReferenceDefinition,
B bindingDefinition,
DeploymentContext deploymentContext) throws BuilderException {
return null;
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java?view=diff&rev=499647&r1=499646&r2=499647
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java Wed Jan 24 18:36:02 2007
@@ -18,6 +18,10 @@
*/
package org.apache.tuscany.spi.model;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
/**
* Represents a component reference
*
@@ -29,13 +33,25 @@
private Multiplicity multiplicity;
private boolean autowire;
private boolean required;
+ private List<BindingDefinition> bindings;
public ReferenceDefinition() {
+ multiplicity = Multiplicity.ONE_ONE;
+ bindings = new ArrayList<BindingDefinition>();
}
public ReferenceDefinition(String name, ServiceContract serviceContract) {
this.name = name;
this.serviceContract = serviceContract;
+ bindings = new ArrayList<BindingDefinition>();
+ multiplicity = Multiplicity.ONE_ONE;
+ }
+
+ public ReferenceDefinition(String name, ServiceContract serviceContract, Multiplicity multiplicity) {
+ this.name = name;
+ this.serviceContract = serviceContract;
+ this.multiplicity = multiplicity;
+ bindings = new ArrayList<BindingDefinition>();
}
public String getName() {
@@ -76,5 +92,13 @@
public void setRequired(boolean required) {
this.required = required;
+ }
+
+ public List<BindingDefinition> getBindings() {
+ return Collections.unmodifiableList(bindings);
+ }
+
+ public void addBinding(BindingDefinition binding) {
+ this.bindings.add(binding);
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java?view=diff&rev=499647&r1=499646&r2=499647
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java Wed Jan 24 18:36:02 2007
@@ -18,10 +18,10 @@
*/
package org.apache.tuscany.spi.model;
-import java.util.List;
+import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
-import java.net.URI;
+import java.util.List;
/**
* Represents a service offered by a component
@@ -55,26 +55,56 @@
this.callbackRefName = callbackRefName;
}
+ /**
+ * Returns the service name
+ *
+ * @return the service name
+ */
public String getName() {
return name;
}
+ /**
+ * Sets the service name
+ *
+ * @param name the service name
+ */
public void setName(String name) {
this.name = name;
}
+ /**
+ * Returns the service contract
+ *
+ * @return the service contract
+ */
public ServiceContract<?> getServiceContract() {
return serviceContract;
}
- public void setServiceContract(ServiceContract serviceContract) {
- this.serviceContract = serviceContract;
+ /**
+ * Sets the service contract
+ *
+ * @param contract the service contract
+ */
+ public void setServiceContract(ServiceContract contract) {
+ this.serviceContract = contract;
}
+ /**
+ * Returns true if the service is remotable
+ *
+ * @return true if the service is remotable
+ */
public boolean isRemotable() {
return remotable;
}
+ /**
+ * Sets if the service is remotable
+ *
+ * @param remotable if the service is remotable
+ */
public void setRemotable(boolean remotable) {
this.remotable = remotable;
}
@@ -93,18 +123,38 @@
this.callbackRefName = name;
}
+ /**
+ * Returns the bindings configured for the service
+ *
+ * @return the bindings configured for the service
+ */
public List<BindingDefinition> getBindings() {
return Collections.unmodifiableList(bindings);
}
+ /**
+ * Configures the service with a binding
+ *
+ * @param binding the binding
+ */
public void addBinding(BindingDefinition binding) {
this.bindings.add(binding);
}
+ /**
+ * Returns the target URI the service is wired to
+ *
+ * @return the target URI the service is wired to
+ */
public URI getTarget() {
return target;
}
+ /**
+ * Sets the target URI the service is wired to
+ *
+ * @param target the target URI the service is wired to
+ */
public void setTarget(URI target) {
this.target = target;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org