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 2006/12/26 19:45:24 UTC
svn commit: r490349 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/implementation/system/builder/
main/java/org/apache/tuscany/core/implementation/system/component/
test/java/org/apache/tuscany/core/implementation/c...
Author: jmarino
Date: Tue Dec 26 10:45:23 2006
New Revision: 490349
URL: http://svn.apache.org/viewvc?view=rev&rev=490349
Log:
remove uneeded SystemReference and SystemService interfaces
Removed:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReference.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemService.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemServiceComponentWireTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java?view=diff&rev=490349&r1=490348&r2=490349
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java Tue Dec 26 10:45:23 2006
@@ -24,54 +24,41 @@
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.builder.MissingWireTargetException;
import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.core.implementation.system.component.SystemReference;
import org.apache.tuscany.core.implementation.system.component.SystemReferenceImpl;
-import org.apache.tuscany.core.implementation.system.component.SystemService;
import org.apache.tuscany.core.implementation.system.component.SystemServiceImpl;
import org.apache.tuscany.core.implementation.system.model.SystemBinding;
/**
- * Creates {@link SystemService}s and {@link org.apache.tuscany.core.implementation.system.component.SystemReference}s
- * by evaluating an assembly definition
+ * Creates services and references confgured with the system binding
*
* @version $$Rev$$ $$Date$$
*/
public class SystemBindingBuilder extends BindingBuilderExtension<SystemBinding>
implements BindingBuilder<SystemBinding> {
- public SystemService build(CompositeComponent parent,
- BoundServiceDefinition<SystemBinding> definition,
- DeploymentContext deploymentContext) throws BuilderException {
+ public Service build(CompositeComponent parent,
+ BoundServiceDefinition<SystemBinding> definition,
+ DeploymentContext deploymentContext) throws BuilderException {
URI uri = definition.getTarget();
if (uri == null) {
throw new MissingWireTargetException("Target URI not specified", definition.getName());
}
- // QualifiedName targetName = new QualifiedName(uri.getPath());
- // String targetComponentName = targetName.getPartName();
- // SCAObject target = parent.getSystemChild(targetComponentName);
- // if (target == null) {
- // throw new MissingWireTargetException(targetName.toString());
- // } else if (!(target instanceof AtomicComponent)) {
- // throw new InvalidTargetTypeException("Target must be a system component",
-// definition.getName(),
-// null,
-// targetName.getPartName(),
-// null);
-// }
ServiceContract<?> contract = definition.getServiceContract();
return new SystemServiceImpl(definition.getName(), parent, contract);
}
- public SystemReference build(CompositeComponent parent,
- BoundReferenceDefinition<SystemBinding> definition,
- DeploymentContext deploymentContext) {
+ public Reference build(CompositeComponent parent,
+ BoundReferenceDefinition<SystemBinding> definition,
+ DeploymentContext deploymentContext) {
String name = definition.getName();
return new SystemReferenceImpl(name, parent);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java?view=diff&rev=490349&r1=490348&r2=490349
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java Tue Dec 26 10:45:23 2006
@@ -20,6 +20,7 @@
import org.apache.tuscany.spi.component.AbstractSCAObject;
import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -28,12 +29,11 @@
import org.apache.tuscany.spi.wire.TargetInvoker;
/**
- * Default implementation of a reference configured with the
- * {@link org.apache.tuscany.core.implementation.system.model.SystemBinding}
+ * Default implementation of a reference configured with the system binding
*
* @version $Rev$ $Date$
*/
-public class SystemReferenceImpl extends AbstractSCAObject implements SystemReference {
+public class SystemReferenceImpl extends AbstractSCAObject implements Reference {
protected InboundWire inboundWire;
protected OutboundWire outboundWire;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java?view=diff&rev=490349&r1=490348&r2=490349
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java Tue Dec 26 10:45:23 2006
@@ -21,6 +21,7 @@
import org.apache.tuscany.spi.CoreRuntimeException;
import org.apache.tuscany.spi.component.AbstractSCAObject;
import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -29,12 +30,11 @@
import org.apache.tuscany.spi.wire.TargetInvoker;
/**
- * Default implementation for services configured with the
- * {@link org.apache.tuscany.core.implementation.system.model.SystemBinding}
+ * Default implementation for services configured with the system binding
*
* @version $$Rev$$ $$Date$$
*/
-public class SystemServiceImpl extends AbstractSCAObject implements SystemService {
+public class SystemServiceImpl extends AbstractSCAObject implements Service {
protected InboundWire inboundWire;
protected OutboundWire outboundWire;
protected ServiceContract<?> serviceContract;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java?view=diff&rev=490349&r1=490348&r2=490349
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java Tue Dec 26 10:45:23 2006
@@ -24,12 +24,12 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.wire.InboundWire;
import junit.framework.TestCase;
import org.apache.tuscany.core.implementation.TestUtils;
-import org.apache.tuscany.core.implementation.system.component.SystemReference;
-import org.apache.tuscany.core.implementation.system.component.SystemService;
import org.easymock.EasyMock;
/**
@@ -101,7 +101,7 @@
CompositeComponent parent = new CompositeComponentImpl("parent", null, null, true);
parent.start();
- SystemService service = EasyMock.createMock(SystemService.class);
+ Service service = EasyMock.createMock(Service.class);
EasyMock.expect(service.getName()).andReturn("service").atLeastOnce();
service.getInterface();
EasyMock.expectLastCall().andReturn(Source.class).atLeastOnce();
@@ -126,7 +126,7 @@
CompositeComponent parent = new CompositeComponentImpl("parent", null, null, true);
parent.start();
- SystemService service = EasyMock.createMock(SystemService.class);
+ Service service = EasyMock.createMock(Service.class);
EasyMock.expect(service.getName()).andReturn("service").atLeastOnce();
service.getInterface();
EasyMock.expectLastCall().andReturn(Source.class).atLeastOnce();
@@ -152,7 +152,7 @@
CompositeComponent parent = new CompositeComponentImpl("parent", null, null, true);
parent.start();
- SystemReference reference = EasyMock.createMock(SystemReference.class);
+ Reference reference = EasyMock.createMock(Reference.class);
EasyMock.expect(reference.getName()).andReturn("service").atLeastOnce();
EasyMock.expect(reference.isSystem()).andReturn(true).atLeastOnce();
InboundWire wire = TestUtils.createInboundWire(Source.class);
@@ -173,7 +173,7 @@
CompositeComponent parent = new CompositeComponentImpl("parent", null, null, true);
parent.start();
- SystemReference reference = EasyMock.createMock(SystemReference.class);
+ Reference reference = EasyMock.createMock(Reference.class);
EasyMock.expect(reference.getName()).andReturn("service").atLeastOnce();
EasyMock.expect(reference.isSystem()).andReturn(false).atLeastOnce();
InboundWire wire = TestUtils.createInboundWire(Source.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java?view=diff&rev=490349&r1=490348&r2=490349
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilderTestCase.java Tue Dec 26 10:45:23 2006
@@ -23,12 +23,12 @@
import org.apache.tuscany.spi.builder.BuilderRegistry;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ServiceContract;
import junit.framework.TestCase;
-import org.apache.tuscany.core.implementation.system.component.SystemService;
import org.apache.tuscany.core.implementation.system.model.SystemBinding;
import org.easymock.EasyMock;
@@ -52,7 +52,7 @@
ServiceContract<Object> contract = new ServiceContract<Object>(Object.class) {
};
definition.setServiceContract(contract);
- SystemService service = builder.build(parent, definition, context);
+ Service service = builder.build(parent, definition, context);
assertEquals("bar", service.getName());
assertEquals(contract, service.getBindingServiceContract());
assertEquals(parent, service.getParent());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemServiceComponentWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemServiceComponentWireTestCase.java?view=diff&rev=490349&r1=490348&r2=490349
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemServiceComponentWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemServiceComponentWireTestCase.java Tue Dec 26 10:45:23 2006
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.core.implementation.system.component;
+import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.OutboundWire;
@@ -42,7 +43,7 @@
EasyMock.replay(outboundWire);
InboundWire wire = new InboundWireImpl();
wire.setServiceContract(new JavaServiceContract(Target.class));
- SystemService service = new SystemServiceImpl("service", null, new JavaServiceContract());
+ Service service = new SystemServiceImpl("service", null, new JavaServiceContract());
service.setInboundWire(wire);
service.setOutboundWire(outboundWire);
wire.setTargetWire(outboundWire);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org