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/05/31 16:49:24 UTC
svn commit: r410549 - in /incubator/tuscany/sandbox/jboynes/sca:
core2/src/main/java/org/apache/tuscany/core/wire/
core2/src/test/java/org/apache/tuscany/core/wire/
spi/src/main/java/org/apache/tuscany/spi/extension/
spi/src/main/java/org/apache/tuscan...
Author: jmarino
Date: Wed May 31 07:49:23 2006
New Revision: 410549
URL: http://svn.apache.org/viewvc?rev=410549&view=rev
Log:
rename ReferenceInvocationHandler to JDKOutboundInvocationHandler
Added:
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/JDKOutboundInvocationHandler.java
- copied, changed from r410442, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ReferenceInvocationHandler.java
Removed:
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ReferenceInvocationHandler.java
Modified:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java?rev=410549&r1=410548&r2=410549&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java Wed May 31 07:49:23 2006
@@ -18,7 +18,7 @@
import java.util.Map;
import org.apache.tuscany.core.util.MethodHashMap;
-import org.apache.tuscany.spi.wire.ReferenceInvocationHandler;
+import org.apache.tuscany.spi.wire.JDKOutboundInvocationHandler;
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.context.TargetException;
import org.apache.tuscany.spi.wire.InboundWire;
@@ -46,7 +46,7 @@
// optimized, no interceptors or handlers on either end
return targetWire.getTargetService();
}
- ReferenceInvocationHandler handler = new ReferenceInvocationHandler(invocationChains);
+ JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(invocationChains);
return (T) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), businessInterfaces, handler);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java?rev=410549&r1=410548&r2=410549&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java Wed May 31 07:49:23 2006
@@ -10,7 +10,7 @@
import org.apache.tuscany.core.mock.wire.MockSyncInterceptor;
import org.apache.tuscany.core.util.MethodHashMap;
import org.apache.tuscany.spi.wire.OutboundInvocationChain;
-import org.apache.tuscany.spi.wire.ReferenceInvocationHandler;
+import org.apache.tuscany.spi.wire.JDKOutboundInvocationHandler;
import org.jmock.MockObjectTestCase;
/**
@@ -34,7 +34,7 @@
chain.setTargetInvoker(invoker);
chain.build();
chains.put(echo, chain);
- ReferenceInvocationHandler handler = new ReferenceInvocationHandler(chains);
+ JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(chains);
assertEquals("foo",handler.invoke(null,echo,new String[]{"foo"}));
assertEquals(1,interceptor.getCount());
assertEquals(1,requestHandler.getCount());
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java?rev=410549&r1=410548&r2=410549&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java Wed May 31 07:49:23 2006
@@ -25,7 +25,7 @@
import org.apache.tuscany.core.mock.wire.MockStaticInvoker;
import org.apache.tuscany.core.mock.wire.MockSyncInterceptor;
import org.apache.tuscany.core.util.MethodHashMap;
-import org.apache.tuscany.spi.wire.ReferenceInvocationHandler;
+import org.apache.tuscany.spi.wire.JDKOutboundInvocationHandler;
import org.apache.tuscany.spi.wire.OutboundInvocationChain;
/**
@@ -56,7 +56,7 @@
public void testCheckedException() throws Exception {
Map<Method, OutboundInvocationChain> chains = new MethodHashMap<OutboundInvocationChain>();
chains.put(checkedMethod, createChain(checkedMethod));
- ReferenceInvocationHandler handler = new ReferenceInvocationHandler(chains);
+ JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(chains);
try {
TestBean proxy = (TestBean) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
new Class[]{TestBean.class}, handler);
@@ -70,7 +70,7 @@
public void testRuntimeException() throws Exception {
Map<Method, OutboundInvocationChain> chains = new MethodHashMap<OutboundInvocationChain>();
chains.put(runtimeMethod, createChain(runtimeMethod));
- ReferenceInvocationHandler handler = new ReferenceInvocationHandler(chains);
+ JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(chains);
try {
TestBean proxy = (TestBean) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
new Class[]{TestBean.class}, handler);
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java?rev=410549&r1=410548&r2=410549&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java Wed May 31 07:49:23 2006
@@ -10,7 +10,7 @@
import org.apache.tuscany.core.mock.wire.MockStaticInvoker;
import org.apache.tuscany.core.mock.wire.MockSyncInterceptor;
import org.apache.tuscany.core.util.MethodHashMap;
-import org.apache.tuscany.spi.wire.ReferenceInvocationHandler;
+import org.apache.tuscany.spi.wire.JDKOutboundInvocationHandler;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
import org.apache.tuscany.spi.wire.OutboundInvocationChain;
@@ -33,14 +33,14 @@
public void testBasicInvoke() throws Throwable {
Map<Method, OutboundInvocationChain> configs = new MethodHashMap<OutboundInvocationChain>();
configs.put(hello, createChain(hello));
- ReferenceInvocationHandler handler = new ReferenceInvocationHandler(configs);
+ JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(configs);
assertEquals("foo", handler.invoke(hello, new Object[]{"foo"}));
}
public void testErrorInvoke() throws Throwable {
Map<Method, OutboundInvocationChain> configs = new MethodHashMap<OutboundInvocationChain>();
configs.put(hello, createChain(hello));
- ReferenceInvocationHandler handler = new ReferenceInvocationHandler(configs);
+ JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(configs);
try {
handler.invoke(hello, new Object[]{});
fail("Expected " + IllegalArgumentException.class.getName());
@@ -56,7 +56,7 @@
Map<Method, OutboundInvocationChain> configs = new MethodHashMap<OutboundInvocationChain>();
configs.put(hello, source);
- ReferenceInvocationHandler handler = new ReferenceInvocationHandler(configs);
+ JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(configs);
try {
assertEquals("foo", handler.invoke(hello, new Object[]{}));
fail("Expected " + IllegalArgumentException.class.getName());
@@ -72,7 +72,7 @@
Map<Method, OutboundInvocationChain> configs = new MethodHashMap<OutboundInvocationChain>();
configs.put(hello, source);
- ReferenceInvocationHandler handler = new ReferenceInvocationHandler(configs);
+ JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(configs);
assertEquals("foo", handler.invoke(hello, new Object[]{"foo"}));
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java?rev=410549&r1=410548&r2=410549&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java Wed May 31 07:49:23 2006
@@ -71,7 +71,7 @@
}
public T getService() throws TargetException {
- return outboundWire.getTargetService();
+ return inboundWire.getTargetService();
}
public WireInvocationHandler getHandler() throws TargetException {
Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/JDKOutboundInvocationHandler.java (from r410442, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ReferenceInvocationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/JDKOutboundInvocationHandler.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/JDKOutboundInvocationHandler.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ReferenceInvocationHandler.java&r1=410442&r2=410549&rev=410549&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ReferenceInvocationHandler.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/JDKOutboundInvocationHandler.java Wed May 31 07:49:23 2006
@@ -23,20 +23,14 @@
import java.util.Map;
import org.apache.tuscany.spi.context.TargetException;
-import org.apache.tuscany.spi.wire.WireInvocationHandler;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
-import org.apache.tuscany.spi.wire.Interceptor;
-import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.Message;
-import org.apache.tuscany.spi.wire.MessageImpl;
/**
- * Receives a request from a proxy and performs an invocation on an {@link org.apache.tuscany.spi.wire.OutboundWire} via an {@link
- * OutboundInvocationChain}
+ * Receives a request from a proxy and performs an invocation on an {@link OutboundWire}
+ * via an {@link OutboundInvocationChain}
*
* @version $Rev: 406016 $ $Date: 2006-05-12 22:45:22 -0700 (Fri, 12 May 2006) $
*/
-public class ReferenceInvocationHandler implements WireInvocationHandler, InvocationHandler {
+public class JDKOutboundInvocationHandler implements WireInvocationHandler, InvocationHandler {
/*
* an association of an operation to chain holder. The holder contains an invocation chain
@@ -47,7 +41,7 @@
*/
private Map<Method, ChainHolder> chains;
- public ReferenceInvocationHandler(Map<Method, OutboundInvocationChain> invocationChains) {
+ public JDKOutboundInvocationHandler(Map<Method, OutboundInvocationChain> invocationChains) {
this.chains = new HashMap<Method, ChainHolder>(invocationChains.size());
for (Map.Entry<Method, OutboundInvocationChain> entry : invocationChains.entrySet()) {
this.chains.put(entry.getKey(), new ChainHolder(entry.getValue()));
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org