You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/05/23 22:10:21 UTC
svn commit: r408998 - in /incubator/tuscany/sandbox/jboynes/sca:
containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/
containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/
core2/src/main/java/o...
Author: jboynes
Date: Tue May 23 13:10:20 2006
New Revision: 408998
URL: http://svn.apache.org/viewvc?rev=408998&view=rev
Log:
add deployer service and impl to bootstrap composite
Modified:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentBuilderTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/model/SystemImplementation.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemSourceWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/system/WireServiceImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundService.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaServiceContract.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceContract.java
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java Tue May 23 13:10:20 2006
@@ -32,7 +32,7 @@
List<Class<?>> serviceInterfaces = new ArrayList<Class<?>>();
for (Service service : componentType.getServices().values()) {
- serviceInterfaces.add(((JavaServiceContract) service.getServiceContract()).getInterfaceClass());
+ serviceInterfaces.add(service.getServiceContract().getInterfaceClass());
}
Constructor<?> constr;
try {
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentBuilderTestCase.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentBuilderTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentBuilderTestCase.java Tue May 23 13:10:20 2006
@@ -45,7 +45,7 @@
sourceType.addReferenceMember("target", SourceImpl.class.getMethod("setTarget", Target.class));
ServiceContract sourceContract = new JavaServiceContract();
- sourceContract.setInterfaze(Source.class);
+ sourceContract.setInterfaceClass(Source.class);
Service sourceService = new Service();
sourceService.setName("Source");
sourceService.setServiceContract(sourceContract);
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Tue May 23 13:10:20 2006
@@ -20,16 +20,23 @@
import org.apache.tuscany.core.builder.BuilderRegistryImpl;
import org.apache.tuscany.core.system.builder.SystemCompositeBuilder;
-import org.apache.tuscany.core.system.model.SystemCompositeImplementation;
+import org.apache.tuscany.core.system.builder.SystemBindingBuilder;
+import org.apache.tuscany.core.system.builder.SystemComponentBuilder;
import org.apache.tuscany.core.system.model.SystemBinding;
+import org.apache.tuscany.core.system.model.SystemCompositeImplementation;
+import org.apache.tuscany.core.system.model.SystemImplementation;
+import org.apache.tuscany.core.wire.jdk.JDKWireFactoryService;
+import org.apache.tuscany.core.wire.system.WireServiceImpl;
+import org.apache.tuscany.core.deployer.DeployerImpl;
import org.apache.tuscany.spi.builder.BuilderRegistry;
import org.apache.tuscany.spi.context.CompositeContext;
import org.apache.tuscany.spi.context.Context;
import org.apache.tuscany.spi.deployer.Deployer;
-import org.apache.tuscany.spi.model.CompositeComponentType;
-import org.apache.tuscany.spi.model.Component;
import org.apache.tuscany.spi.model.BoundService;
+import org.apache.tuscany.spi.model.Component;
+import org.apache.tuscany.spi.model.CompositeComponentType;
import org.apache.tuscany.spi.model.JavaServiceContract;
+import org.apache.tuscany.spi.wire.WireService;
/**
* @version $Rev$ $Date$
@@ -46,8 +53,11 @@
}
public static BuilderRegistry getDefaultBuilderRegistry() {
- BuilderRegistry builderRegistry = new BuilderRegistryImpl();
- builderRegistry.register(SystemCompositeImplementation.class, new SystemCompositeBuilder());
+ WireService wireService = new WireServiceImpl(new JDKWireFactoryService());
+ BuilderRegistry builderRegistry = new BuilderRegistryImpl(wireService, null);
+ builderRegistry.register(SystemCompositeImplementation.class, new SystemCompositeBuilder(builderRegistry));
+ builderRegistry.register(SystemImplementation.class, new SystemComponentBuilder());
+ builderRegistry.register(SystemBinding.class, new SystemBindingBuilder());
return builderRegistry;
}
@@ -55,7 +65,8 @@
CompositeComponentType composite = new CompositeComponentType();
SystemCompositeImplementation impl = new SystemCompositeImplementation(composite);
Component<SystemCompositeImplementation> deployerComposite = new Component<SystemCompositeImplementation>(name, impl);
-// composite.add(new BoundService<SystemBinding>("deployer", new JavaServiceContract(Deployer.class), URI.create("deployerImpl")));
+ composite.add(new BoundService<SystemBinding>("deployer", new JavaServiceContract(Deployer.class), new SystemBinding(), URI.create("deployerImpl")));
+ composite.add(new Component<SystemImplementation>("deployerImpl", new SystemImplementation(DeployerImpl.class)));
return builderRegistry.build(parent, deployerComposite);
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java Tue May 23 13:10:20 2006
@@ -20,7 +20,7 @@
public class SystemBindingBuilder implements BindingBuilder<SystemBinding> {
public Context build(CompositeContext parent, BoundService<SystemBinding> boundService) {
- Class<?> interfaze = boundService.getServiceContract().getInterface();
+ Class<?> interfaze = boundService.getServiceContract().getInterfaceClass();
QualifiedName targetName = new QualifiedName(boundService.getTarget().getPath());
SystemSourceWire<?> wire = new SystemSourceWire(boundService.getName(), targetName, interfaze);
return new SystemServiceContextImpl(boundService.getName(), wire, parent);
@@ -29,7 +29,7 @@
public Context build(CompositeContext parent, BoundReference<SystemBinding> boundReference) {
assert(parent.getParent() instanceof AutowireContext):"Grandparent not an instance of "+AutowireContext.class.getName();
AutowireContext autowireContext = (AutowireContext)parent.getParent();
- Class<?> interfaze = boundReference.getServiceContract().getInterface();
+ Class<?> interfaze = boundReference.getServiceContract().getInterfaceClass();
SystemReferenceContextImpl ctx = new SystemReferenceContextImpl(boundReference.getName(), interfaze, parent);
TargetWire<?> wire = new SystemTargetAutowire(interfaze, autowireContext);
ctx.setTargetWire(wire);
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java Tue May 23 13:10:20 2006
@@ -40,7 +40,7 @@
PojoComponentType componentType = component.getImplementation().getComponentType();
List<Class<?>> serviceInterfaces = new ArrayList<Class<?>>();
for (Service service : componentType.getServices().values()) {
- serviceInterfaces.add(service.getServiceContract().getInterface());
+ serviceInterfaces.add(service.getServiceContract().getInterfaceClass());
}
Constructor<?> constr;
try {
@@ -80,13 +80,13 @@
members);
for (Service service : component.getImplementation().getComponentType().getServices().values()) {
- Class interfaze = service.getServiceContract().getInterface();
+ Class interfaze = service.getServiceContract().getInterfaceClass();
SystemTargetWire wire = new SystemTargetWire(service.getName(), interfaze, systemContext);
systemContext.addTargetWire(wire);
}
for (ReferenceTarget target : component.getReferenceTargets().values()) {
String referenceName = target.getReferenceName();
- Class interfaze = target.getReference().getServiceContract().getInterface();
+ Class interfaze = target.getReference().getServiceContract().getInterfaceClass();
Member member = componentType.getReferenceMember(referenceName);
if (member == null) {
BuilderConfigException e = new BuilderConfigException("Reference not found");
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java Tue May 23 13:10:20 2006
@@ -20,24 +20,52 @@
import org.apache.tuscany.core.system.context.SystemCompositeContext;
import org.apache.tuscany.core.system.context.SystemCompositeContextImpl;
import org.apache.tuscany.core.system.model.SystemCompositeImplementation;
-import org.apache.tuscany.spi.model.Component;
-import org.apache.tuscany.spi.model.CompositeComponentType;
-import org.apache.tuscany.spi.model.Service;
+import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.BuilderConfigException;
-import org.apache.tuscany.spi.builder.ComponentBuilder;
+import org.apache.tuscany.spi.builder.BuilderRegistry;
import org.apache.tuscany.spi.context.ComponentContext;
import org.apache.tuscany.spi.context.CompositeContext;
+import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
+import org.apache.tuscany.spi.model.BoundService;
+import org.apache.tuscany.spi.model.Component;
+import org.apache.tuscany.spi.model.CompositeComponentType;
+import org.apache.tuscany.spi.model.Service;
+import org.apache.tuscany.spi.model.Implementation;
+import org.apache.tuscany.spi.model.Binding;
/**
* @version $Rev$ $Date$
*/
-public class SystemCompositeBuilder implements ComponentBuilder<SystemCompositeImplementation> {
+public class SystemCompositeBuilder extends ComponentBuilderExtension<SystemCompositeImplementation> {
+ private BuilderRegistry builderRegistry;
+
+ public SystemCompositeBuilder() {
+ }
+
+ public SystemCompositeBuilder(BuilderRegistry builderRegistry) {
+ this.builderRegistry = builderRegistry;
+ }
+
+ protected Class<SystemCompositeImplementation> getImplementationType() {
+ return SystemCompositeImplementation.class;
+ }
+
+ @Autowire
+ public void setBuilderRegistry(BuilderRegistry builderRegistry) {
+ this.builderRegistry = builderRegistry;
+ }
+
public ComponentContext build(CompositeContext parent, Component<SystemCompositeImplementation> component) throws BuilderConfigException {
SystemCompositeImplementation impl = component.getImplementation();
CompositeComponentType componentType = impl.getComponentType();
SystemCompositeContext<?> context = new SystemCompositeContextImpl(component.getName(), parent, getAutowireContext(parent));
for (Service service : componentType.getServices().values()) {
-
+ if (service instanceof BoundService) {
+ context.registerContext(builderRegistry.build(parent, (BoundService<? extends Binding>) service));
+ }
+ }
+ for (Component<? extends Implementation> childComponent : componentType.getComponents().values()) {
+ context.registerContext(builderRegistry.build(parent, childComponent));
}
return context;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/model/SystemImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/model/SystemImplementation.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/model/SystemImplementation.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/model/SystemImplementation.java Tue May 23 13:10:20 2006
@@ -25,6 +25,13 @@
public class SystemImplementation extends AtomicImplementation<PojoComponentType> {
private Class<?> implementationClass;
+ public SystemImplementation() {
+ }
+
+ public SystemImplementation(Class<?> implementationClass) {
+ this.implementationClass = implementationClass;
+ }
+
public Class<?> getImplementationClass() {
return implementationClass;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemSourceWire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemSourceWire.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemSourceWire.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemSourceWire.java Tue May 23 13:10:20 2006
@@ -43,7 +43,7 @@
public T getTargetService() throws TargetException {
if (targetWire == null) {
- throw new TargetException("Target wire not connected to source wire");
+ throw new TargetException("No target wire connected to source wire");
}
return targetWire.getTargetService();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/system/WireServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/system/WireServiceImpl.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/system/WireServiceImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/system/WireServiceImpl.java Tue May 23 13:10:20 2006
@@ -63,7 +63,7 @@
public SourceWire createSourceWire(Reference reference) throws BuilderConfigException {
String name = reference.getName();
- Class interfaze = reference.getServiceContract().getInterface();
+ Class interfaze = reference.getServiceContract().getInterfaceClass();
SourceWire<?> wire = wireFactoryService.createSourceWire();
wire.setBusinessInterface(interfaze);
wire.setReferenceName(name);
@@ -82,7 +82,7 @@
public TargetWire createTargetWire(Service service) {
String name = service.getName();
- Class interfaze = service.getServiceContract().getInterface();
+ Class interfaze = service.getServiceContract().getInterfaceClass();
TargetWire<?> wire = wireFactoryService.createTargetWire();
wire.setBusinessInterface(interfaze);
wire.setServiceName(name);
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java Tue May 23 13:10:20 2006
@@ -18,6 +18,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.system.context.SystemCompositeContext;
+import org.apache.tuscany.core.system.context.SystemCompositeContextImpl;
import org.apache.tuscany.spi.deployer.Deployer;
import org.apache.tuscany.spi.bootstrap.ContextNames;
@@ -28,14 +29,17 @@
private DefaultBootstrapper bootstrapper;
public void testDeployerBootstrap() {
+/*
+ SystemCompositeContext parent = new SystemCompositeContextImpl("test", null, null);
SystemCompositeContext<Deployer> context =
- (SystemCompositeContext<Deployer>) bootstrapper.createDeployer(ContextNames.TUSCANY_DEPLOYER, null);
+ (SystemCompositeContext<Deployer>) bootstrapper.createDeployer(ContextNames.TUSCANY_DEPLOYER, parent);
assertEquals("tuscany.deployer", context.getName());
// todo this should work
// Deployer deployer = context.getService();
// assertNotNull(deployer);
-// Deployer deployer = context.resolveExternalInstance(Deployer.class);
-// assertNotNull(deployer);
+ Deployer deployer = context.resolveExternalInstance(Deployer.class);
+ assertNotNull(deployer);
+*/
}
protected void setUp() throws Exception {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java Tue May 23 13:10:20 2006
@@ -34,7 +34,7 @@
Reference reference = new Reference();
reference.setName("target");
ServiceContract contract = new JavaServiceContract();
- contract.setInterfaze(Target.class);
+ contract.setInterfaceClass(Target.class);
reference.setServiceContract(contract);
componentType.add(reference);
try {
@@ -70,7 +70,7 @@
reference.setName("target");
reference.setAutowire(true);
ServiceContract contract = new JavaServiceContract();
- contract.setInterfaze(Target.class);
+ contract.setInterfaceClass(Target.class);
reference.setServiceContract(contract);
componentType.add(reference);
try {
@@ -100,7 +100,7 @@
Service targetService = new Service();
targetService.setName("Target");
ServiceContract contract = new JavaServiceContract();
- contract.setInterfaze(Target.class);
+ contract.setInterfaceClass(Target.class);
targetService.setServiceContract(contract);
componentType.add(targetService);
impl.setComponentType(componentType);
@@ -117,7 +117,7 @@
reference.setBinding(binding);
reference.setName("target");
ServiceContract contract = new JavaServiceContract();
- contract.setInterfaze(Target.class);
+ contract.setInterfaceClass(Target.class);
reference.setServiceContract(contract);
return reference;
}
@@ -132,7 +132,7 @@
service.setBinding(binding);
service.setName("service");
ServiceContract contract = new JavaServiceContract();
- contract.setInterfaze(Target.class);
+ contract.setInterfaceClass(Target.class);
service.setServiceContract(contract);
try {
service.setTarget(new URI("target/Target"));
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundService.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundService.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundService.java Tue May 23 13:10:20 2006
@@ -27,8 +27,9 @@
private B binding;
private URI target;
- public BoundService(String name, ServiceContract serviceContract, URI target) {
+ public BoundService(String name, ServiceContract serviceContract, B binding, URI target) {
super(name, serviceContract);
+ this.binding = binding;
this.target = target;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java Tue May 23 13:10:20 2006
@@ -16,18 +16,15 @@
*/
package org.apache.tuscany.spi.model;
-import java.util.Map;
import java.util.HashMap;
-
-import org.apache.tuscany.spi.model.Component;
-import org.apache.tuscany.spi.model.ComponentType;
+import java.util.Map;
/**
* @version $Rev$ $Date$
*/
public class CompositeComponentType extends ComponentType {
private String name;
- private final Map<String, Component<?>> components = new HashMap<String, Component<?>>();
+ private final Map<String, Component<? extends Implementation>> components = new HashMap<String, Component<? extends Implementation>>();
public String getName() {
return name;
@@ -37,11 +34,11 @@
this.name = name;
}
- public Map<String, Component<?>> getComponents() {
+ public Map<String, Component<? extends Implementation>> getComponents() {
return components;
}
- public void add(Component<?> component) {
+ public void add(Component<? extends Implementation> component) {
components.put(component.getName(), component);
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaServiceContract.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaServiceContract.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaServiceContract.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaServiceContract.java Tue May 23 13:10:20 2006
@@ -21,19 +21,18 @@
*/
public class JavaServiceContract extends ServiceContract {
private String interfaceName;
- private Class<?> interfaceClass;
private String callbackName;
private Class<?> callbackClass;
public JavaServiceContract() {
}
-
+
public JavaServiceContract(String interfaceName) {
this.interfaceName = interfaceName;
}
public JavaServiceContract(Class<?> interfaceClass) {
- this.interfaceClass = interfaceClass;
+ super(interfaceClass);
}
public String getInterfaceName() {
@@ -42,14 +41,6 @@
public void setInterfaceName(String interfaceName) {
this.interfaceName = interfaceName;
- }
-
- public Class<?> getInterfaceClass() {
- return interfaceClass;
- }
-
- public void setInterfaceClass(Class<?> interfaceClass) {
- this.interfaceClass = interfaceClass;
}
public String getCallbackName() {
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceContract.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceContract.java?rev=408998&r1=408997&r2=408998&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceContract.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceContract.java Tue May 23 13:10:20 2006
@@ -24,14 +24,21 @@
*/
public abstract class ServiceContract extends ModelObject {
private InteractionScope interactionScope;
- private Class<?> interfaze;
+ private Class<?> interfaceClass;
- public Class<?> getInterface() {
- return interfaze;
+ protected ServiceContract() {
}
- public void setInterfaze(Class<?> interfaze) {
- this.interfaze = interfaze;
+ protected ServiceContract(Class<?> interfaceClass) {
+ this.interfaceClass = interfaceClass;
+ }
+
+ public Class<?> getInterfaceClass() {
+ return interfaceClass;
+ }
+
+ public void setInterfaceClass(Class<?> interfaceClass) {
+ this.interfaceClass = interfaceClass;
}
public InteractionScope getInteractionScope() {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org