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 2007/02/12 06:28:13 UTC
svn commit: r506287 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/implementation/java/
test/java/org/apache/tuscany/core/implementation/java/integration/
test/java/org/apache/tuscany/core/integration/conversation/ ...
Author: jboynes
Date: Sun Feb 11 21:28:12 2007
New Revision: 506287
URL: http://svn.apache.org/viewvc?view=rev&rev=506287
Log:
when determining the target method for the target invoker, it should use the implementation class not the service contract
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java?view=diff&rev=506287&r1=506286&r2=506287
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java Sun Feb 11 21:28:12 2007
@@ -58,7 +58,7 @@
methods = callbackClass.getMethods();
} else {
- methods = operation.getServiceContract().getInterfaceClass().getMethods();
+ methods = implementationClass.getMethods();
}
Method method = findMethod(operation, methods);
return new JavaTargetInvoker(method, this, callbackWire, callbackClass, workContext, monitor);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java?view=diff&rev=506287&r1=506286&r2=506287
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java Sun Feb 11 21:28:12 2007
@@ -182,6 +182,7 @@
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
EasyMock.replay(parent);
PojoConfiguration configuration = new PojoConfiguration();
+ configuration.setImplementationClass(TargetImpl.class);
configuration.setInstanceFactory(new PojoObjectFactory<TargetImpl>(TargetImpl.class.getConstructor()));
configuration.setParent(parent);
configuration.setWorkContext(workContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java?view=diff&rev=506287&r1=506286&r2=506287
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java Sun Feb 11 21:28:12 2007
@@ -45,7 +45,7 @@
public class ConversationIdleExpireTestCase extends AbstractConversationTestCase {
private JDKOutboundInvocationHandler handler;
private OutboundWire owire;
- private Foo targetInstance;
+ private FooImpl targetInstance;
private Method operation1;
private Method operation2;
private final Object mutex = new Object();
@@ -77,7 +77,7 @@
store.setReaperInterval(10);
initializeRuntime();
- targetInstance = EasyMock.createMock(Foo.class);
+ targetInstance = EasyMock.createMock(FooImpl.class);
targetInstance.operation1();
targetInstance.operation2();
targetInstance.end();
@@ -109,19 +109,20 @@
PojoConfiguration configuration = new PojoConfiguration();
configuration.setName(new URI("target"));
configuration.setMaxIdleTime(50);
- configuration.setInstanceFactory(new MockPojoFactory(Object.class.getConstructor()));
+ configuration.setInstanceFactory(new MockPojoFactory(FooImpl.class.getConstructor()));
+ configuration.setImplementationClass(FooImpl.class);
JavaAtomicComponent component = new JavaAtomicComponent(configuration);
component.setScopeContainer(container);
component.start();
return component;
}
- private class MockPojoFactory extends PojoObjectFactory<Object> {
- public MockPojoFactory(Constructor<Object> ctr) {
+ private class MockPojoFactory extends PojoObjectFactory<FooImpl> {
+ public MockPojoFactory(Constructor<FooImpl> ctr) {
super(ctr);
}
- public Foo getInstance() throws ObjectCreationException {
+ public FooImpl getInstance() throws ObjectCreationException {
return targetInstance;
}
}
@@ -138,4 +139,16 @@
}
+ public static class FooImpl implements Foo {
+
+ public void operation1() {
+ }
+
+ public void operation2() {
+ }
+
+ @EndConversation
+ public void end() {
+ }
+ }
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java?view=diff&rev=506287&r1=506286&r2=506287
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java Sun Feb 11 21:28:12 2007
@@ -45,7 +45,7 @@
public class ConversationMaxAgeExpireTestCase extends AbstractConversationTestCase {
private JDKOutboundInvocationHandler handler;
private OutboundWire owire;
- private Foo targetInstance;
+ private FooImpl targetInstance;
private Method operation1;
private Method operation2;
private final Object mutex = new Object();
@@ -77,7 +77,7 @@
store.setReaperInterval(10);
initializeRuntime();
- targetInstance = EasyMock.createMock(ConversationMaxAgeExpireTestCase.Foo.class);
+ targetInstance = EasyMock.createMock(FooImpl.class);
targetInstance.operation1();
targetInstance.operation2();
targetInstance.end();
@@ -109,20 +109,21 @@
PojoConfiguration configuration = new PojoConfiguration();
configuration.setName(new URI("target"));
configuration.setMaxAge(50);
- Constructor<Object> ctor = Object.class.getConstructor();
+ Constructor<FooImpl> ctor = FooImpl.class.getConstructor();
configuration.setInstanceFactory(new ConversationMaxAgeExpireTestCase.MockPojoFactory(ctor));
+ configuration.setImplementationClass(FooImpl.class);
JavaAtomicComponent component = new JavaAtomicComponent(configuration);
component.setScopeContainer(container);
component.start();
return component;
}
- private class MockPojoFactory extends PojoObjectFactory<Object> {
- public MockPojoFactory(Constructor<Object> ctr) {
+ private class MockPojoFactory extends PojoObjectFactory<FooImpl> {
+ public MockPojoFactory(Constructor<FooImpl> ctr) {
super(ctr);
}
- public ConversationMaxAgeExpireTestCase.Foo getInstance() throws ObjectCreationException {
+ public FooImpl getInstance() throws ObjectCreationException {
return targetInstance;
}
}
@@ -139,4 +140,16 @@
}
+ public static class FooImpl implements Foo {
+
+ public void operation1() {
+ }
+
+ public void operation2() {
+ }
+
+ @EndConversation
+ public void end() {
+ }
+ }
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java?view=diff&rev=506287&r1=506286&r2=506287
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java Sun Feb 11 21:28:12 2007
@@ -47,7 +47,7 @@
*/
public class ConversationStartStopEndTestCase extends AbstractConversationTestCase {
private OutboundWire owire;
- private Foo targetInstance;
+ private FooImpl targetInstance;
private JDKOutboundInvocationHandler handler;
private Method operation1;
private Method operation2;
@@ -76,7 +76,7 @@
super.setUp();
createRuntime();
initializeRuntime();
- targetInstance = EasyMock.createMock(Foo.class);
+ targetInstance = EasyMock.createMock(FooImpl.class);
targetInstance.operation1();
targetInstance.operation2();
targetInstance.end();
@@ -109,19 +109,20 @@
private JavaAtomicComponent createAtomicComponent() throws Exception {
PojoConfiguration configuration = new PojoConfiguration();
configuration.setName(new URI("target"));
- configuration.setInstanceFactory(new MockPojoFactory(Object.class.getConstructor()));
+ configuration.setInstanceFactory(new MockPojoFactory(FooImpl.class.getConstructor()));
+ configuration.setImplementationClass(FooImpl.class);
JavaAtomicComponent component = new JavaAtomicComponent(configuration);
component.setScopeContainer(container);
component.start();
return component;
}
- private class MockPojoFactory extends PojoObjectFactory<Object> {
- public MockPojoFactory(Constructor<Object> ctr) {
+ private class MockPojoFactory extends PojoObjectFactory<FooImpl> {
+ public MockPojoFactory(Constructor<FooImpl> ctr) {
super(ctr);
}
- public Foo getInstance() throws ObjectCreationException {
+ public FooImpl getInstance() throws ObjectCreationException {
return targetInstance;
}
}
@@ -138,4 +139,16 @@
}
+ public static class FooImpl implements Foo {
+
+ public void operation1() {
+ }
+
+ public void operation2() {
+ }
+
+ @EndConversation
+ public void end() {
+ }
+ }
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java?view=diff&rev=506287&r1=506286&r2=506287
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java Sun Feb 11 21:28:12 2007
@@ -234,6 +234,7 @@
private static <T> JavaAtomicComponent createJavaComponent(String name, ScopeContainer scope, Class<T> clazz)
throws NoSuchMethodException, URISyntaxException {
PojoConfiguration configuration = new PojoConfiguration();
+ configuration.setImplementationClass(clazz);
configuration.setInstanceFactory(new PojoObjectFactory(clazz.getConstructor()));
configuration.setWireService(WIRE_SERVICE);
configuration.setWorkContext(new WorkContextImpl());
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org