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:06:47 UTC
svn commit: r511417 [4/4] - 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/databinding/impl/
core/src/main/...
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java Sat Feb 24 19:06:42 2007
@@ -35,7 +35,6 @@
import static org.easymock.EasyMock.verify;
import org.osoa.sca.Constants;
-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;
@@ -71,7 +70,7 @@
replay(registry, reader, context);
try {
- loader.load(null, null, reader, context);
+ loader.load(null, reader, context);
fail();
} catch (MissingIncludeException e) {
// OK expected
@@ -91,7 +90,7 @@
expect(context.getClassLoader()).andReturn(cl);
expect(context.getComponentId()).andReturn(componentId);
- expect(registry.load((Component) isNull(),
+ expect(registry.load(
(ModelObject) isNull(),
eq(includeURL),
eq(CompositeComponentType.class),
@@ -99,7 +98,7 @@
.andReturn(null);
replay(registry, reader, context);
- Include include = loader.load(null, null, reader, context);
+ Include include = loader.load(null, reader, context);
assertEquals(name, include.getName());
assertEquals(includeURL, include.getScdlLocation());
verify(registry, reader, context);
@@ -117,7 +116,7 @@
expect(context.getClassLoader()).andReturn(cl);
expect(context.getComponentId()).andReturn(componentId);
- expect(registry.load((Component) isNull(),
+ expect(registry.load(
(ModelObject) isNull(),
eq(includeURL),
eq(CompositeComponentType.class),
@@ -125,7 +124,7 @@
.andReturn(null);
replay(registry, reader, context);
- Include include = loader.load(null, null, reader, context);
+ Include include = loader.load(null, reader, context);
assertEquals(name, include.getName());
assertEquals(includeURL, include.getScdlLocation());
verify(registry, reader, context);
@@ -146,7 +145,7 @@
expect(context.getClassLoader()).andReturn(cl);
expect(context.getComponentId()).andReturn(componentId);
- expect(registry.load((Component) isNull(),
+ expect(registry.load(
(ModelObject) isNull(),
eq(includeURL),
eq(CompositeComponentType.class),
@@ -154,7 +153,7 @@
.andReturn(null);
replay(registry, reader, context);
- Include include = loader.load(null, null, reader, context);
+ Include include = loader.load(null, reader, context);
assertEquals(name, include.getName());
assertEquals(includeURL, include.getScdlLocation());
verify(registry, reader, context);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/PolicySetLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/PolicySetLoaderTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/PolicySetLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/PolicySetLoaderTestCase.java Sat Feb 24 19:06:42 2007
@@ -46,7 +46,7 @@
break;
}
}
- PolicySet policySet = loader.load(null, null, reader, null);
+ PolicySet policySet = loader.load(null, reader, null);
assertNotNull(policySet);
assertEquals(2, policySet.getAppliedArtifacts().size());
assertTrue(policySet.getAppliedArtifacts().contains(new QName(SCA_NS, "binding.ws")));
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 24 19:06:42 2007
@@ -64,7 +64,7 @@
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.expect(mockReader.getName()).andReturn(REFERENCE).anyTimes();
EasyMock.replay(mockReader);
- ReferenceDefinition referenceDefinition = loader.load(parent, null, mockReader, ctx);
+ ReferenceDefinition referenceDefinition = loader.load(null, mockReader, ctx);
assertNotNull(referenceDefinition);
assertEquals(COMPONENT_NAME + "#" + name, referenceDefinition.getUri().toString());
}
@@ -79,7 +79,7 @@
EasyMock.replay(mockReader);
ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
- ReferenceDefinition referenceDefinition = loader.load(parent, type, mockReader, ctx);
+ ReferenceDefinition referenceDefinition = loader.load(type, mockReader, ctx);
assertTrue(ReferenceDefinition.class.equals(referenceDefinition.getClass()));
}
@@ -95,14 +95,14 @@
BindingDefinition binding = new BindingDefinition() {
};
- EasyMock.expect(mockRegistry.load(EasyMock.eq(parent),
+ EasyMock.expect(mockRegistry.load(
(ModelObject) EasyMock.isNull(),
EasyMock.eq(mockReader),
EasyMock.isA(DeploymentContext.class)))
.andReturn(binding).times(2);
EasyMock.replay(mockRegistry);
- ReferenceDefinition referenceDefinition = loader.load(parent, null, mockReader, ctx);
+ ReferenceDefinition referenceDefinition = loader.load(null, mockReader, ctx);
assertEquals(2, referenceDefinition.getBindings().size());
}
@@ -114,13 +114,13 @@
EasyMock.expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
EasyMock.expect(mockReader.getAttributeValue(null, "multiplicity")).andReturn("0..1");
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.START_ELEMENT);
- EasyMock.expect(mockRegistry.load(parent, null, mockReader, ctx)).andReturn(sc);
+ EasyMock.expect(mockRegistry.load(null, mockReader, ctx)).andReturn(sc);
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.replay(mockReader);
EasyMock.replay(mockRegistry);
- ReferenceDefinition referenceDefinition = loader.load(parent, null, mockReader, ctx);
+ ReferenceDefinition referenceDefinition = loader.load(null, mockReader, ctx);
assertNotNull(referenceDefinition);
assertEquals(COMPONENT_NAME + "#" + name, referenceDefinition.getUri().toString());
assertSame(sc, referenceDefinition.getServiceContract());
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -58,7 +58,7 @@
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.expect(mockReader.getName()).andReturn(SERVICE);
EasyMock.replay(mockReader);
- ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, ctx);
+ ServiceDefinition serviceDefinition = loader.load(null, mockReader, ctx);
assertNotNull(serviceDefinition);
assertEquals(COMPONENT_NAME + "target", serviceDefinition.getTarget().toString());
}
@@ -73,7 +73,7 @@
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.expect(mockReader.getName()).andReturn(SERVICE);
EasyMock.replay(mockReader);
- ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, ctx);
+ ServiceDefinition serviceDefinition = loader.load(null, mockReader, ctx);
assertNotNull(serviceDefinition);
assertEquals(COMPONENT_NAME + "target#fragment", serviceDefinition.getTarget().toString());
}
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -68,7 +68,7 @@
expect(mockReader.next()).andReturn(END_ELEMENT);
expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
replay(mockReader);
- ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, deploymentContext);
+ ServiceDefinition serviceDefinition = loader.load(null, mockReader, deploymentContext);
assertNotNull(serviceDefinition);
assertEquals(PARENT_NAME + "#" + name, serviceDefinition.getUri().toString());
}
@@ -82,7 +82,7 @@
replay(mockReader);
ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
- ServiceDefinition serviceDefinition = loader.load(parent, type, mockReader, deploymentContext);
+ ServiceDefinition serviceDefinition = loader.load(type, mockReader, deploymentContext);
assertTrue(ServiceDefinition.class.equals(serviceDefinition.getClass()));
}
@@ -100,10 +100,10 @@
BindingDefinition binding = new BindingDefinition() {
};
- expect(mockRegistry.load(parent, null, mockReader, deploymentContext)).andReturn(binding).times(2);
+ expect(mockRegistry.load(null, mockReader, deploymentContext)).andReturn(binding).times(2);
replay(mockRegistry);
- ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, deploymentContext);
+ ServiceDefinition serviceDefinition = loader.load(null, mockReader, deploymentContext);
assertEquals(2, serviceDefinition.getBindings().size());
}
@@ -116,7 +116,7 @@
expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
expect(mockReader.next()).andReturn(START_ELEMENT);
expect(mockReader.getName()).andReturn(INTERFACE_JAVA);
- expect(mockRegistry.load(parent, null, mockReader, deploymentContext)).andReturn(sc);
+ expect(mockRegistry.load(null, mockReader, deploymentContext)).andReturn(sc);
expect(mockReader.next()).andReturn(START_ELEMENT);
expect(mockReader.getName()).andReturn(REFERENCE);
expect(mockReader.getElementText()).andReturn(target);
@@ -128,7 +128,7 @@
replay(mockReader);
replay(mockRegistry);
- ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, deploymentContext);
+ ServiceDefinition serviceDefinition = loader.load(null, mockReader, deploymentContext);
assertNotNull(serviceDefinition);
assertEquals(PARENT_NAME + "#" + name, serviceDefinition.getUri().toString());
assertSame(sc, serviceDefinition.getServiceContract());
@@ -142,14 +142,14 @@
expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
expect(mockReader.next()).andReturn(START_ELEMENT);
expect(mockReader.getName()).andReturn(INTERFACE_JAVA);
- expect(mockRegistry.load(parent, null, mockReader, deploymentContext)).andReturn(sc);
+ expect(mockRegistry.load(null, mockReader, deploymentContext)).andReturn(sc);
expect(mockReader.next()).andReturn(END_ELEMENT);
expect(mockReader.getName()).andReturn(SERVICE);
replay(mockReader);
replay(mockRegistry);
- ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, deploymentContext);
+ ServiceDefinition serviceDefinition = loader.load(null, mockReader, deploymentContext);
assertNotNull(serviceDefinition);
assertEquals(PARENT_NAME + "#" + name, serviceDefinition.getUri().toString());
assertSame(sc, serviceDefinition.getServiceContract());
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -68,14 +68,14 @@
mockMonitor.registeringLoader(EasyMock.eq(name));
mockMonitor.elementLoad(EasyMock.eq(name));
EasyMock.replay(mockMonitor);
- EasyMock.expect(mockLoader.load(EasyMock.isA(Component.class),
+ EasyMock.expect(mockLoader.load(
(ModelObject) isNull(),
EasyMock.eq(mockReader),
EasyMock.eq(deploymentContext))).andReturn(modelObject);
EasyMock.replay(mockLoader);
registry.registerLoader(name, (StAXElementLoader<ModelObject>) mockLoader);
Component parent = EasyMock.createNiceMock(Component.class);
- assertSame(modelObject, registry.load(parent, null, mockReader, deploymentContext));
+ assertSame(modelObject, registry.load(null, mockReader, deploymentContext));
EasyMock.verify(mockLoader);
EasyMock.verify(mockMonitor);
EasyMock.verify(mockReader);
@@ -88,7 +88,7 @@
mockMonitor.elementLoad(EasyMock.eq(name));
EasyMock.replay(mockMonitor);
try {
- registry.load(null, null, mockReader, deploymentContext);
+ registry.load(null, mockReader, deploymentContext);
fail();
} catch (UnrecognizedElementException e) {
assertSame(name, e.getElement());
@@ -103,14 +103,14 @@
mockMonitor.registeringLoader(EasyMock.eq(name));
mockMonitor.elementLoad(EasyMock.eq(name));
EasyMock.replay(mockMonitor);
- EasyMock.expect(mockLoader.load(EasyMock.isA(Component.class),
+ EasyMock.expect(mockLoader.load(
EasyMock.eq(modelObject),
EasyMock.eq(mockReader),
EasyMock.eq(deploymentContext))).andReturn(modelObject);
EasyMock.replay(mockLoader);
registry.registerLoader(name, (StAXElementLoader<ModelObject>) mockLoader);
Component parent = EasyMock.createNiceMock(Component.class);
- assertSame(modelObject, registry.load(parent, modelObject, mockReader, deploymentContext));
+ assertSame(modelObject, registry.load(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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -68,7 +68,7 @@
expect(reader.next()).andReturn(END_ELEMENT);
expect(reader.getName()).andReturn(WIRE).anyTimes();
replay(registry, reader, context);
- WireDefinition wireDef = loader.load(composite, null, reader, context);
+ WireDefinition wireDef = loader.load(null, reader, context);
assertNotNull(wireDef);
verify(registry, reader, context);
}
@@ -83,7 +83,7 @@
expect(reader.getName()).andReturn(WIRE).anyTimes();
replay(registry, reader, context);
try {
- loader.load(composite, null, reader, context);
+ loader.load(null, reader, context);
fail();
} catch (InvalidWireException e) {
//expected behaviour
@@ -101,7 +101,7 @@
expect(reader.getName()).andReturn(WIRE).anyTimes();
replay(registry, reader, context);
try {
- loader.load(composite, null, reader, context);
+ loader.load(null, reader, context);
fail();
} catch (InvalidWireException e) {
//expected behaviour
@@ -116,7 +116,7 @@
expect(reader.getElementText()).andReturn("").times(1);
replay(registry, reader, context);
try {
- loader.load(composite, null, reader, context);
+ loader.load(null, reader, context);
fail();
} catch (InvalidWireException e) {
//expected behaviour
@@ -136,7 +136,7 @@
expect(reader.getName()).andReturn(WIRE).anyTimes();
replay(registry, reader, context);
try {
- loader.load(composite, null, reader, context);
+ loader.load(null, reader, context);
fail();
} catch (InvalidWireException e) {
//expected behaviour
@@ -157,7 +157,7 @@
expect(reader.next()).andReturn(END_ELEMENT);
expect(reader.getName()).andReturn(WIRE).anyTimes();
replay(registry, reader, context);
- WireDefinition wireDef = loader.load(composite, null, reader, context);
+ WireDefinition wireDef = loader.load(null, reader, context);
assertNotNull(wireDef);
assertEquals("source", wireDef.getSource().getPath());
assertEquals("reference", wireDef.getSource().getFragment());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/PolicyEngineImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/PolicyEngineImplTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/PolicyEngineImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/PolicyEngineImplTestCase.java Sat Feb 24 19:06:42 2007
@@ -74,7 +74,7 @@
break;
}
if (XMLStreamConstants.START_ELEMENT == state && reader.getName().equals(POLICYSET)) {
- psc.addPolicySet(loader.load(null, null, reader, null));
+ psc.addPolicySet(loader.load(null, reader, null));
}
}
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -20,7 +20,6 @@
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;
@@ -38,20 +37,24 @@
/**
* Creates a service binding
*
- * @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 context the current deployment context
* @return a service binding
* @throws BuilderException
*/
- ServiceBinding build(Component parent,
- ServiceDefinition serviceDefinition,
- B bindingDefinition,
- DeploymentContext deploymentContext) throws BuilderException;
+ ServiceBinding build(ServiceDefinition serviceDefinition, B bindingDefinition, DeploymentContext context)
+ throws BuilderException;
- ReferenceBinding build(Component parent,
- ReferenceDefinition boundReferenceDefinition,
- B bindingDefinition,
- DeploymentContext deploymentContext) throws BuilderException;
+ /**
+ * Creates a reference binding
+ *
+ * @param referenceDefinition the reference the binding is configured for
+ * @param bindingDefinition the binding definition
+ * @param context the current deployment context
+ * @return a reference binding
+ * @throws BuilderException
+ */
+ ReferenceBinding build(ReferenceDefinition referenceDefinition, B bindingDefinition, DeploymentContext context)
+ 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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -36,38 +36,32 @@
/**
* Builds a <code>Component</code> from a <code>ComponentDefinition</code>
*
- * @param parent the composite that will be the parent of the newly built component
* @param definition the component definition as parsed from an SCA assembly
* @param context the current deployment context
* @return the newly created component
* @throws BuilderException
*/
- <I extends Implementation<?>> Component build(Component parent,
- ComponentDefinition<I> definition,
- DeploymentContext context) throws BuilderException;
+ <I extends Implementation<?>> Component build(ComponentDefinition<I> definition, DeploymentContext context)
+ throws BuilderException;
/**
* Builds a <code>Service</code> and its bindings from a <code>BoundServiceDefinition</code>
*
- * @param parent the composite that will be the parent of the newly built service
* @param definition the service definition as parsed from an SCA assembly
* @param context the current deployment context
* @return the newly created service
* @throws BuilderException
*/
- Service build(Component parent, ServiceDefinition definition, DeploymentContext context)
- throws BuilderException;
+ Service build(ServiceDefinition definition, DeploymentContext context) throws BuilderException;
/**
* Builds a <code>Reference</code> and its bindings from a <code>BoundReferenceDefinition</code>
*
- * @param parent the composite that will be the parent of the newly built reference
* @param definition the reference definition as parsed from an SCA assembly
* @param context the current deployment context
* @return the newly created reference
* @throws BuilderException
*/
- Reference build(Component parent, ReferenceDefinition definition, DeploymentContext context)
- throws BuilderException;
+ Reference build(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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -24,12 +24,19 @@
import org.apache.tuscany.spi.model.Implementation;
/**
- * Responsible for building a {@link Component} from an atomic or composite component configured in an assembly
+ * Responsible for building a {@link Component} from an component definition
*
* @version $Rev$ $Date$
*/
public interface ComponentBuilder<I extends Implementation<?>> {
- Component build(Component parent,
- ComponentDefinition<I> componentDefinition,
- DeploymentContext deploymentContext) throws BuilderException;
+
+ /**
+ * Builds the component
+ *
+ * @param componentDefinition the component definition
+ * @param context the deployment context
+ * @return the built component
+ * @throws BuilderException
+ */
+ Component build(ComponentDefinition<I> componentDefinition, 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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 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.Component;
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,17 +53,14 @@
builderRegistry.register(getBindingType(), this);
}
- public ServiceBinding build(Component parent,
- ServiceDefinition serviceDefinition,
- B bindingDefinition,
- DeploymentContext deploymentContext) throws BuilderException {
+ public ServiceBinding build(ServiceDefinition serviceDefinition, B bindingDefinition, DeploymentContext context)
+ throws BuilderException {
return null;
}
- public ReferenceBinding build(Component parent,
- ReferenceDefinition boundReferenceDefinition,
+ public ReferenceBinding build(ReferenceDefinition boundReferenceDefinition,
B bindingDefinition,
- DeploymentContext deploymentContext) throws BuilderException {
+ DeploymentContext context) throws BuilderException {
return null;
}
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -26,12 +26,11 @@
import java.util.Collection;
import java.util.Map;
-import org.apache.tuscany.api.annotation.DataType;
-
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.api.annotation.DataType;
+
/**
* Base class for ImplementationProcessors that handle annotations that add Properties.
*
@@ -46,10 +45,10 @@
this.service = service;
}
- public void visitMethod(Component parent,
- Method method,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException {
+ public void visitMethod(
+ Method method,
+ PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
+ DeploymentContext context) throws ProcessingException {
A annotation = method.getAnnotation(annotationClass);
if (annotation == null) {
return;
@@ -82,21 +81,21 @@
if (javaType.isArray() || Collection.class.isAssignableFrom(javaType)) {
property.setMany(true);
}
-
+
//add databinding available as annotations, as extensions
DataType propertyDataBinding = method.getAnnotation(DataType.class);
if (propertyDataBinding != null) {
property.getExtensions().put(DataBinding.class.getName(), propertyDataBinding.name());
}
- initProperty(property, annotation, parent, context);
+ initProperty(property, annotation, context);
properties.put(name, property);
}
- public void visitField(Component parent,
- Field field,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException {
-
+ public void visitField(
+ Field field,
+ PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
+ DeploymentContext context) throws ProcessingException {
+
A annotation = field.getAnnotation(annotationClass);
if (annotation == null) {
return;
@@ -118,19 +117,19 @@
JavaMappedProperty<?> property = createProperty(name, baseType, field);
if (javaType.isArray() || Collection.class.isAssignableFrom(javaType)) {
property.setMany(true);
- }
-
+ }
+
//add databinding available as annotations, as extensions
DataType propertyDataBinding = field.getAnnotation(DataType.class);
if (propertyDataBinding != null) {
property.getExtensions().put(DataBinding.class.getName(), propertyDataBinding.name());
}
- initProperty(property, annotation, parent, context);
+ initProperty(property, annotation, context);
properties.put(name, property);
}
- public <T> void visitConstructor(Component parent, Constructor<T> constructor,
+ public <T> void visitConstructor(Constructor<T> constructor,
PojoComponentType<JavaMappedService,
JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
@@ -153,13 +152,13 @@
if (name == null || name.length() == 0) {
name = param.getName();
}
-
+
Class<?> baseType = getBaseType(param, constructor.getGenericParameterTypes()[i]);
JavaMappedProperty<?> property = createProperty(name, baseType, constructor);
if (param.isArray() || Collection.class.isAssignableFrom(param)) {
property.setMany(true);
}
- initProperty(property, monitorAnnot, parent, context);
+ initProperty(property, monitorAnnot, context);
properties.put(name, property);
service.addName(definition.getInjectionNames(), i, name);
}
@@ -169,10 +168,8 @@
protected abstract String getName(A annotation);
- protected <T> void initProperty(JavaMappedProperty<T> property,
- A annotation,
- Component parent,
- DeploymentContext context) throws ProcessingException {
+ protected <T> void initProperty(JavaMappedProperty<T> property, A annotation, DeploymentContext context)
+ throws ProcessingException {
}
protected <T> JavaMappedProperty<T> createProperty(String name, Class<T> javaType, Member member)
@@ -187,5 +184,5 @@
}
return Character.toLowerCase(name.charAt(3)) + name.substring(4);
}
-
+
}
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -22,7 +22,6 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
/**
@@ -40,89 +39,82 @@
/**
* A callback received when the component implementation class is first loaded
*
- * @param parent the parent composite
* @param clazz the component implementation class
* @param type the incomplete component type associated with the implementation class
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- <T> void visitClass(Component parent,
- Class<T> clazz,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException;
+ <T> void visitClass(Class<T> clazz,
+ PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
+ DeploymentContext context) throws ProcessingException;
/**
* A callback received as the component implementation class hierarchy is evaluated
*
- * @param parent the parent composite
* @param clazz the superclass in the component implmentation's class hierarchy
* @param type the incomplete component type associated with the implementation class
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- <T> void visitSuperClass(Component parent,
- Class<T> clazz,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException;
+ <T> void visitSuperClass(
+ Class<T> clazz,
+ PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
+ DeploymentContext context) throws ProcessingException;
/**
* A callback received as the component implementation's public and protected methods are evaluated
*
- * @param parent the parent composite
* @param method the current public or protected method being evaluated
* @param type the incomplete component type associated with the implementation class
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- void visitMethod(Component parent,
- Method method,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException;
+ void visitMethod(
+ Method method,
+ PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
+ DeploymentContext context) throws ProcessingException;
/**
* A callback received as the component implementation's constructor used for instantiation by the runtime is
* evaluated. If an implementation contains more than one constructor, the constructor passed to the callback will
* be chosen according to the algorithm described in the SCA Java Client and Implementation Model Specification.
*
- * @param parent the parent composite
* @param constructor the constructor used for instantiating component implementation instances
* @param type the incomplete component type associated with the implementation class
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- <T> void visitConstructor(Component parent,
- Constructor<T> constructor,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context)
+ <T> void visitConstructor(
+ Constructor<T> constructor,
+ PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
+ DeploymentContext context)
throws ProcessingException;
/**
* A callback received as the component implementation's public and protected fields are evaluated
*
- * @param parent the parent composite
* @param field the current public or protected field being evaluated
* @param type the incomplete component type associated with the implementation class
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- void visitField(Component parent,
- Field field,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException;
+ void visitField(
+ Field field,
+ PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
+ DeploymentContext context) throws ProcessingException;
/**
* The final callback received when all other callbacks during evaluation of the component implementation have been
* issued
*
- * @param parent the parent composite
* @param clazz the component implementation class
* @param type the incomplete component type associated with the implementation class
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- <T> void visitEnd(Component parent,
- Class<T> clazz,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException;
+ <T> void visitEnd(
+ 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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -30,7 +30,6 @@
import org.osoa.sca.annotations.Init;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
/**
@@ -57,38 +56,38 @@
registry.unregisterProcessor(this);
}
- public <T> void visitClass(Component parent, Class<T> clazz,
+ public <T> void visitClass(Class<T> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
- public <T> void visitSuperClass(Component parent, Class<T> clazz,
+ public <T> void visitSuperClass(Class<T> clazz,
PojoComponentType<JavaMappedService,
JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
- public void visitMethod(Component parent, Method method,
+ public void visitMethod(Method method,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
- public <T> void visitConstructor(Component parent, Constructor<T> constructor,
+ public <T> void visitConstructor(Constructor<T> constructor,
PojoComponentType<JavaMappedService,
JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
- public void visitField(Component parent, Field field,
+ public void visitField(Field field,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
}
- public <T> void visitEnd(Component parent, Class<T> clazz,
+ public <T> void visitEnd(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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.spi.implementation.java;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
/**
@@ -32,16 +31,13 @@
/**
* Walks the given component implementation class
*
- * @param parent the parent composite
- * @param clazz the component implementation class
- * @param type the component type associated with the implementation class
+ * @param clazz the component implementation class
+ * @param type the component type associated with the implementation class
* @return the updated component type
* @throws ProcessingException if an error is encountered evaluating the implementation class
*/
- PojoComponentType introspect(Component parent,
- Class<?> clazz,
+ PojoComponentType introspect(Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context)
- throws ProcessingException;
+ DeploymentContext context) throws ProcessingException;
}
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.spi.loader;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.Implementation;
@@ -35,11 +34,9 @@
/**
* Load the component type definition for the supplied implementation.
*
- * @param parent the parent composite
- * @param implementation the implementation whose component type information should be loaded
- * @param deploymentContext the current deployment context
+ * @param implementation the implementation whose component type information should be loaded
+ * @param context the current deployment context
* @throws LoaderException if there was a problem loading the configuration type
*/
- void load(Component parent, I implementation, DeploymentContext deploymentContext)
- throws LoaderException;
+ void load(I implementation, DeploymentContext context) 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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -41,7 +41,6 @@
* This method must be called with the XML cursor positioned on a START_ELEMENT event. When this method returns, the
* stream will be positioned on the corresponding END_ELEMENT event.
*
- * @param parent the composite in which the model object is contained
* @param object the model object to load configuration data into. If null, the loader dispatched to is
* responsible for creating a model object itself
* @param reader the XML stream to parse
@@ -49,29 +48,21 @@
* @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(Component parent,
- ModelObject object,
- XMLStreamReader reader,
- DeploymentContext deploymentContext)
+ ModelObject load(ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException;
/**
* Load a model object from a specified location.
*
- * @param parent the composite in which the model object is contained
- * @param object the model object to load configuration data into. If null, the loader dispatched to is
- * responsible for creating a model object itself
- * @param url the location of an XML document to be loaded
- * @param type the type of ModelObject that is expected to be in the document
- * @param deploymentContext the current deployment context
+ * @param object the model object to load configuration data into. If null, the loader dispatched to is responsible
+ * for creating a model object itself
+ * @param url the location of an XML document to be loaded
+ * @param type the type of ModelObject that is expected to be in the document
+ * @param context the current deployment context
* @return the model ojbect loaded from the document
* @throws LoaderException if there was a problem loading the document
*/
- <MO extends ModelObject> MO load(Component parent,
- ModelObject object,
- URL url,
- Class<MO> type,
- DeploymentContext deploymentContext)
+ <MO extends ModelObject> MO load(ModelObject object, URL url, Class<MO> type, DeploymentContext context)
throws LoaderException;
/**
@@ -80,13 +71,10 @@
* artifact related to the implementation, some combination of those techniques or any other implementation-defined
* mechanism.
*
- * @param parent the parent composite
- * @param implementation the implementation whose component type should be loaded
- * @param deploymentContext the current deployment context
+ * @param implementation the implementation whose component type should be loaded
+ * @param context the current deployment context
* @throws LoaderException if there was a problem loading the component type definition
*/
- <I extends Implementation<?>> void loadComponentType(Component parent,
- I implementation,
- DeploymentContext deploymentContext)
+ <I extends Implementation<?>> void loadComponentType(I implementation, DeploymentContext context)
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -21,7 +21,6 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.ModelObject;
@@ -35,14 +34,13 @@
* Create the model object for an element in an XML stream. When this method returns the stream will be positioned
* on the corresponding END_ELEMENT.
*
- * @param parent the composite the model object being loaded is contained within
- * @param object the model object to load configuration data into. An implementation may choose to return
- * a different model object than the one passed in, in which case it is responsible for
- * copying data. If null, the loader is responsible for creating a model object itself
- * @param reader the XML stream reader positioned on the applicable START_ELEMENT
- * @param deploymentContext the context for the load operation
+ * @param object the model object to load configuration data into. An implementation may choose to return a
+ * different model object than the one passed in, in which case it is responsible for copying data.
+ * If null, the loader is responsible for creating a model object itself
+ * @param reader the XML stream reader positioned on the applicable START_ELEMENT
+ * @param context the context for the load operation
* @return the model object for that element
*/
- T load(Component parent, ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext)
+ T load(ModelObject object, XMLStreamReader reader, DeploymentContext context)
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -52,8 +52,7 @@
return Implementation.class;
}
- public void load(Component parent, Implementation implementation,
- DeploymentContext deploymentContext) throws LoaderException {
+ public void load(Implementation implementation, DeploymentContext context) throws LoaderException {
}
}
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -22,7 +22,6 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-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,9 +61,9 @@
return new QName("");
}
- public ModelObject load(Component parent,
- ModelObject object, XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ public ModelObject load(
+ 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=511417&r1=511416&r2=511417
==============================================================================
--- 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 19:06:42 2007
@@ -26,7 +26,6 @@
import java.util.List;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import junit.framework.TestCase;
@@ -45,7 +44,7 @@
Method method = Foo.class.getMethod("setBar", String.class);
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
- processor.visitMethod(null, method, type, null);
+ processor.visitMethod(method, type, null);
JavaMappedProperty<?> prop = type.getProperties().get("test");
assertNotNull(prop.getDefaultValueFactory());
}
@@ -55,7 +54,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
try {
- processor.visitMethod(null, method, type, null);
+ processor.visitMethod(method, type, null);
fail();
} catch (IllegalPropertyException e) {
//expected
@@ -67,7 +66,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
try {
- processor.visitMethod(null, method, type, null);
+ processor.visitMethod(method, type, null);
fail();
} catch (IllegalPropertyException e) {
//expected
@@ -78,9 +77,9 @@
Method method = Foo.class.getMethod("setBar", String.class);
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
- processor.visitMethod(null, method, type, null);
+ processor.visitMethod(method, type, null);
try {
- processor.visitMethod(null, method, type, null);
+ processor.visitMethod(method, type, null);
fail();
} catch (DuplicatePropertyException e) {
//expected
@@ -91,7 +90,7 @@
Field field = Foo.class.getDeclaredField("d");
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
- processor.visitField(null, field, type, null);
+ processor.visitField(field, type, null);
JavaMappedProperty<?> prop = type.getProperties().get("test");
assertNotNull(prop.getDefaultValueFactory());
}
@@ -100,7 +99,7 @@
Constructor<Foo> ctor = Foo.class.getConstructor(String.class);
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
ConstructorDefinition def = type.getConstructorDefinition();
assertEquals("test", def.getInjectionNames().get(0));
assertNotNull(type.getProperties().get("test"));
@@ -135,7 +134,6 @@
@SuppressWarnings("unchecked")
protected <T> void initProperty(JavaMappedProperty<T> property,
Bar annotation,
- 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