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 21:03:18 UTC
svn commit: r490361 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/
kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/
kernel/core/src/test/java/org/apache/tu...
Author: jmarino
Date: Tue Dec 26 12:03:14 2006
New Revision: 490361
URL: http://svn.apache.org/viewvc?view=rev&rev=490361
Log:
remove Service.getInterface()
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.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/AutowireRegistrationTestCase.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/composite/CompositeComponentImplBasicTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Service.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceExtensionTestCase.java
incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java
incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiService.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java
incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java
incubator/tuscany/java/sca/services/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/CeltixServiceTestCase.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java
incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilder.java
incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCService.java
incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilderTestCase.java
incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceTestCase.java
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java
incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java
incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringTestUtils.java
incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java
incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingService.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingService.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java Tue Dec 26 12:03:14 2006
@@ -59,10 +59,7 @@
public Service build(CompositeComponent parent,
BindlessServiceDefinition definition,
DeploymentContext deploymentContext) {
- return new CompositeService(definition.getName(),
- definition.getServiceContract().getInterfaceClass(),
- parent
- );
+ return new CompositeService(definition.getName(), parent);
}
public Reference build(CompositeComponent parent,
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java Tue Dec 26 12:03:14 2006
@@ -26,11 +26,8 @@
public class CompositeService extends ServiceExtension {
- public CompositeService(String name,
- Class<?> interfaze,
- CompositeComponent parent
- ) {
- super(name, interfaze, parent);
+ public CompositeService(String name, CompositeComponent parent) {
+ super(name, parent);
}
/**
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=490361&r1=490360&r2=490361
==============================================================================
--- 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 12:03:14 2006
@@ -65,10 +65,6 @@
this.outboundWire = wire;
}
- public Class<?> getInterface() {
- return inboundWire.getServiceContract().getInterfaceClass();
- }
-
public TargetInvoker createCallbackTargetInvoker(ServiceContract contract, Operation operation) {
throw new UnsupportedOperationException();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireRegistrationTestCase.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireRegistrationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireRegistrationTestCase.java Tue Dec 26 12:03:14 2006
@@ -8,7 +8,6 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.InvalidAutowireInterface;
-import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.wire.InboundWire;
import junit.framework.TestCase;
@@ -21,46 +20,6 @@
* @version $Rev$ $Date$
*/
public class AutowireRegistrationTestCase extends TestCase {
-
- public void testInvalidServiceInterfaceAutowire() throws Exception {
- CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- InboundWire wire = TestUtils.createInboundWire(Foo.class);
- wire.setContainer(parent);
- Service service = EasyMock.createMock(Service.class);
- EasyMock.expect(service.getName()).andReturn("foo").atLeastOnce();
- EasyMock.expect(service.isSystem()).andReturn(false).atLeastOnce();
- EasyMock.expect(service.getInboundWire()).andReturn(wire).atLeastOnce();
- service.getInterface();
- EasyMock.expectLastCall().andReturn(Bar.class);
- EasyMock.replay(service);
- CompositeComponent component = new CompositeComponentImpl("test", parent, null, null);
- try {
- component.register(service);
- fail();
- } catch (InvalidAutowireInterface e) {
- // expected
- }
- }
-
- public void testInvalidSystemServiceInterfaceAutowire() throws Exception {
- CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
- InboundWire wire = TestUtils.createInboundWire(Foo.class);
- wire.setContainer(parent);
- Service service = EasyMock.createMock(Service.class);
- EasyMock.expect(service.getName()).andReturn("foo").atLeastOnce();
- EasyMock.expect(service.isSystem()).andReturn(true).atLeastOnce();
- EasyMock.expect(service.getInboundWire()).andReturn(wire).atLeastOnce();
- service.getInterface();
- EasyMock.expectLastCall().andReturn(Bar.class);
- EasyMock.replay(service);
- CompositeComponent component = new CompositeComponentImpl("test", parent, null, null);
- try {
- component.register(service);
- fail();
- } catch (InvalidAutowireInterface e) {
- // expected
- }
- }
public void testInvalidComponentInterfaceAutowire() throws Exception {
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
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=490361&r1=490360&r2=490361
==============================================================================
--- 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 12:03:14 2006
@@ -103,8 +103,6 @@
Service service = EasyMock.createMock(Service.class);
EasyMock.expect(service.getName()).andReturn("service").atLeastOnce();
- service.getInterface();
- EasyMock.expectLastCall().andReturn(Source.class).atLeastOnce();
EasyMock.expect(service.isSystem()).andReturn(true).atLeastOnce();
InboundWire wire = TestUtils.createInboundWire(Source.class);
wire.setContainer(service);
@@ -128,8 +126,6 @@
Service service = EasyMock.createMock(Service.class);
EasyMock.expect(service.getName()).andReturn("service").atLeastOnce();
- service.getInterface();
- EasyMock.expectLastCall().andReturn(Source.class).atLeastOnce();
EasyMock.expect(service.isSystem()).andReturn(false).atLeastOnce();
InboundWire wire = TestUtils.createInboundWire(Source.class);
wire.setContainer(service);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java Tue Dec 26 12:03:14 2006
@@ -53,13 +53,13 @@
public void testGetChildren() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
- composite.register(new ServiceExtension("foo", null, null));
+ composite.register(new ServiceExtension("foo", null));
Assert.assertEquals(1, composite.getChildren().size());
}
public void testGetServices() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
- ServiceExtension extension = new ServiceExtension("foo", null, null);
+ ServiceExtension extension = new ServiceExtension("foo", null);
InboundWire wire = TestUtils.createInboundWire(Foo.class);
wire.setContainer(extension);
extension.setInboundWire(wire);
@@ -70,14 +70,14 @@
public void testGetService() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
- composite.register(new ServiceExtension("foo", null, null));
+ composite.register(new ServiceExtension("foo", null));
composite.start();
assertNotNull(composite.getService("foo"));
}
public void testServiceNotFound() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
- composite.register(new ServiceExtension("foo", null, null));
+ composite.register(new ServiceExtension("foo", null));
composite.start();
assertNull(composite.getService("bar"));
}
@@ -91,7 +91,7 @@
public void testReferencesServices() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
- composite.register(new ServiceExtension("foo", null, null));
+ composite.register(new ServiceExtension("foo", null));
composite.register(getReference("bar"));
Assert.assertEquals(1, composite.getReferences().size());
}
@@ -155,8 +155,6 @@
InboundWire wire = TestUtils.createInboundWire(interfaze);
wire.setContainer(service);
EasyMock.expect(service.getInboundWire()).andReturn(wire).atLeastOnce();
- service.getInterface();
- expectLastCall().andReturn(interfaze).atLeastOnce();
replay(service);
return service;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java Tue Dec 26 12:03:14 2006
@@ -87,8 +87,6 @@
InboundWire wire = TestUtils.createInboundWire(Source.class);
wire.setContainer(service);
EasyMock.expect(service.getInboundWire()).andReturn(wire).atLeastOnce();
- service.getInterface();
- EasyMock.expectLastCall().andReturn(Source.class);
EasyMock.replay(service);
parent.register(service);
assertNotNull(parent.getService("source"));
@@ -102,8 +100,6 @@
Service service = EasyMock.createMock(Service.class);
EasyMock.expect(service.getName()).andReturn("source").atLeastOnce();
EasyMock.expect(service.isSystem()).andReturn(true).atLeastOnce();
- service.getInterface();
- EasyMock.expectLastCall().andReturn(Source.class);
InboundWire wire = TestUtils.createInboundWire(Source.class);
wire.setContainer(service);
EasyMock.expect(service.getInboundWire()).andReturn(wire).atLeastOnce();
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Service.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Service.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Service.java Tue Dec 26 12:03:14 2006
@@ -47,11 +47,6 @@
void setBindingServiceContract(ServiceContract<?> serviceContract);
/**
- * Returns the service interface configured for the service
- */
- Class<?> getInterface();
-
- /**
* Returns the inbound wire for flowing a request through the service
*
* @return the inbound wire for flowing a request through the service
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Tue Dec 26 12:03:14 2006
@@ -236,7 +236,7 @@
List<Class<?>> serviceInterfaces = new ArrayList<Class<?>>(services.size());
synchronized (services) {
for (Service service : services) {
- serviceInterfaces.add(service.getInterface());
+ serviceInterfaces.add(service.getInboundWire().getServiceContract().getInterfaceClass());
}
}
return serviceInterfaces;
@@ -470,7 +470,7 @@
protected void registerAutowire(CompositeComponent component) throws InvalidAutowireInterface {
List<Service> services = component.getServices();
for (Service service : services) {
- registerAutowireInternal(service.getInterface(), service);
+ registerAutowireInternal(service.getInboundWire().getServiceContract().getInterfaceClass(), service);
}
}
@@ -482,12 +482,19 @@
}
protected void registerAutowire(Reference reference) throws InvalidAutowireInterface {
- Class clazz = reference.getInboundWire().getServiceContract().getInterfaceClass();
+ Class<?> clazz = reference.getInboundWire().getServiceContract().getInterfaceClass();
registerAutowireInternal(clazz, reference);
}
protected void registerAutowire(Service service) throws InvalidAutowireInterface {
- registerAutowireExternal(service.getInterface(), service);
+ InboundWire wire = service.getInboundWire();
+ if (wire == null) {
+ // JFM FIXME this a hack needed b/c we are not setting inbound wires in
+ // WireService.Extension.createWires(Service, String, ServiceContract<?>) on composite services
+ return;
+ }
+ Class<?> clazz = wire.getServiceContract().getInterfaceClass();
+ registerAutowireExternal(clazz, service);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java Tue Dec 26 12:03:14 2006
@@ -36,15 +36,12 @@
* @version $Rev$ $Date$
*/
public class ServiceExtension extends AbstractSCAObject implements Service {
- protected Class<?> interfaze;
protected InboundWire inboundWire;
protected OutboundWire outboundWire;
protected ServiceContract<?> bindingServiceContract;
- public ServiceExtension(String name, Class<?> interfaze, CompositeComponent parent)
- throws CoreRuntimeException {
+ public ServiceExtension(String name, CompositeComponent parent) throws CoreRuntimeException {
super(name, parent);
- this.interfaze = interfaze;
}
public Scope getScope() {
@@ -65,10 +62,6 @@
public void setOutboundWire(OutboundWire outboundWire) {
this.outboundWire = outboundWire;
- }
-
- public Class<?> getInterface() {
- return interfaze;
}
public ServiceContract<?> getBindingServiceContract() {
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceExtensionTestCase.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceExtensionTestCase.java Tue Dec 26 12:03:14 2006
@@ -18,14 +18,9 @@
*/
package org.apache.tuscany.spi.extension;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.wire.InboundWire;
import junit.framework.TestCase;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
/**
* @version $Rev$ $Date$
@@ -33,23 +28,12 @@
public class ServiceExtensionTestCase extends TestCase {
public void testScope() throws Exception {
- ServiceExtension service = new ServiceExtension(null, null, null);
+ ServiceExtension service = new ServiceExtension(null, null);
assertEquals(Scope.SYSTEM, service.getScope());
}
- public void testSetGetInterface() throws Exception {
- InboundWire wire = createMock(InboundWire.class);
- JavaServiceContract contract = new JavaServiceContract(getClass());
- expect(wire.getServiceContract()).andReturn(contract);
- replay(wire);
- ServiceExtension service = new ServiceExtension(null, null, null);
- service.setInboundWire(wire);
- service.getInterface();
- }
-
-
public void testPrepare() throws Exception {
- ServiceExtension service = new ServiceExtension(null, null, null);
+ ServiceExtension service = new ServiceExtension(null, null);
service.prepare();
}
Modified: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java Tue Dec 26 12:03:14 2006
@@ -50,9 +50,8 @@
BoundServiceDefinition<OSGiBinding> boundServiceDefinition,
DeploymentContext deploymentContext) {
String name = boundServiceDefinition.getName();
- Class<? extends Object> service = getServiceInterface(boundServiceDefinition);
String osgiServiceName = boundServiceDefinition.getBinding().getService();
- return new OSGiService(name, parent, wireService, osgiServiceName, service, host);
+ return new OSGiService(name, parent, wireService, osgiServiceName, host);
}
public OSGiReference build(CompositeComponent parent,
Modified: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiService.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiService.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiService.java Tue Dec 26 12:03:14 2006
@@ -37,6 +37,7 @@
//private final Class<? extends Object> service;
private OSGiHost host;
private WireService wireService;
+
/**
* Creates a new service instance
*
@@ -44,16 +45,14 @@
* @param parent the containing composite
* @param wireService the wire service to use for creating proxies
* @param osgiServiceName the name to publish the service as to the OSGi hose
- * @param service the service type
* @param host the OSGi host
*/
public OSGiService(String name,
CompositeComponent parent,
WireService wireService,
String osgiServiceName,
- Class<?> service,
OSGiHost host) {
- super(name, service, parent);
+ super(name, parent);
this.osgiServiceName = osgiServiceName;
//this.service = service;
this.wireService = wireService;
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java Tue Dec 26 12:03:14 2006
@@ -95,7 +95,7 @@
ServletHost servletHost,
ConfigurationContext configContext, WorkContext workContext) {
- super(theName, serviceContract.getInterfaceClass(), parent);
+ super(theName, parent);
this.serviceContract = serviceContract;
this.binding = binding;
Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java Tue Dec 26 12:03:14 2006
@@ -21,7 +21,6 @@
import java.util.Map;
import java.util.WeakHashMap;
-import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.Service;
@@ -29,9 +28,10 @@
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
-import org.objectweb.celtix.Bus;
import commonj.sdo.helper.TypeHelper;
+import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry;
+import org.objectweb.celtix.Bus;
/**
* Builds a {@link org.apache.tuscany.spi.component.Service} or {@link org.apache.tuscany.spi.component.Reference}
@@ -44,8 +44,8 @@
private Bus bus;
public Service build(CompositeComponent parent,
- BoundServiceDefinition<WebServiceBinding> boundServiceDefinition,
- DeploymentContext deploymentContext) {
+ BoundServiceDefinition<WebServiceBinding> boundServiceDefinition,
+ DeploymentContext deploymentContext) {
WebServiceBinding wsBinding = boundServiceDefinition.getBinding();
TypeHelper typeHelper = (TypeHelper) deploymentContext.getExtension(TypeHelper.class.getName());
if (typeHelper == null) {
@@ -56,7 +56,6 @@
}
return new CeltixService(
boundServiceDefinition.getName(),
- boundServiceDefinition.getServiceContract().getInterfaceClass(),
parent,
wsBinding,
bus,
Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java Tue Dec 26 12:03:14 2006
@@ -79,12 +79,11 @@
public CeltixService(String theName,
- Class<?> interfaze,
CompositeComponent parent,
WebServiceBinding binding,
Bus bus,
TypeHelper theTypeHelper) {
- super(theName, interfaze, parent);
+ super(theName, parent);
this.wsdlDef = binding.getWSDLDefinition();
this.port = binding.getWSDLPort();
this.wsdlService = binding.getWSDLService();
Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/CeltixServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/CeltixServiceTestCase.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/CeltixServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/CeltixServiceTestCase.java Tue Dec 26 12:03:14 2006
@@ -141,7 +141,7 @@
EasyMock.expectLastCall().andReturn(new GreeterImpl()).anyTimes();
EasyMock.replay(wireService);
- CeltixService celtixService = new CeltixService("name", Greeter.class, null, wsBinding, bus, null);
+ CeltixService celtixService = new CeltixService("name", null, wsBinding, bus, null);
//Not sure how InboundWire is set to CeltixService, is the following way correct?
celtixService.setInboundWire(inboundWire);
celtixService.start();
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java Tue Dec 26 12:03:14 2006
@@ -45,7 +45,7 @@
OperationAndDataBinding requestOperationAndDataBinding,
OperationAndDataBinding responseOperationAndDataBinding,
Class<?> service) {
- super(name, service, parent);
+ super(name, parent);
this.jmsBinding = jmsBinding;
this.jmsResourceFactory = jmsResourceFactory;
Modified: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilder.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilder.java Tue Dec 26 12:03:14 2006
@@ -62,7 +62,7 @@
DeploymentContext deploymentContext) {
Class<?> interfaze = serviceDefinition.getServiceContract().getInterfaceClass();
- return new JSONRPCService(serviceDefinition.getName(), interfaze, parent, this.wireService, servletHost);
+ return new JSONRPCService(serviceDefinition.getName(), parent, this.wireService, servletHost);
}
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCService.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCService.java Tue Dec 26 12:03:14 2006
@@ -38,10 +38,9 @@
public static final String SCRIPT_GETTER_SERVICE_MAPPING = "/SCA/scripts";
- public JSONRPCService(String theName, Class<?> interfaze, CompositeComponent parent, WireService wireService,
- ServletHost servletHost) {
+ public JSONRPCService(String theName, CompositeComponent parent, WireService wireService, ServletHost servletHost) {
- super(theName, interfaze, parent);
+ super(theName, parent);
this.servletHost = servletHost;
this.wireService = wireService;
@@ -51,8 +50,10 @@
super.start();
JSONRPCEntryPointServlet servlet;
// FIXME this should not have to create a proxy but should instead dispatch directly down an invocation chain
- Object instance = wireService.createProxy(interfaze, getInboundWire());
- servlet = new JSONRPCEntryPointServlet(getName(), interfaze, instance);
+ Class<?> aClass = getInboundWire().getServiceContract().getInterfaceClass();
+ Object instance =
+ wireService.createProxy(aClass, getInboundWire());
+ servlet = new JSONRPCEntryPointServlet(getName(), aClass, instance);
// register the servlet based on the service name
servletHost.registerMapping("/" + getName(), servlet);
Modified: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilderTestCase.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilderTestCase.java Tue Dec 26 12:03:14 2006
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.binding.jsonrpc;
-import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.host.ServletHost;
@@ -28,7 +27,10 @@
import org.apache.tuscany.spi.model.ServiceContract;
import junit.framework.TestCase;
-import static org.easymock.classextension.EasyMock.*;
+import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
+import static org.easymock.classextension.EasyMock.createMock;
+import static org.easymock.classextension.EasyMock.expect;
+import static org.easymock.classextension.EasyMock.replay;
public class JSONRPCBindingBuilderTestCase extends TestCase {
@@ -50,20 +52,22 @@
JSONRPCBindingBuilder bindingBuilder = new JSONRPCBindingBuilder();
CompositeComponent mockParent = createMock(CompositeComponent.class);
replay(mockParent);
- BoundServiceDefinition<JSONRPCBinding> mockServiceDefinition = createMock((new BoundServiceDefinition<JSONRPCBinding>()).getClass());
+ BoundServiceDefinition<JSONRPCBinding> mockServiceDefinition =
+ createMock((new BoundServiceDefinition<JSONRPCBinding>()).getClass());
JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
try {
ServiceContract<?> contract = registry.introspect(JSONRPCService.class);
-
+
expect(mockServiceDefinition.getServiceContract()).andStubReturn(contract);
expect(mockServiceDefinition.getName()).andReturn("test_service");
replay(mockServiceDefinition);
DeploymentContext mockDeploymentContext = createMock(DeploymentContext.class);
replay(mockDeploymentContext);
-
- JSONRPCService jsonService = (JSONRPCService)bindingBuilder.build(mockParent, mockServiceDefinition, mockDeploymentContext);
- assertEquals(JSONRPCService.class, jsonService.getInterface());
-
+
+ JSONRPCService jsonService =
+ (JSONRPCService) bindingBuilder.build(mockParent, mockServiceDefinition, mockDeploymentContext);
+ assertEquals(JSONRPCService.class, jsonService.getClass());
+
} catch (InvalidServiceContractException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Modified: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceTestCase.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceTestCase.java Tue Dec 26 12:03:14 2006
@@ -24,6 +24,7 @@
import org.apache.tuscany.spi.host.ServletHost;
import org.apache.tuscany.spi.wire.WireService;
import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.model.ServiceContract;
import static org.easymock.classextension.EasyMock.*;
import org.easymock.EasyMock;
@@ -46,8 +47,12 @@
mockServletHost.registerMapping(eq(JSONRPCService.SCRIPT_GETTER_SERVICE_MAPPING), (Servlet) notNull());
replay(mockServletHost);
- JSONRPCService jsonRpcService = new JSONRPCService(SERVICE_NAME, this.getClass(), mockParent, mockWireService, mockServletHost );
+ ServiceContract contract = new ServiceContract(Object.class){
+
+ };
+ JSONRPCService jsonRpcService = new JSONRPCService(SERVICE_NAME, mockParent, mockWireService, mockServletHost );
InboundWire wire = EasyMock.createNiceMock(InboundWire.class);
+ EasyMock.expect(wire.getServiceContract()).andReturn(contract);
EasyMock.replay(wire);
jsonRpcService.setInboundWire(wire);
jsonRpcService.start();
@@ -68,8 +73,12 @@
expect(mockServletHost.unregisterMapping(eq(JSONRPCService.SCRIPT_GETTER_SERVICE_MAPPING))).andReturn(null);
replay(mockServletHost);
- JSONRPCService jsonRpcService = new JSONRPCService(SERVICE_NAME, this.getClass(), mockParent, mockWireService, mockServletHost );
+ ServiceContract contract = new ServiceContract(Object.class){
+
+ };
+ JSONRPCService jsonRpcService = new JSONRPCService(SERVICE_NAME, mockParent, mockWireService, mockServletHost );
InboundWire wire = EasyMock.createNiceMock(InboundWire.class);
+ EasyMock.expect(wire.getServiceContract()).andReturn(contract);
EasyMock.replay(wire);
jsonRpcService.setInboundWire(wire);
jsonRpcService.start();
@@ -84,7 +93,7 @@
ServletHost mockServletHost = createMock(ServletHost.class);
replay(mockServletHost);
- JSONRPCService jsonRpcService = new JSONRPCService(SERVICE_NAME, this.getClass(), mockParent, mockWireService, mockServletHost );
+ JSONRPCService jsonRpcService = new JSONRPCService(SERVICE_NAME, mockParent, mockWireService, mockServletHost );
assertNotNull(jsonRpcService);
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java Tue Dec 26 12:03:14 2006
@@ -20,16 +20,16 @@
import java.rmi.Remote;
import java.rmi.server.UnicastRemoteObject;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.extension.ServiceExtension;
+import org.apache.tuscany.spi.wire.WireService;
+
import net.sf.cglib.asm.ClassWriter;
import net.sf.cglib.asm.Constants;
import net.sf.cglib.asm.Type;
import net.sf.cglib.proxy.Enhancer;
-
import org.apache.tuscany.host.rmi.RMIHost;
import org.apache.tuscany.host.rmi.RMIHostException;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.extension.ServiceExtension;
-import org.apache.tuscany.spi.wire.WireService;
/**
* @version $Rev$ $Date$
@@ -59,7 +59,7 @@
String port,
String svcName,
Class<T> service) {
- super(name, service, parent);
+ super(name, parent);
this.serviceInterface = service;
this.rmiHost = rHost;
@@ -80,7 +80,7 @@
rmiProxy);
// bindRmiService(uri,rmiProxy);
} catch (RMIHostException e) {
- throw new NoRemoteServiceException(e);
+ throw new NoRemoteServiceException(e);
}
}
@@ -96,10 +96,11 @@
protected Remote createRmiService() {
Enhancer enhancer = new Enhancer();
enhancer.setSuperclass(UnicastRemoteObject.class);
- enhancer.setCallback(new RemoteMethodHandler(wireService.createHandler(serviceInterface, getInboundWire()), interfaze));
+ enhancer.setCallback(new RemoteMethodHandler(wireService.createHandler(serviceInterface, getInboundWire()),
+ serviceInterface));
if (!Remote.class.isAssignableFrom(serviceInterface)) {
- RMIServiceClassLoader classloader =
+ RMIServiceClassLoader classloader =
new RMIServiceClassLoader(getClass().getClassLoader());
final byte[] byteCode = generateRemoteInterface(serviceInterface);
serviceInterface = classloader.defineClass(byteCode);
@@ -155,6 +156,7 @@
public RMIServiceClassLoader(ClassLoader parent) {
super(parent);
}
+
public Class defineClass(byte[] byteArray) {
return defineClass(null, byteArray, 0, byteArray.length);
}
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java Tue Dec 26 12:03:14 2006
@@ -177,7 +177,7 @@
return wireService.createProxy(type, reference.getInboundWire());
} else if (object instanceof Service) {
Service service = (Service) object;
- type = service.getInterface();
+ type = service.getInboundWire().getServiceContract().getInterfaceClass();
if (requiredType != null && requiredType.isAssignableFrom(type)) {
// need null check since Spring may pass in a null
throw new BeanNotOfRequiredTypeException(name, requiredType, type);
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringTestUtils.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringTestUtils.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringTestUtils.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringTestUtils.java Tue Dec 26 12:03:14 2006
@@ -48,7 +48,7 @@
CompositeComponent parent,
WireService wireService)
throws InvalidServiceContractException, WiringException {
- Service service = new ServiceExtension(name, serviceInterface, parent);
+ Service service = new ServiceExtension(name, parent);
InboundWire inboundWire = ArtifactFactory.createInboundWire(name, serviceInterface);
OutboundWire outboundWire = ArtifactFactory.createOutboundWire(name, serviceInterface);
ArtifactFactory.terminateWire(outboundWire);
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java Tue Dec 26 12:03:14 2006
@@ -51,7 +51,7 @@
outboundWire.setTargetName(new QualifiedName("foo"));
ArtifactFactory.terminateWire(outboundWire);
Service service =
- new ServiceExtension("fooService", TestBean.class, composite);
+ new ServiceExtension("fooService", composite);
service.setInboundWire(inboundWire);
service.setOutboundWire(outboundWire);
Connector connector = ArtifactFactory.createConnector();
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java Tue Dec 26 12:03:14 2006
@@ -65,7 +65,7 @@
// Create a service instance that the mock builder registry will return
WireService wireService = ArtifactFactory.createWireService();
ServiceExtension service =
- new ServiceExtension("fooService", TestBean.class, null);
+ new ServiceExtension("fooService", null);
InboundWire inboundWire = ArtifactFactory.createInboundWire("fooService", TestBean.class);
OutboundWire outboundWire = ArtifactFactory.createOutboundWire("fooService", TestBean.class);
ArtifactFactory.terminateWire(outboundWire);
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java Tue Dec 26 12:03:14 2006
@@ -35,8 +35,7 @@
public Service build(CompositeComponent parent,
BoundServiceDefinition<TestBinding> definition,
DeploymentContext context) {
- Class<?> interfaze = definition.getServiceContract().getInterfaceClass();
- return new TestBindingService(definition.getName(), interfaze, parent);
+ return new TestBindingService(definition.getName(), parent);
}
public Reference build(CompositeComponent parent,
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingService.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingService.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingService.java Tue Dec 26 12:03:14 2006
@@ -26,11 +26,8 @@
* @version $Rev$ $Date$
*/
public class TestBindingService extends ServiceExtension {
- public TestBindingService(String name,
- Class<?> interfaze,
- CompositeComponent parent
- ) throws CoreRuntimeException {
- super(name, interfaze, parent);
+ public TestBindingService(String name, CompositeComponent parent) throws CoreRuntimeException {
+ super(name, parent);
// do nothing, but this could register with the host environment
}
}
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java Tue Dec 26 12:03:14 2006
@@ -14,16 +14,15 @@
public class TestSocketBindingBuilder extends BindingBuilderExtension<TestSocketBinding> {
public Service build(CompositeComponent parent,
- BoundServiceDefinition<TestSocketBinding> definition,
- DeploymentContext context) {
- Class<?> interfaze = definition.getServiceContract().getInterfaceClass();
+ BoundServiceDefinition<TestSocketBinding> definition,
+ DeploymentContext context) {
int port = definition.getBinding().getPort();
- return new TestSocketBindingService(definition.getName(), port, interfaze, parent);
+ return new TestSocketBindingService(definition.getName(), port, parent);
}
public Reference build(CompositeComponent parent,
- BoundReferenceDefinition<TestSocketBinding> definition,
- DeploymentContext context) {
+ BoundReferenceDefinition<TestSocketBinding> definition,
+ DeploymentContext context) {
String name = definition.getName();
int port = definition.getBinding().getPort();
String host = definition.getBinding().getHost();
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingService.java?view=diff&rev=490361&r1=490360&r2=490361
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingService.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingService.java Tue Dec 26 12:03:14 2006
@@ -29,11 +29,8 @@
private ExecutorService executor;
private TestSocketBindingService.ServerRunnable runnable;
- public TestSocketBindingService(String name,
- int port,
- Class<?> interfaze,
- CompositeComponent parent) throws CoreRuntimeException {
- super(name, interfaze, parent);
+ public TestSocketBindingService(String name, int port, CompositeComponent parent) throws CoreRuntimeException {
+ super(name, parent);
this.port = port;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org