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 [2/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/main/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoader.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoader.java Sat Feb 24 19:06:42 2007
@@ -21,7 +21,6 @@
import java.net.URL;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
import org.apache.tuscany.spi.implementation.java.IntrospectionRegistry;
@@ -64,14 +63,14 @@
this.introspector = introspector;
}
- public void load(Component parent,
- SystemImplementation implementation,
- DeploymentContext deploymentContext) throws LoaderException {
+ public void load(
+ SystemImplementation implementation,
+ DeploymentContext deploymentContext) throws LoaderException {
Class<?> implClass = implementation.getImplementationClass();
URL sidefile = implClass.getResource(JavaIntrospectionHelper.getBaseName(implClass) + ".componentType");
PojoComponentType componentType;
if (sidefile == null) {
- componentType = loadByIntrospection(parent, implementation, deploymentContext);
+ componentType = loadByIntrospection(implementation, deploymentContext);
} else {
componentType = loadFromSidefile(sidefile, deploymentContext);
}
@@ -84,18 +83,17 @@
return SystemImplementation.class;
}
- protected PojoComponentType loadByIntrospection(Component parent,
- SystemImplementation implementation,
- DeploymentContext deploymentContext) throws ProcessingException {
+ protected PojoComponentType loadByIntrospection(SystemImplementation implementation, DeploymentContext context)
+ throws ProcessingException {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> componentType =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Class<?> implClass = implementation.getImplementationClass();
- introspector.introspect(parent, implClass, componentType, deploymentContext);
+ introspector.introspect(implClass, componentType, context);
return componentType;
}
protected PojoComponentType loadFromSidefile(URL url, DeploymentContext deploymentContext) throws LoaderException {
- return loaderRegistry.load(null, null, url, PojoComponentType.class, deploymentContext);
+ return loaderRegistry.load(null, url, PojoComponentType.class, deploymentContext);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemCompositeComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemCompositeComponentTypeLoader.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemCompositeComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemCompositeComponentTypeLoader.java Sat Feb 24 19:06:42 2007
@@ -18,10 +18,9 @@
*/
package org.apache.tuscany.core.implementation.system.loader;
-import java.net.URL;
import java.net.URI;
+import java.net.URL;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -48,9 +47,9 @@
return SystemCompositeImplementation.class;
}
- public void load(Component parent,
- SystemCompositeImplementation implementation,
- DeploymentContext deploymentContext)
+ public void load(
+ SystemCompositeImplementation implementation,
+ DeploymentContext deploymentContext)
throws LoaderException {
URL scdlLocation = implementation.getScdlLocation();
if (scdlLocation == null) {
@@ -59,15 +58,12 @@
ClassLoader cl = implementation.getClassLoader();
URI componentId = deploymentContext.getComponentId();
DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, scdlLocation, componentId);
- CompositeComponentType componentType = loadFromSidefile(parent, scdlLocation, childContext);
+ CompositeComponentType componentType = loadFromSidefile(scdlLocation, childContext);
implementation.setComponentType(componentType);
}
- protected CompositeComponentType loadFromSidefile(Component parent,
- URL url,
- DeploymentContext deploymentContext)
- throws LoaderException {
- return loaderRegistry.load(parent, null, url, CompositeComponentType.class, deploymentContext);
+ protected CompositeComponentType loadFromSidefile(URL url, DeploymentContext context) throws LoaderException {
+ return loaderRegistry.load(null, url, CompositeComponentType.class, context);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemImplementationLoader.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemImplementationLoader.java Sat Feb 24 19:06:42 2007
@@ -24,7 +24,6 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -48,16 +47,16 @@
super(registry);
}
- public SystemImplementation load(Component parent,
- ModelObject object, XMLStreamReader reader,
- DeploymentContext deploymentContext)
+ public SystemImplementation load(
+ ModelObject object, XMLStreamReader reader,
+ DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
assert SYSTEM_IMPLEMENTATION.equals(reader.getName());
SystemImplementation implementation = new SystemImplementation();
String implClass = reader.getAttributeValue(null, "class");
Class<?> implementationClass = LoaderUtil.loadClass(implClass, deploymentContext.getClassLoader());
implementation.setImplementationClass(implementationClass);
- registry.loadComponentType(parent, implementation, deploymentContext);
+ registry.loadComponentType(implementation, deploymentContext);
while (true) {
int code = reader.next();
if (code == XMLStreamConstants.START_ELEMENT) {
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 Sat Feb 24 19:06:42 2007
@@ -39,7 +39,6 @@
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.databinding.extension.DOMHelper;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
@@ -104,10 +103,10 @@
}
@SuppressWarnings("unchecked")
- public ComponentDefinition<?> load(Component parent,
- ModelObject object,
- XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ public ComponentDefinition<?> load(
+ ModelObject object,
+ XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
assert COMPONENT.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
String initLevel = reader.getAttributeValue(null, "initLevel");
@@ -117,8 +116,8 @@
deploymentContext.getClassLoader(),
deploymentContext.getScdlLocation(),
componentId);
- Implementation<?> impl = loadImplementation(parent, reader, childContext);
- registry.loadComponentType(parent, impl, childContext);
+ Implementation<?> impl = loadImplementation(reader, childContext);
+ registry.loadComponentType(impl, childContext);
ComponentDefinition<Implementation<?>> componentDefinition =
new ComponentDefinition<Implementation<?>>(componentId, impl);
@@ -175,12 +174,10 @@
}
}
- protected Implementation<?> loadImplementation(Component parent,
- XMLStreamReader reader,
- DeploymentContext deploymentContext)
+ protected Implementation<?> loadImplementation(XMLStreamReader reader, DeploymentContext context)
throws XMLStreamException, LoaderException {
reader.nextTag();
- ModelObject o = registry.load(parent, null, reader, deploymentContext);
+ ModelObject o = registry.load(null, reader, context);
if (!(o instanceof Implementation)) {
throw new MissingImplementationException();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java Sat Feb 24 19:06:42 2007
@@ -28,7 +28,6 @@
import org.osoa.sca.annotations.Constructor;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -55,10 +54,10 @@
}
@SuppressWarnings("unchecked")
- public ComponentType load(Component parent,
- ModelObject object,
- XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ public ComponentType load(
+ ModelObject object,
+ XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
assert COMPONENT_TYPE.equals(reader.getName());
ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> componentType;
if (object != null) {
@@ -72,7 +71,7 @@
while (true) {
switch (reader.next()) {
case START_ELEMENT:
- ModelObject o = registry.load(parent, componentType, reader, deploymentContext);
+ ModelObject o = registry.load(componentType, reader, deploymentContext);
if (o instanceof ServiceDefinition) {
componentType.add((ServiceDefinition) o);
} else if (o instanceof ReferenceDefinition) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/DependencyLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/DependencyLoader.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/DependencyLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/DependencyLoader.java Sat Feb 24 19:06:42 2007
@@ -24,7 +24,6 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -57,10 +56,10 @@
return DEPENDENCY;
}
- public Dependency load(Component parent,
- ModelObject object,
- XMLStreamReader reader,
- DeploymentContext deploymentContext)
+ public Dependency load(
+ ModelObject object,
+ XMLStreamReader reader,
+ DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
Artifact artifact = new Artifact();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java Sat Feb 24 19:06:42 2007
@@ -29,7 +29,6 @@
import org.osoa.sca.annotations.Constructor;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -60,7 +59,7 @@
return INCLUDE;
}
- public Include load(Component parent, ModelObject object, XMLStreamReader reader,
+ public Include load(ModelObject object, XMLStreamReader reader,
DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
@@ -91,7 +90,7 @@
URI componentId = deploymentContext.getComponentId();
DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, url, componentId);
CompositeComponentType composite;
- composite = loadFromSidefile(parent, url, childContext);
+ composite = loadFromSidefile(url, childContext);
Include include = new Include();
include.setName(name);
@@ -100,10 +99,7 @@
return include;
}
- protected CompositeComponentType loadFromSidefile(Component parent,
- URL url,
- DeploymentContext deploymentContext)
- throws LoaderException {
- return registry.load(parent, null, url, CompositeComponentType.class, deploymentContext);
+ protected CompositeComponentType loadFromSidefile(URL url, DeploymentContext context) throws LoaderException {
+ return registry.load(null, url, CompositeComponentType.class, context);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java Sat Feb 24 19:06:42 2007
@@ -31,7 +31,6 @@
import org.osoa.sca.annotations.EagerInit;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.ComponentTypeLoader;
import org.apache.tuscany.spi.loader.InvalidConfigurationException;
@@ -71,24 +70,24 @@
loaders.remove(element);
}
- 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 {
QName name = reader.getName();
monitor.elementLoad(name);
StAXElementLoader<? extends ModelObject> loader = loaders.get(name);
if (loader == null) {
throw new UnrecognizedElementException(name);
}
- return loader.load(parent, object, reader, deploymentContext);
+ return loader.load(object, reader, deploymentContext);
}
- public <MO extends ModelObject> MO load(Component parent,
- ModelObject object,
- URL url,
- Class<MO> type,
- DeploymentContext ctx) throws LoaderException {
+ public <MO extends ModelObject> MO load(
+ ModelObject object,
+ URL url,
+ Class<MO> type,
+ DeploymentContext ctx) throws LoaderException {
try {
XMLStreamReader reader;
InputStream is;
@@ -99,7 +98,7 @@
try {
reader.nextTag();
QName name = reader.getName();
- ModelObject mo = load(parent, object, reader, ctx);
+ ModelObject mo = load(object, reader, ctx);
if (type.isInstance(mo)) {
return type.cast(mo);
} else {
@@ -144,8 +143,7 @@
}
@SuppressWarnings("unchecked")
- public <I extends Implementation<?>> void loadComponentType(Component parent,
- I implementation,
+ public <I extends Implementation<?>> void loadComponentType(I implementation,
DeploymentContext deploymentContext)
throws LoaderException {
Class<I> key = (Class<I>) implementation.getClass();
@@ -153,7 +151,7 @@
if (loader == null) {
throw new UnrecognizedComponentTypeException(key);
}
- loader.load(parent, implementation, deploymentContext);
+ loader.load(implementation, deploymentContext);
}
public static interface Monitor {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java Sat Feb 24 19:06:42 2007
@@ -30,7 +30,6 @@
import org.osoa.sca.annotations.Constructor;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -73,7 +72,7 @@
return POLICYSET;
}
- public PolicySet load(Component parent, ModelObject object, XMLStreamReader reader,
+ public PolicySet load(ModelObject object, XMLStreamReader reader,
DeploymentContext deploymentContext)
throws XMLStreamException {
assert POLICYSET.equals(reader.getName());
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java Sat Feb 24 19:06:42 2007
@@ -29,7 +29,6 @@
import org.osoa.sca.annotations.Constructor;
import org.w3c.dom.Document;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -69,7 +68,7 @@
return PROPERTY;
}
- public Property<?> load(Component parent, ModelObject object, XMLStreamReader reader,
+ public Property<?> load(ModelObject object, XMLStreamReader reader,
DeploymentContext ctx)
throws XMLStreamException, LoaderException {
assert PROPERTY.equals(reader.getName());
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 Sat Feb 24 19:06:42 2007
@@ -28,7 +28,6 @@
import org.osoa.sca.annotations.Constructor;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -58,9 +57,9 @@
return REFERENCE;
}
- public ReferenceDefinition load(Component parent,
- ModelObject object, XMLStreamReader reader,
- DeploymentContext deploymentContext)
+ public ReferenceDefinition load(
+ ModelObject object, XMLStreamReader reader,
+ DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
assert REFERENCE.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
@@ -72,7 +71,7 @@
while (true) {
switch (reader.next()) {
case START_ELEMENT:
- ModelObject o = registry.load(parent, null, reader, deploymentContext);
+ ModelObject o = registry.load(null, reader, deploymentContext);
if (o instanceof ServiceContract) {
referenceDefinition.setServiceContract((ServiceContract) o);
} else if (o instanceof BindingDefinition) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Sat Feb 24 19:06:42 2007
@@ -30,7 +30,6 @@
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -59,10 +58,10 @@
return SERVICE;
}
- public ServiceDefinition load(Component parent,
- ModelObject object,
- XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ public ServiceDefinition load(
+ ModelObject object,
+ XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
assert SERVICE.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
URI targetUri = null;
@@ -82,7 +81,7 @@
QualifiedName qName = new QualifiedName(target);
targetUri = componentBase.resolve(qName.getFragment());
} else {
- ModelObject o = registry.load(parent, null, reader, deploymentContext);
+ ModelObject o = registry.load(null, reader, deploymentContext);
if (o instanceof ServiceContract) {
def.setServiceContract((ServiceContract) o);
} else if (o instanceof BindingDefinition) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java Sat Feb 24 19:06:42 2007
@@ -31,7 +31,6 @@
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.InvalidWireException;
@@ -59,10 +58,10 @@
return WIRE;
}
- public WireDefinition load(Component parent,
- ModelObject object,
- XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ public WireDefinition load(
+ ModelObject object,
+ XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
assert WIRE.equals(reader.getName());
WireDefinition wireDefn;
URI sourceURI = null;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/XMLChangeSetHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/XMLChangeSetHandler.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/XMLChangeSetHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/XMLChangeSetHandler.java Sat Feb 24 19:06:42 2007
@@ -103,8 +103,8 @@
DeploymentContext deploymentContext = new RootDeploymentContext(null, null, null, xmlFactory, null);
try {
ComponentDefinition<?> componentDefinition =
- (ComponentDefinition<?>) loader.load(null, null, xmlReader, deploymentContext);
- builder.build(null, componentDefinition, deploymentContext);
+ (ComponentDefinition<?>) loader.load(null, xmlReader, deploymentContext);
+ builder.build(componentDefinition, deploymentContext);
} catch (LoaderException e) {
// FIXME throw something appropriate
throw new AssertionError("FIXME");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalBindingBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalBindingBuilderTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalBindingBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalBindingBuilderTestCase.java Sat Feb 24 19:06:42 2007
@@ -34,7 +34,7 @@
LocalBindingBuilder builder = new LocalBindingBuilder();
ServiceDefinition def = new ServiceDefinition();
def.setUri(new URI("#foo"));
- ServiceBinding binding = builder.build(null, def, null, null);
+ ServiceBinding binding = builder.build(def, null, null);
assertEquals(LocalServiceBinding.class, binding.getClass());
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalBindingLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalBindingLoaderTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalBindingLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalBindingLoaderTestCase.java Sat Feb 24 19:06:42 2007
@@ -36,7 +36,7 @@
XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);
EasyMock.expect(reader.getAttributeValue(null, "uri")).andReturn("foo");
EasyMock.replay(reader);
- LocalBindingDefinition definition = loader.load(null, null, reader, null);
+ LocalBindingDefinition definition = loader.load(null, reader, null);
assertEquals(new URI("foo"), definition.getTargetUri());
EasyMock.verify(reader);
}
@@ -45,7 +45,7 @@
XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);
EasyMock.expect(reader.getAttributeValue(null, "uri")).andReturn(null);
EasyMock.replay(reader);
- LocalBindingDefinition definition = loader.load(null, null, reader, null);
+ LocalBindingDefinition definition = loader.load(null, reader, null);
assertNull(definition.getTargetUri());
EasyMock.verify(reader);
}
@@ -55,7 +55,7 @@
EasyMock.expect(reader.getAttributeValue(null, "uri")).andReturn("foo foo");
EasyMock.replay(reader);
try {
- loader.load(null, null, reader, null);
+ loader.load(null, reader, null);
fail();
} catch (LoaderException e) {
// expected
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 Sat Feb 24 19:06:42 2007
@@ -54,7 +54,7 @@
EasyMock.replay(deploymentContext);
EasyMock.replay(parent);
- Service service = registry.build(parent, definition, deploymentContext);
+ Service service = registry.build(definition, deploymentContext);
assertEquals(1, service.getServiceBindings().size());
assertTrue(service.getServiceBindings().get(0) instanceof LocalServiceBinding);
@@ -69,7 +69,7 @@
EasyMock.replay(deploymentContext);
EasyMock.replay(parent);
- Reference reference = registry.build(parent, definition, deploymentContext);
+ Reference reference = registry.build(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=511417&r1=511416&r2=511417
==============================================================================
--- 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 Sat Feb 24 19:06:42 2007
@@ -81,13 +81,13 @@
EasyMock.replay(components);
ComponentBuilder builder = EasyMock.createMock(ComponentBuilder.class);
- EasyMock.expect(builder.build(parent, componentDefinition, deploymentContext)).andReturn(component);
+ EasyMock.expect(builder.build(componentDefinition, deploymentContext)).andReturn(component);
EasyMock.replay(builder);
BuilderRegistry registry = new BuilderRegistryImpl(null);
registry.register(CompositeImplementation.class, builder);
- assertSame(component, registry.build(parent, componentDefinition, deploymentContext));
+ assertSame(component, registry.build(componentDefinition, deploymentContext));
EasyMock.verify(builder);
}
@@ -97,7 +97,7 @@
ServiceBinding binding = EasyMock.createNiceMock(ServiceBinding.class);
EasyMock.replay(binding);
BindingBuilder<MockBindingDefinition> builder = EasyMock.createMock(BindingBuilder.class);
- EasyMock.expect(builder.build(EasyMock.isA(Component.class),
+ EasyMock.expect(builder.build(
EasyMock.isA(ServiceDefinition.class),
EasyMock.isA(MockBindingDefinition.class),
EasyMock.isA(DeploymentContext.class))).andReturn(binding).times(2);
@@ -107,7 +107,7 @@
definition.addBinding(new MockBindingDefinition());
definition.addBinding(new MockBindingDefinition());
definition.setTarget(new URI("foo"));
- Service service = registry.build(parent, definition, deploymentContext);
+ Service service = registry.build(definition, deploymentContext);
assertEquals(2, service.getServiceBindings().size());
}
@@ -117,7 +117,7 @@
ReferenceBinding binding = EasyMock.createNiceMock(ReferenceBinding.class);
EasyMock.replay(binding);
BindingBuilder<MockBindingDefinition> builder = EasyMock.createMock(BindingBuilder.class);
- EasyMock.expect(builder.build(EasyMock.isA(Component.class),
+ EasyMock.expect(builder.build(
EasyMock.isA(ReferenceDefinition.class),
EasyMock.isA(MockBindingDefinition.class),
EasyMock.isA(DeploymentContext.class))).andReturn(binding).times(2);
@@ -126,7 +126,7 @@
ReferenceDefinition definition = new ReferenceDefinition(URI.create("#foo"), null, ONE_ONE);
definition.addBinding(new MockBindingDefinition());
definition.addBinding(new MockBindingDefinition());
- Reference reference = registry.build(parent, definition, deploymentContext);
+ Reference reference = registry.build(definition, deploymentContext);
assertEquals(2, reference.getReferenceBindings().size());
}
@@ -141,7 +141,7 @@
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
ComponentBuilder<FooImplementation> builder = EasyMock.createMock(ComponentBuilder.class);
- EasyMock.expect(builder.build(EasyMock.isA(Component.class),
+ EasyMock.expect(builder.build(
EasyMock.isA(ComponentDefinition.class),
EasyMock.isA(DeploymentContext.class))).andReturn(component);
EasyMock.replay(builder);
@@ -154,13 +154,14 @@
URI uri = URI.create("foo");
ComponentDefinition<FooImplementation> definition = new ComponentDefinition<FooImplementation>(uri, impl);
try {
- registry.build(parent, definition, deploymentContext);
+ registry.build(definition, deploymentContext);
fail("Should throw NoConversationalContractException");
} catch (NoConversationalContractException e) {
// expected
}
}
+ @SuppressWarnings({"unchecked"})
protected void setUp() throws Exception {
super.setUp();
deploymentContext = EasyMock.createMock(DeploymentContext.class);
@@ -170,9 +171,9 @@
}
private class MockBuilder implements ComponentBuilder<CompositeImplementation> {
- public Component build(Component parent,
- ComponentDefinition componentDefinition,
- DeploymentContext deploymentContext) throws BuilderConfigException {
+ public Component build(
+ ComponentDefinition componentDefinition,
+ DeploymentContext deploymentContext) throws BuilderConfigException {
return null;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingLoaderTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingLoaderTestCase.java Sat Feb 24 19:06:42 2007
@@ -54,7 +54,7 @@
EasyMock.expect(reader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.replay(reader);
- ModelObject mo = new DataTypeLoader(null).load(null, null, reader, null);
+ ModelObject mo = new DataTypeLoader(null).load(null, reader, null);
Assert.assertTrue(mo instanceof DataType);
Assert.assertEquals("ABC", ((DataType<?>)mo).getDataBinding());
EasyMock.verify(reader);
@@ -68,7 +68,7 @@
EasyMock.expect(reader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.replay(reader);
try {
- mo = new DataTypeLoader(null).load(null, null, reader, null);
+ mo = new DataTypeLoader(null).load(null, reader, null);
Assert.fail("InvalidValueException should have been thrown");
} catch (InvalidValueException e) {
Assert.assertTrue(true);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/IntrospectionRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/IntrospectionRegistryTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/IntrospectionRegistryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/IntrospectionRegistryTestCase.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;
import org.apache.tuscany.spi.implementation.java.ImplementationProcessor;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
@@ -59,27 +58,27 @@
public void testWalk() throws Exception {
IntrospectionRegistryImpl registry = new IntrospectionRegistryImpl(monitor);
ImplementationProcessor processor = EasyMock.createMock(ImplementationProcessor.class);
- processor.visitClass(EasyMock.isA(Component.class),
+ processor.visitClass(
EasyMock.eq(Bar.class),
EasyMock.isA(PojoComponentType.class),
EasyMock.isA(DeploymentContext.class));
- processor.visitConstructor(EasyMock.isA(Component.class),
+ processor.visitConstructor(
EasyMock.isA(Constructor.class),
EasyMock.isA(PojoComponentType.class),
EasyMock.isA(DeploymentContext.class));
- processor.visitMethod(EasyMock.isA(Component.class),
+ processor.visitMethod(
EasyMock.isA(Method.class),
EasyMock.isA(PojoComponentType.class),
EasyMock.isA(DeploymentContext.class));
- processor.visitField(EasyMock.isA(Component.class),
+ processor.visitField(
EasyMock.isA(Field.class),
EasyMock.isA(PojoComponentType.class),
EasyMock.isA(DeploymentContext.class));
- processor.visitSuperClass(EasyMock.isA(Component.class),
+ processor.visitSuperClass(
EasyMock.isA(Class.class),
EasyMock.isA(PojoComponentType.class),
EasyMock.isA(DeploymentContext.class));
- processor.visitEnd(EasyMock.isA(Component.class),
+ processor.visitEnd(
EasyMock.isA(Class.class),
EasyMock.isA(PojoComponentType.class),
EasyMock.isA(DeploymentContext.class));
@@ -92,7 +91,7 @@
// mock.expects(once()).method("visitEnd");
EasyMock.replay(processor);
registry.registerProcessor(processor);
- registry.introspect(EasyMock.createNiceMock(Component.class),
+ registry.introspect(
Bar.class,
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>(),
EasyMock.createNiceMock(DeploymentContext.class));
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=511417&r1=511416&r2=511417
==============================================================================
--- 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 Sat Feb 24 19:06:42 2007
@@ -79,7 +79,7 @@
builder.setBuilderRegistry(builderRegistry);
Component component =
- builder.build(null, createTopComponentDef(), deploymentContext);
+ builder.build(createTopComponentDef(), deploymentContext);
Map<URI, Component> components = deploymentContext.getComponents();
Component sourceComponent = components.get(SOURCE_COMPONENT);
assertNotNull(sourceComponent.getService("InnerSourceService"));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.java Sat Feb 24 19:06:42 2007
@@ -68,7 +68,7 @@
replay(context);
replay(artifactRepository);
- CompositeImplementation impl = loader.load(null, null, reader, context);
+ CompositeImplementation impl = loader.load(null, reader, context);
verify(reader);
verify(context);
verify(artifactRepository);
@@ -94,7 +94,7 @@
artifactRepository.resolve(artifactMatcher(url, "com.example", name, "1.0"));
replay(artifactRepository);
- CompositeImplementation impl = loader.load(null, null, reader, context);
+ CompositeImplementation impl = loader.load(null, reader, context);
verify(reader);
verify(context);
verify(artifactRepository);
@@ -120,7 +120,7 @@
replay(context);
replay(artifactRepository);
- CompositeImplementation impl = loader.load(null, null, reader, context);
+ CompositeImplementation impl = loader.load(null, reader, context);
verify(reader);
verify(context);
verify(artifactRepository);
@@ -145,7 +145,7 @@
replay(context);
replay(artifactRepository);
- CompositeImplementation impl = loader.load(null, null, reader, context);
+ CompositeImplementation impl = loader.load(null, reader, context);
verify(reader);
verify(context);
verify(artifactRepository);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemComponentBuilderTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/SystemComponentBuilderTestCase.java Sat Feb 24 19:06:42 2007
@@ -72,7 +72,7 @@
impl.setImplementationClass(FooImpl.class);
ComponentDefinition<SystemImplementation> definition = new ComponentDefinition<SystemImplementation>(impl);
definition.setUri(URI.create("component"));
- AtomicComponent component = builder.build(parent, definition, deploymentContext);
+ AtomicComponent component = builder.build(definition, deploymentContext);
component.setScopeContainer(container);
component.start();
container.onEvent(new ComponentStart(this, null));
@@ -113,7 +113,7 @@
propVal.setName("prop");
propVal.setValueFactory(new SingletonObjectFactory<String>("value"));
definition.add(propVal);
- AtomicComponent component = builder.build(parent, definition, deploymentContext);
+ AtomicComponent component = builder.build(definition, deploymentContext);
component.setScopeContainer(container);
component.start();
FooImpl foo = (FooImpl) component.getTargetInstance();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java Sat Feb 24 19:06:42 2007
@@ -67,7 +67,7 @@
definition.setUri(URI.create("component"));
PropertyValue propertyValue = new PropertyValue(property.getName(), property.getDefaultValueFactory());
definition.getPropertyValues().put(property.getName(), propertyValue);
- AtomicComponent component = builder.build(parent, definition, deploymentContext);
+ AtomicComponent component = builder.build(definition, deploymentContext);
JavaBuilderPropertyTestCase.Foo foo = (JavaBuilderPropertyTestCase.Foo) component.createInstance();
assertEquals("foo", foo.getTest());
}
@@ -90,7 +90,7 @@
ObjectFactory<Integer> defaultValueFactory = property.getDefaultValueFactory();
PropertyValue<Integer> propertyValue = new PropertyValue<Integer>(property.getName(), defaultValueFactory);
definition.getPropertyValues().put(property.getName(), propertyValue);
- AtomicComponent component = builder.build(parent, definition, deploymentContext);
+ AtomicComponent component = builder.build(definition, deploymentContext);
FooInt foo = (FooInt) component.createInstance();
assertEquals(1, foo.getTest());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java Sat Feb 24 19:06:42 2007
@@ -64,7 +64,7 @@
URI uri = URI.create("foo");
ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(uri, impl);
Component parent = EasyMock.createMock(Component.class);
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, null);
+ JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, null);
Foo foo = (Foo) component.createInstance();
assertEquals("convID", foo.conversationID);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java Sat Feb 24 19:06:42 2007
@@ -40,34 +40,34 @@
public void testInitLevel() throws Exception {
type.setInitLevel(1);
JavaComponentBuilder builder = new JavaComponentBuilder();
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, deploymentContext);
+ JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, deploymentContext);
assertEquals(1, component.getInitLevel());
}
public void testMaxAge() throws Exception {
type.setMaxAge(100);
JavaComponentBuilder builder = new JavaComponentBuilder();
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, deploymentContext);
+ JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, deploymentContext);
assertEquals(100, component.getMaxAge());
}
public void testMaxIdleTime() throws Exception {
type.setMaxIdleTime(100);
JavaComponentBuilder builder = new JavaComponentBuilder();
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, deploymentContext);
+ JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, deploymentContext);
assertEquals(100, component.getMaxIdleTime());
}
public void testNoMaxAgeNoMaxIdleTime() throws Exception {
JavaComponentBuilder builder = new JavaComponentBuilder();
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, deploymentContext);
+ JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, deploymentContext);
assertEquals(-1, component.getMaxAge());
assertEquals(-1, component.getMaxIdleTime());
}
public void testScope() throws Exception {
JavaComponentBuilder builder = new JavaComponentBuilder();
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, deploymentContext);
+ JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, deploymentContext);
component.setScopeContainer(scopeContainer);
assertEquals(Scope.COMPOSITE, component.getScope());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java Sat Feb 24 19:06:42 2007
@@ -81,7 +81,7 @@
definition.setUri(URI.create("component"));
JavaComponentBuilder builder = new JavaComponentBuilder();
builder.setProxyService(proxyService);
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, deploymentContext);
+ JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, deploymentContext);
component.setScopeContainer(scopeContainer);
component.attachWire(wire);
deploymentContext.getCompositeScope().start();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java Sat Feb 24 19:06:42 2007
@@ -66,7 +66,7 @@
Component parent = EasyMock.createMock(Component.class);
EasyMock.replay(parent);
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, null);
+ JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, null);
Foo foo = (Foo) component.createInstance();
assertEquals("result", foo.resource);
EasyMock.verify(parent);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoaderTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoaderTestCase.java Sat Feb 24 19:06:42 2007
@@ -20,7 +20,6 @@
import java.net.URL;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.IntrospectionRegistry;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
@@ -39,7 +38,6 @@
public void testPojoComponentTypeCreatedForIntrospection() throws Exception {
IntrospectionRegistry registry = EasyMock.createMock(IntrospectionRegistry.class);
registry.introspect(
- (Component) EasyMock.isNull(),
(Class) EasyMock.isNull(),
EasyMock.isA(PojoComponentType.class),
(DeploymentContext) EasyMock.isNull());
@@ -50,7 +48,7 @@
});
EasyMock.replay(registry);
JavaComponentTypeLoader loader = new JavaComponentTypeLoader(null, registry);
- loader.loadByIntrospection(null, new JavaImplementation(), null);
+ loader.loadByIntrospection(new JavaImplementation(), null);
EasyMock.verify(registry);
}
@@ -58,19 +56,18 @@
public void testPojoComponentTypeCreatedForSideFileLoadAndReturned() throws Exception {
LoaderRegistry registry = EasyMock.createMock(LoaderRegistry.class);
registry.load(
- (Component) EasyMock.isNull(),
EasyMock.isA(PojoComponentType.class),
(URL) EasyMock.isNull(),
EasyMock.eq(PojoComponentType.class),
(DeploymentContext) EasyMock.isNull());
EasyMock.expectLastCall().andStubAnswer(new IAnswer() {
public Object answer() throws Throwable {
- return EasyMock.getCurrentArguments()[1];
+ return EasyMock.getCurrentArguments()[0];
}
});
EasyMock.replay(registry);
JavaComponentTypeLoader loader = new JavaComponentTypeLoader(registry, null);
- assertEquals(PojoComponentType.class, loader.loadFromSidefile(null, null, null).getClass());
+ assertEquals(PojoComponentType.class, loader.loadFromSidefile(null, null).getClass());
EasyMock.verify(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java Sat Feb 24 19:06:42 2007
@@ -80,12 +80,12 @@
*/
public void testComponentToComponentCallback() throws Exception {
ComponentDefinition<JavaImplementation> targetDefinition = createTarget();
- JavaAtomicComponent targetComponent = (JavaAtomicComponent) builder.build(null, targetDefinition, context);
+ JavaAtomicComponent targetComponent = (JavaAtomicComponent) builder.build(targetDefinition, context);
targetComponent.setScopeContainer(container);
container.register(targetComponent);
componentManager.register(targetComponent);
ComponentDefinition<JavaImplementation> sourceDefinition = createSource(URI.create("fooClient"));
- JavaAtomicComponent clientComponent = (JavaAtomicComponent) builder.build(null, sourceDefinition, context);
+ JavaAtomicComponent clientComponent = (JavaAtomicComponent) builder.build(sourceDefinition, context);
clientComponent.setScopeContainer(container);
container.register(clientComponent);
componentManager.register(clientComponent);
@@ -113,18 +113,18 @@
public void testTwoSourceComponentToComponentCallback() throws Exception {
ComponentDefinition<JavaImplementation> targetDefinition = createTarget();
JavaAtomicComponent targetComponent =
- (JavaAtomicComponent) builder.build(null, targetDefinition, context);
+ (JavaAtomicComponent) builder.build(targetDefinition, context);
targetComponent.setScopeContainer(container);
container.register(targetComponent);
componentManager.register(targetComponent);
ComponentDefinition<JavaImplementation> sourceDefinition1 = createSource(URI.create("client1"));
ComponentDefinition<JavaImplementation> sourceDefinition2 = createSource(URI.create("client2"));
- JavaAtomicComponent clientComponent1 = (JavaAtomicComponent) builder.build(null, sourceDefinition1, context);
+ JavaAtomicComponent clientComponent1 = (JavaAtomicComponent) builder.build(sourceDefinition1, context);
clientComponent1.setScopeContainer(container);
container.register(clientComponent1);
componentManager.register(clientComponent1);
- JavaAtomicComponent clientComponent2 = (JavaAtomicComponent) builder.build(null, sourceDefinition2, context);
+ JavaAtomicComponent clientComponent2 = (JavaAtomicComponent) builder.build(sourceDefinition2, context);
clientComponent2.setScopeContainer(container);
container.register(clientComponent2);
componentManager.register(clientComponent2);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/AllowsPassByReferenceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/AllowsPassByReferenceProcessorTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/AllowsPassByReferenceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/AllowsPassByReferenceProcessorTestCase.java Sat Feb 24 19:06:42 2007
@@ -36,10 +36,10 @@
AllowsPassByReferenceProcessor processor;
public void testClassAnnotation() throws Exception {
- processor.visitClass(null, Foo.class, type, null);
+ processor.visitClass(Foo.class, type, null);
assertEquals(true, type.isAllowsPassByReference());
- processor.visitClass(null, Bar.class, type, null);
+ processor.visitClass(Bar.class, type, null);
assertEquals(false, type.isAllowsPassByReference());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorAutowireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorAutowireTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorAutowireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorAutowireTestCase.java Sat Feb 24 19:06:42 2007
@@ -44,7 +44,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo> ctor = Foo.class.getConstructor(Bar.class);
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
assertNotNull(type.getReferences().get("myRef"));
}
@@ -52,7 +52,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo> ctor = Foo.class.getConstructor(Bar.class, Bar.class);
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
assertEquals(2, type.getConstructorDefinition().getInjectionNames().size());
assertNotNull(type.getReferences().get("myRef1"));
assertNotNull(type.getReferences().get("myRef2"));
@@ -62,7 +62,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo2> ctor = Foo2.class.getConstructor(Bar.class);
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
assertNotNull(type.getReferences().get(Bar.class.getName() + "0"));
}
@@ -71,7 +71,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<BadFoo> ctor = BadFoo.class.getConstructor(Bar.class, Bar.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (InvalidAutowireException e) {
// expected
@@ -83,7 +83,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<BadFoo> ctor = BadFoo.class.getConstructor(List.class, List.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (InvalidConstructorException e) {
// expected
@@ -97,7 +97,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo3> ctor = Foo3.class.getConstructor(String.class, String.class);
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
assertEquals(1, type.getProperties().size());
assertNotNull(type.getProperties().get("prop1"));
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorExtensibilityTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorExtensibilityTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorExtensibilityTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorExtensibilityTestCase.java Sat Feb 24 19:06:42 2007
@@ -44,7 +44,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo> ctor1 = Foo.class.getConstructor(String.class, String.class);
- processor.visitConstructor(null, ctor1, type, null);
+ processor.visitConstructor(ctor1, type, null);
assertEquals("foo", type.getConstructorDefinition().getInjectionNames().get(0));
}
@@ -62,7 +62,7 @@
definition.getInjectionNames().add("");
definition.getInjectionNames().add("mybar");
type.setConstructorDefinition(definition);
- processor.visitConstructor(null, ctor1, type, null);
+ processor.visitConstructor(ctor1, type, null);
assertEquals("foo", type.getConstructorDefinition().getInjectionNames().get(0));
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorTestCase.java Sat Feb 24 19:06:42 2007
@@ -47,7 +47,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
try {
- processor.visitClass(null, BadFoo.class, type, null);
+ processor.visitClass(BadFoo.class, type, null);
fail();
} catch (DuplicateConstructorException e) {
// expected
@@ -58,7 +58,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo> ctor1 = Foo.class.getConstructor(String.class);
- processor.visitConstructor(null, ctor1, type, null);
+ processor.visitConstructor(ctor1, type, null);
assertEquals("foo", type.getConstructorDefinition().getInjectionNames().get(0));
}
@@ -66,7 +66,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<NoAnnotation> ctor1 = NoAnnotation.class.getConstructor();
- processor.visitConstructor(null, ctor1, type, null);
+ processor.visitConstructor(ctor1, type, null);
assertNull(type.getConstructorDefinition());
}
@@ -75,7 +75,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<BadAnnotation> ctor1 = BadAnnotation.class.getConstructor(String.class, Foo.class);
try {
- processor.visitConstructor(null, ctor1, type, null);
+ processor.visitConstructor(ctor1, type, null);
fail();
} catch (InvalidConstructorException e) {
// expected
@@ -86,7 +86,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Mixed> ctor1 = Mixed.class.getConstructor(String.class, String.class, String.class);
- processor.visitConstructor(null, ctor1, type, null);
+ processor.visitConstructor(ctor1, type, null);
assertEquals("java.lang.String0", type.getConstructorDefinition().getInjectionNames().get(0));
assertEquals("foo", type.getConstructorDefinition().getInjectionNames().get(1));
assertEquals("bar", type.getConstructorDefinition().getInjectionNames().get(2));
@@ -97,7 +97,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<AllAutowireNoName> ctor1 =
AllAutowireNoName.class.getConstructor(String.class, String.class, String.class);
- processor.visitConstructor(null, ctor1, type, null);
+ processor.visitConstructor(ctor1, type, null);
assertEquals("java.lang.String0", type.getConstructorDefinition().getInjectionNames().get(0));
assertEquals("java.lang.String1", type.getConstructorDefinition().getInjectionNames().get(1));
assertEquals("java.lang.String2", type.getConstructorDefinition().getInjectionNames().get(2));
@@ -164,7 +164,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Multiple> ctor1 =
Multiple.class.getConstructor(Collection.class, String[].class, List.class, Set.class, String[].class);
- processor.visitConstructor(null, ctor1, type, null);
+ processor.visitConstructor(ctor1, type, null);
JavaMappedReference ref0 = type.getReferences().get("java.util.Collection0");
assertNotNull(ref0);
assertEquals(Multiplicity.ONE_N, ref0.getMultiplicity());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorPropertyTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorPropertyTestCase.java Sat Feb 24 19:06:42 2007
@@ -45,7 +45,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo> ctor = Foo.class.getConstructor(String.class);
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
JavaMappedProperty<?> property = type.getProperties().get("myProp");
//assertTrue(property.isRequired());
assertEquals(property.getOverride(), OverrideOptions.MAY);
@@ -56,7 +56,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo> ctor = Foo.class.getConstructor(String.class, String.class);
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
assertNotNull(type.getProperties().get("myProp1"));
assertNotNull(type.getProperties().get("myProp2"));
}
@@ -66,7 +66,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<BadFoo> ctor = BadFoo.class.getConstructor(String.class, String.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (DuplicatePropertyException e) {
// expected
@@ -78,7 +78,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<BadFoo> ctor = BadFoo.class.getConstructor(String.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (InvalidPropertyException e) {
// expected
@@ -89,7 +89,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo> ctor = Foo.class.getConstructor(Integer.class);
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
assertNotNull(type.getProperties().get("myProp"));
}
@@ -98,7 +98,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<BadFoo> ctor = BadFoo.class.getConstructor(Integer.class, Integer.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (InvalidPropertyException e) {
// expected
@@ -110,7 +110,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<BadFoo> ctor = BadFoo.class.getConstructor(List.class, List.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (InvalidConstructorException e) {
// expected
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java Sat Feb 24 19:06:42 2007
@@ -41,7 +41,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo> ctor = Foo.class.getConstructor(String.class);
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
JavaMappedReference reference = type.getReferences().get("myRef");
assertTrue(reference.isRequired());
assertEquals("#myRef", reference.getUri().toString());
@@ -51,7 +51,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo> ctor = Foo.class.getConstructor(String.class, String.class);
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
assertNotNull(type.getReferences().get("myRef1"));
assertNotNull(type.getReferences().get("myRef2"));
}
@@ -61,7 +61,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<BadFoo> ctor = BadFoo.class.getConstructor(String.class, String.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (DuplicateReferenceException e) {
// expected
@@ -73,7 +73,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<BadFoo> ctor = BadFoo.class.getConstructor(String.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (InvalidReferenceException e) {
// expected
@@ -84,7 +84,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo> ctor = Foo.class.getConstructor(Integer.class);
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
assertNotNull(type.getReferences().get("myRef"));
}
@@ -93,7 +93,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<BadFoo> ctor = BadFoo.class.getConstructor(Integer.class, Integer.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (InvalidReferenceException e) {
// expected
@@ -105,7 +105,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<BadFoo> ctor = BadFoo.class.getConstructor(List.class, List.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (InvalidConstructorException e) {
// expected
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java?view=diff&rev=511417&r1=511416&r2=511417
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java Sat Feb 24 19:06:42 2007
@@ -43,7 +43,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo> ctor = Foo.class.getConstructor(String.class);
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
org.apache.tuscany.spi.implementation.java.Resource resource = type.getResources().get("myResource");
assertFalse(resource.isOptional());
}
@@ -52,7 +52,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo> ctor = Foo.class.getConstructor(String.class, String.class);
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
assertNotNull(type.getResources().get("myResource1"));
assertNotNull(type.getResources().get("myResource2"));
}
@@ -62,7 +62,7 @@
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<BadFoo> ctor = BadFoo.class.getConstructor(String.class, String.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (DuplicateResourceException e) {
// expected
@@ -75,7 +75,7 @@
Constructor<ConstructorResourceTestCase.BadFoo> ctor =
ConstructorResourceTestCase.BadFoo.class.getConstructor(String.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (InvalidResourceException e) {
// expected
@@ -86,7 +86,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
Constructor<Foo> ctor = Foo.class.getConstructor(Integer.class);
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
assertNotNull(type.getResources().get("myResource"));
}
@@ -96,7 +96,7 @@
Constructor<ConstructorResourceTestCase.BadFoo> ctor =
ConstructorResourceTestCase.BadFoo.class.getConstructor(Integer.class, Integer.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (InvalidResourceException e) {
// expected
@@ -109,7 +109,7 @@
Constructor<ConstructorResourceTestCase.BadFoo> ctor =
ConstructorResourceTestCase.BadFoo.class.getConstructor(List.class, List.class);
try {
- processor.visitConstructor(null, ctor, type, null);
+ processor.visitConstructor(ctor, type, null);
fail();
} catch (InvalidConstructorException e) {
// expected
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org