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 2007/03/15 22:43:46 UTC
svn commit: r518762 - in
/incubator/tuscany/java/sca/extensions/hessian/binding/src:
main/java/org/apache/tuscany/hessian/component/
main/java/org/apache/tuscany/hessian/destination/
test/java/org/apache/tuscany/hessian/component/ test/java/org/apache/...
Author: jmarino
Date: Thu Mar 15 14:43:45 2007
New Revision: 518762
URL: http://svn.apache.org/viewvc?view=rev&rev=518762
Log:
fix destination mapping
Added:
incubator/tuscany/java/sca/extensions/hessian/binding/src/test/java/org/apache/tuscany/hessian/component/
Modified:
incubator/tuscany/java/sca/extensions/hessian/binding/src/main/java/org/apache/tuscany/hessian/component/BindingComponent.java
incubator/tuscany/java/sca/extensions/hessian/binding/src/main/java/org/apache/tuscany/hessian/destination/AbstractDestination.java
incubator/tuscany/java/sca/extensions/hessian/binding/src/test/java/org/apache/tuscany/hessian/integration/HessianLocalSendReceiveTestCase.java
Modified: incubator/tuscany/java/sca/extensions/hessian/binding/src/main/java/org/apache/tuscany/hessian/component/BindingComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/hessian/binding/src/main/java/org/apache/tuscany/hessian/component/BindingComponent.java?view=diff&rev=518762&r1=518761&r2=518762
==============================================================================
--- incubator/tuscany/java/sca/extensions/hessian/binding/src/main/java/org/apache/tuscany/hessian/component/BindingComponent.java (original)
+++ incubator/tuscany/java/sca/extensions/hessian/binding/src/main/java/org/apache/tuscany/hessian/component/BindingComponent.java Thu Mar 15 14:43:45 2007
@@ -59,8 +59,8 @@
* @version $Rev$ $Date$
*/
public class BindingComponent extends AbstractLifecycle implements Component {
- private String LOCAL_SCHEME = "hessianLocal";
- private String HTTP_SCHEME = "http";
+ public static String LOCAL_SCHEME = "hessianLocal";
+ public static String HTTP_SCHEME = "http";
private URI uri;
private ServletHost servletHost;
private Map<URI, LocalDestination> destinations;
@@ -88,18 +88,19 @@
}
public void createEndpoint(URI endpointUri, Wire wire, ClassLoader loader) throws DestinationCreationException {
- if (LOCAL_SCHEME.equals(uri.getScheme())) {
+ if (LOCAL_SCHEME.equals(endpointUri.getScheme())) {
LocalDestination destination = new LocalDestination(wire, loader);
destinations.put(uri, destination);
- } else if (HTTP_SCHEME.equals(uri.getScheme())) {
+ } else if (HTTP_SCHEME.equals(endpointUri.getScheme())) {
if (servletHost == null) {
throw new ServletHostNotFoundException("ServletHost is was not found");
}
HttpDestination destination = new HttpDestination(wire, loader);
// FIXME mapping
- servletHost.registerMapping(uri.toString(), destination);
+ servletHost.registerMapping(endpointUri.getPath(), destination);
+ } else {
+ throw new UnsupportedOperationException("Unsupported scheme");
}
- throw new UnsupportedOperationException("Unsupported scheme");
}
public void bindToEndpoint(URI endpointUri, Wire wire) throws InvalidDestinationException {
Modified: incubator/tuscany/java/sca/extensions/hessian/binding/src/main/java/org/apache/tuscany/hessian/destination/AbstractDestination.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/hessian/binding/src/main/java/org/apache/tuscany/hessian/destination/AbstractDestination.java?view=diff&rev=518762&r1=518761&r2=518762
==============================================================================
--- incubator/tuscany/java/sca/extensions/hessian/binding/src/main/java/org/apache/tuscany/hessian/destination/AbstractDestination.java (original)
+++ incubator/tuscany/java/sca/extensions/hessian/binding/src/main/java/org/apache/tuscany/hessian/destination/AbstractDestination.java Thu Mar 15 14:43:45 2007
@@ -27,7 +27,6 @@
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
-import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.Wire;
import com.caucho.hessian.io.AbstractHessianInput;
@@ -77,7 +76,7 @@
Thread.currentThread().setContextClassLoader(loader);
in.readCall();
String m = in.readMethod();
- AbstractDestination.ChainHolder holder = chains.get(m);
+ ChainHolder holder = chains.get(m);
if (holder == null) {
out.startReply();
out.writeFault("OperationNotFound", "The service has no method named: " + m, null);
@@ -92,7 +91,6 @@
in.completeCall();
Message msg = new MessageImpl();
InvocationChain chain = holder.chain;
- msg.setTargetInvoker((TargetInvoker) chain.getTargetInvoker().clone());
Message ret = chain.getHeadInterceptor().invoke(msg);
out.startReply();
Object o = ret.getBody();
@@ -100,14 +98,6 @@
out.completeReply();
} catch (IOException e) {
throw new InvocationException(e);
- } catch (CloneNotSupportedException e) {
- try {
- out.startReply();
- out.writeFault("ServiceException", e.getMessage(), e);
- out.completeReply();
- } catch (IOException e1) {
- throw new InvocationException(e);
- }
} finally {
Thread.currentThread().setContextClassLoader(oldLoader);
}
Modified: incubator/tuscany/java/sca/extensions/hessian/binding/src/test/java/org/apache/tuscany/hessian/integration/HessianLocalSendReceiveTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/hessian/binding/src/test/java/org/apache/tuscany/hessian/integration/HessianLocalSendReceiveTestCase.java?view=diff&rev=518762&r1=518761&r2=518762
==============================================================================
--- incubator/tuscany/java/sca/extensions/hessian/binding/src/test/java/org/apache/tuscany/hessian/integration/HessianLocalSendReceiveTestCase.java (original)
+++ incubator/tuscany/java/sca/extensions/hessian/binding/src/test/java/org/apache/tuscany/hessian/integration/HessianLocalSendReceiveTestCase.java Thu Mar 15 14:43:45 2007
@@ -47,14 +47,9 @@
PhysicalOperationDefinition operation = new PhysicalOperationDefinition();
operation.setName("hello");
- TargetInvoker invoker = EasyMock.createNiceMock(TargetInvoker.class);
- EasyMock.replay(invoker);
-
InvocationChain chain = EasyMock.createMock(InvocationChain.class);
- EasyMock.expect(chain.getTargetInvoker()).andReturn(invoker);
EasyMock.expect(chain.getHeadInterceptor()).andReturn(interceptor);
EasyMock.replay(chain);
-
Map<PhysicalOperationDefinition, InvocationChain> chains =
new HashMap<PhysicalOperationDefinition, InvocationChain>();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org