You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tuscany.apache.org by Raymond Feng <en...@gmail.com> on 2009/11/13 22:57:40 UTC
[2.x] Update on RuntimeEndpoint/RuntimeEndpointReference SPIs, Re: svn commit: r836009 [1/7]
Hi,
I have checked in the changes that implement the proposal we discussed at
[1]. Now all the ProviderFactory/Provider SPIs for extensions are well
aligned to the RuntimeEndpoint and RuntimeEndpointReference which replace
RuntimeWire as the owner of service/reference side invocation chains. As a
result, the core and extension code that deals with invocation chains are
simplified.
Some further refinements are needed.
* Rationalize the interface contracts for
RuntimeEndpoint/RuntimeEndpointReference
* Improve the serialization/deserialization of
RuntimeEndpoint/RuntimeEndpointReference (leveraging the Deployer utility to
load/build the XML representation of EP/EPR after deserialization)
[1] http://www.mail-archive.com/dev@tuscany.apache.org/msg07856.html
Thanks,
Raymond
--------------------------------------------------
From: <rf...@apache.org>
Sent: Friday, November 13, 2009 1:49 PM
To: <co...@tuscany.apache.org>
Subject: svn commit: r836009 [1/7] - in /tuscany/java/sca:
itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/
itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/
itest/jms/format-jmsobject/src/test/java/org/apache/tuscany...
> Author: rfeng
> Date: Fri Nov 13 21:49:15 2009
> New Revision: 836009
>
> URL: http://svn.apache.org/viewvc?rev=836009&view=rev
> Log:
> Replace RuntimeWire with RuntimeEnpoint/RuntimeEndpointReference as the
> owner of invocaiton chains
> (http://www.mail-archive.com/dev@tuscany.apache.org/msg07856.html)
>
> Added:
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingPolicyProvider.java
> - copied, changed from r834991,
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderRRB.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointProvider.java
> - copied, changed from r834991,
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointReferenceProvider.java
> - copied, changed from r834991,
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
> (with props)
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeInvoker.java
> (with props)
> Removed:
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderRRB.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
>
> tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/CompositeContextImpl.java
> Modified:
>
> tuscany/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
>
> tuscany/java/sca/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
>
> tuscany/java/sca/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
>
> tuscany/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
>
> tuscany/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite
>
> tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
>
> tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
>
> tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
>
> tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
>
> tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
>
> tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
>
> tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
>
> tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
>
> tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLProviderFactory.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultProviderFactory.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java
>
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java
>
> tuscany/java/sca/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java
>
> tuscany/java/sca/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java
>
> tuscany/java/sca/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java
>
> tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
>
> tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
>
> tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
>
> tuscany/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
>
> tuscany/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
>
> tuscany/java/sca/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
>
> tuscany/java/sca/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
>
> tuscany/java/sca/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
>
> tuscany/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCABindingProviderFactory.java
>
> tuscany/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAReferenceBindingProvider.java
>
> tuscany/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAServiceBindingProvider.java
>
> tuscany/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java
>
> tuscany/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
>
> tuscany/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
>
> tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
>
> tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
>
> tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
>
> tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
>
> tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpoint.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java
>
> tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
>
> tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
>
> tuscany/java/sca/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java
>
> tuscany/java/sca/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java
>
> tuscany/java/sca/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java
>
> tuscany/java/sca/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
>
> tuscany/java/sca/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
>
> tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
>
> tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
>
> tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
>
> tuscany/java/sca/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
>
> tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
>
> tuscany/java/sca/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
>
> Modified:
> tuscany/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
> (original)
> +++
> tuscany/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
> Fri Nov 13 21:49:15 2009
> @@ -105,7 +105,7 @@
> Object o = ((ObjectMessage)m).getObject();
> assertTrue(o instanceof RuntimeException);
>
> assertTrue("java.lang.RuntimeException".equals(o.getClass().getName()));
> - assertEquals("java.lang.RuntimeException: bla",
> ((RuntimeException)o).getMessage());
> + assertEquals("bla", ((RuntimeException)o).getMessage());
> }
>
> @Test
> @@ -151,7 +151,7 @@
> Object o = ((ObjectMessage)m).getObject();
> assertTrue(o instanceof RuntimeException);
>
> assertTrue("java.lang.RuntimeException".equals(o.getClass().getName()));
> - assertEquals("java.lang.RuntimeException: bla",
> ((RuntimeException)o).getMessage());
> + assertEquals("bla", ((RuntimeException)o).getMessage());
> }
>
> @After
>
> Modified:
> tuscany/java/sca/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
> (original)
> +++
> tuscany/java/sca/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
> Fri Nov 13 21:49:15 2009
> @@ -97,7 +97,7 @@
> service.throwUnChecked();
> fail();
> } catch (Exception e) {
> - assertEquals("java.lang.RuntimeException: bla",
> e.getCause().getMessage());
> + assertEquals("bla", e.getCause().getMessage());
> }
> }
>
>
> Modified:
> tuscany/java/sca/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
> (original)
> +++
> tuscany/java/sca/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
> Fri Nov 13 21:49:15 2009
> @@ -48,7 +48,7 @@
> assertEquals("Hello1 Fred Hello1 Bloggs Hello2 null Hello3 Fred
> Hello4 Fred Bloggs Hello5 Fred Bloggs Hello6 Fred Bloggs Hello7 Fred
> Bloggs",
> helloWorldService.getGreetingsWrapSingle("Fred",
> "Bloggs"));
>
> - assertEquals("Hello1 Fred Hello1 Bloggs Hello2 null Hello3 Fred
> Hello4 Fred Bloggs Hello5 Fred Bloggs Hello6 Fred Bloggs Hello7 Fred
> Bloggs foo java.lang.RuntimeException: bla",
> + assertEquals("Hello1 Fred Hello1 Bloggs Hello2 null Hello3 Fred
> Hello4 Fred Bloggs Hello5 Fred Bloggs Hello6 Fred Bloggs Hello7 Fred
> Bloggs foo bla",
> helloWorldService.getGreetingsDontWrapSingle("Fred",
> "Bloggs"));
>
> }
>
> Modified:
> tuscany/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
> (original)
> +++
> tuscany/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
> Fri Nov 13 21:49:15 2009
> @@ -17,7 +17,7 @@
> * specific language governing permissions and limitations
> * under the License.
> -->
> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
> name="ConstructorPropertyInjection">
> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
> targetNamespace="http://foo" name="ConstructorPropertyInjection">
>
> <component name="Foo1Component">
> <implementation.java class="org.apache.tuscany.sca.itest.cdi.Foo1"
> />
>
> Modified:
> tuscany/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite
> (original)
> +++
> tuscany/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite
> Fri Nov 13 21:49:15 2009
> @@ -26,7 +26,7 @@
> <implementation.composite name="foo:PropertyTest" />
> <property name="number">125</property>
> <property name="complex" type="foo:MyComplexType">
> - <foo:MyComplexValue xsi:type="foo:MyComplexType">
> + <value xsi:type="foo:MyComplexType">
> <foo:a>Overriden A</foo:a>
> <foo:b>Overriden B</foo:b>
> <foo:c>Overriden C</foo:c>
> @@ -35,7 +35,7 @@
> <foo:y>Overriden Y</foo:y>
> <foo:z>Overriden Z</foo:z>
> </foo:x>
> - </foo:MyComplexValue>
> + </value>
> </property>
> </component>
> </composite>
>
> Modified:
> tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
> (original)
> +++
> tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
> Fri Nov 13 21:49:15 2009
> @@ -21,7 +21,6 @@
> import java.io.Serializable;
> import java.util.List;
>
> -import org.apache.tuscany.sca.core.ExtensionPointRegistry;
> import org.apache.tuscany.sca.interfacedef.InterfaceContract;
> import org.apache.tuscany.sca.policy.PolicySubject;
>
> @@ -113,14 +112,6 @@
> List<EndpointReference> getCallbackEndpointReferences();
>
> /**
> - * Set the extension point registry against the endpoint after it is
> deserialized as
> - * the registry needs to be re-attached
> - *
> - * @param registry
> - */
> - void setExtensionPointRegistry(ExtensionPointRegistry registry);
> -
> - /**
> * Returns true if this endpoint represents a serivce that is not
> * running in this JVM
> *
> @@ -143,4 +134,11 @@
> * @throws CloneNotSupportedException
> */
> Object clone() throws CloneNotSupportedException;
> +
> + /*
> + String getDomainURI();
> + String getNodeURI();
> + void setDomainURI(String domainURI);
> + void setNodeURI(String nodeURI);
> + */
> }
>
> Modified:
> tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
> (original)
> +++
> tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
> Fri Nov 13 21:49:15 2009
> @@ -20,7 +20,6 @@
>
> import java.io.Serializable;
>
> -import org.apache.tuscany.sca.core.ExtensionPointRegistry;
> import org.apache.tuscany.sca.interfacedef.InterfaceContract;
> import org.apache.tuscany.sca.policy.PolicySubject;
>
> @@ -164,14 +163,6 @@
> void setRemote(boolean remote);
>
> /**
> - * Set the extension point registry against the endpoint after it is
> deserialized as
> - * the registry needs to be re-attached
> - *
> - * @param registry
> - */
> - void setExtensionPointRegistry(ExtensionPointRegistry registry);
> -
> - /**
> * Rather than relying on combinations of unresolved flags and
> * other data we maintain a status enumeration
> *
>
> Modified:
> tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
> (original)
> +++
> tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
> Fri Nov 13 21:49:15 2009
> @@ -188,7 +188,7 @@
> this.uri = null;
> }
>
> - public void setExtensionPointRegistry(ExtensionPointRegistry
> registry) {
> + protected void setExtensionPointRegistry(ExtensionPointRegistry
> registry) {
> this.registry = registry;
> }
>
>
> Modified:
> tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
> (original)
> +++
> tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
> Fri Nov 13 21:49:15 2009
> @@ -61,7 +61,7 @@
> import org.apache.tuscany.sca.invocation.Invoker;
> import org.apache.tuscany.sca.invocation.Message;
> import org.apache.tuscany.sca.invocation.MessageFactory;
> -import org.apache.tuscany.sca.runtime.RuntimeWire;
> +import org.apache.tuscany.sca.runtime.Invocable;
>
> /**
> * A resource collection binding listener, implemented as a Servlet and
> @@ -81,7 +81,7 @@
> private static final String CONTENTLOCATION = "Content-Location";
> private static final SimpleDateFormat dateFormat = new
> SimpleDateFormat( "EEE, dd MMM yyyy HH:mm:ss Z" ); // RFC 822 date time
>
> - private RuntimeWire wire;
> + private Invocable wire;
> private Invoker getFeedInvoker;
> private Invoker getAllInvoker;
> private Invoker queryInvoker;
> @@ -106,7 +106,7 @@
> * @param messageFactory
> * @param feedType
> */
> - AtomBindingListenerServlet(RuntimeWire wire, MessageFactory
> messageFactory, Mediator mediator, String title, String description) {
> + AtomBindingListenerServlet(Invocable wire, MessageFactory
> messageFactory, Mediator mediator, String title, String description) {
> this.wire = wire;
> this.messageFactory = messageFactory;
> this.mediator = mediator;
>
> Modified:
> tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
> (original)
> +++
> tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
> Fri Nov 13 21:49:15 2009
> @@ -19,8 +19,6 @@
>
> package org.apache.tuscany.sca.binding.atom.provider;
>
> -import org.apache.tuscany.sca.assembly.Endpoint;
> -import org.apache.tuscany.sca.assembly.EndpointReference;
> import org.apache.tuscany.sca.binding.atom.AtomBinding;
> import org.apache.tuscany.sca.core.ExtensionPointRegistry;
> import org.apache.tuscany.sca.core.FactoryExtensionPoint;
> @@ -32,6 +30,8 @@
> import org.apache.tuscany.sca.provider.BindingProviderFactory;
> import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
> import org.apache.tuscany.sca.provider.ServiceBindingProvider;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
>
> /**
> * Implementation of a Binding provider factory for the Atom binding.
> @@ -52,11 +52,11 @@
> this.mediator =
> extensionPoints.getExtensionPoint(UtilityExtensionPoint.class).getUtility(Mediator.class);
> }
>
> - public ReferenceBindingProvider
> createReferenceBindingProvider(EndpointReference endpointReference) {
> + public ReferenceBindingProvider
> createReferenceBindingProvider(RuntimeEndpointReference endpointReference)
> {
> return new AtomReferenceBindingProvider(endpointReference,
> mediator);
> }
>
> - public ServiceBindingProvider createServiceBindingProvider(Endpoint
> endpoint) {
> + public ServiceBindingProvider
> createServiceBindingProvider(RuntimeEndpoint endpoint) {
> return new AtomServiceBindingProvider(endpoint, messageFactory,
> mediator, servletHost);
> }
>
>
> Modified:
> tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
> (original)
> +++
> tuscany/java/sca/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
> Fri Nov 13 21:49:15 2009
> @@ -19,18 +19,16 @@
>
> package org.apache.tuscany.sca.binding.atom.provider;
>
> -import org.apache.tuscany.sca.assembly.Endpoint;
> -import org.apache.tuscany.sca.assembly.Service;
> import org.apache.tuscany.sca.binding.atom.AtomBinding;
> import org.apache.tuscany.sca.databinding.Mediator;
> import org.apache.tuscany.sca.host.http.ServletHost;
> import org.apache.tuscany.sca.interfacedef.InterfaceContract;
> -import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
> import org.apache.tuscany.sca.invocation.MessageFactory;
> import org.apache.tuscany.sca.provider.ServiceBindingProvider;
> +import org.apache.tuscany.sca.runtime.Invocable;
> import org.apache.tuscany.sca.runtime.RuntimeComponent;
> import org.apache.tuscany.sca.runtime.RuntimeComponentService;
> -import org.apache.tuscany.sca.runtime.RuntimeWire;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
>
> /**
> * Implementation of the Atom binding provider.
> @@ -40,7 +38,7 @@
> class AtomServiceBindingProvider implements ServiceBindingProvider {
> private MessageFactory messageFactory;
>
> - private Endpoint endpoint;
> + private RuntimeEndpoint endpoint;
>
> private RuntimeComponent component;
> private RuntimeComponentService service;
> @@ -52,7 +50,7 @@
> private String servletMapping;
> private String bindingURI;
>
> - AtomServiceBindingProvider(Endpoint endpoint,
> + AtomServiceBindingProvider(RuntimeEndpoint endpoint,
> MessageFactory messageFactory,
> Mediator mediator,
> ServletHost servletHost) {
> @@ -66,16 +64,7 @@
> this.mediator = mediator;
>
> // TUSCANY-3166
> - this.serviceContract = service.getInterfaceContract();
> - if (this.serviceContract instanceof WSDLInterfaceContract) {
> - for (Service componentService :
> component.getImplementation().getServices()) {
> - if (componentService.getName().equals(service.getName()))
> {
> - this.serviceContract = (InterfaceContract)
> componentService.getInterfaceContract();
> - break;
> - }
> - }
> -
> - }
> + this.serviceContract = endpoint.getServiceInterfaceContract();
> }
>
> public InterfaceContract getBindingInterfaceContract() {
> @@ -87,8 +76,7 @@
> }
>
> public void start() {
> - RuntimeComponentService componentService =
> (RuntimeComponentService)service;
> - RuntimeWire wire = componentService.getRuntimeWire(binding);
> + Invocable wire = (RuntimeEndpoint) endpoint;
>
> AtomBindingListenerServlet servlet =
> new AtomBindingListenerServlet(wire, messageFactory, mediator,
> binding.getTitle(), binding.getDescription());
>
> Modified:
> tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
> (original)
> +++
> tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
> Fri Nov 13 21:49:15 2009
> @@ -18,8 +18,6 @@
> */
> package org.apache.tuscany.sca.binding.ejb.provider;
>
> -import org.apache.tuscany.sca.assembly.Endpoint;
> -import org.apache.tuscany.sca.assembly.EndpointReference;
> import org.apache.tuscany.sca.binding.ejb.EJBBinding;
> import org.apache.tuscany.sca.core.ExtensionPointRegistry;
> import org.apache.tuscany.sca.provider.BindingProviderFactory;
> @@ -27,6 +25,8 @@
> import org.apache.tuscany.sca.provider.ServiceBindingProvider;
> import org.apache.tuscany.sca.runtime.RuntimeComponent;
> import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
>
> /**
> * A factory from creating the EJB binding provider.
> @@ -39,13 +39,13 @@
> // empty constructor
> }
>
> - public ReferenceBindingProvider
> createReferenceBindingProvider(EndpointReference endpointReference) {
> + public ReferenceBindingProvider
> createReferenceBindingProvider(RuntimeEndpointReference endpointReference)
> {
> return new
> EJBBindingReferenceBindingProvider((RuntimeComponent)endpointReference.getComponent(),
> (RuntimeComponentReference)endpointReference.getReference(),
> (EJBBinding)endpointReference.getBinding());
> }
>
> - public ServiceBindingProvider createServiceBindingProvider(Endpoint
> endpoint) {
> + public ServiceBindingProvider
> createServiceBindingProvider(RuntimeEndpoint endpoint) {
> // Service Binding not supported for EJB Binding
> return null;
> }
>
> Modified:
> tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
> (original)
> +++
> tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
> Fri Nov 13 21:49:15 2009
> @@ -19,8 +19,6 @@
>
> package org.apache.tuscany.sca.binding.http.provider;
>
> -import org.apache.tuscany.sca.assembly.Endpoint;
> -import org.apache.tuscany.sca.assembly.EndpointReference;
> import org.apache.tuscany.sca.binding.http.HTTPBinding;
> import org.apache.tuscany.sca.core.ExtensionPointRegistry;
> import org.apache.tuscany.sca.core.FactoryExtensionPoint;
> @@ -30,6 +28,8 @@
> import org.apache.tuscany.sca.provider.BindingProviderFactory;
> import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
> import org.apache.tuscany.sca.provider.ServiceBindingProvider;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
>
>
> /**
> @@ -50,12 +50,12 @@
> messageFactory = modelFactories.getFactory(MessageFactory.class);
> }
>
> - public ReferenceBindingProvider
> createReferenceBindingProvider(EndpointReference endpointReference) {
> + public ReferenceBindingProvider
> createReferenceBindingProvider(RuntimeEndpointReference endpointReference)
> {
> // Binding HTTP is currently NOT supporting References
> return null;
> }
>
> - public ServiceBindingProvider createServiceBindingProvider(Endpoint
> endpoint) {
> + public ServiceBindingProvider
> createServiceBindingProvider(RuntimeEndpoint endpoint) {
> return new HTTPServiceBindingProvider(endpoint, extensionPoints,
> messageFactory, servletHost);
> }
>
>
> Modified:
> tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
> (original)
> +++
> tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
> Fri Nov 13 21:49:15 2009
> @@ -21,7 +21,6 @@
>
> import javax.servlet.Servlet;
>
> -import org.apache.tuscany.sca.assembly.Endpoint;
> import org.apache.tuscany.sca.binding.http.HTTPBinding;
> import org.apache.tuscany.sca.core.ExtensionPointRegistry;
> import org.apache.tuscany.sca.host.http.ServletHost;
> @@ -31,25 +30,25 @@
> import org.apache.tuscany.sca.invocation.Invoker;
> import org.apache.tuscany.sca.invocation.MessageFactory;
> import org.apache.tuscany.sca.invocation.Phase;
> +import org.apache.tuscany.sca.provider.EndpointProvider;
> import org.apache.tuscany.sca.provider.OperationSelectorProvider;
> import org.apache.tuscany.sca.provider.OperationSelectorProviderFactory;
> import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
> -import org.apache.tuscany.sca.provider.ServiceBindingProviderRRB;
> import org.apache.tuscany.sca.provider.WireFormatProvider;
> import org.apache.tuscany.sca.provider.WireFormatProviderFactory;
> import org.apache.tuscany.sca.runtime.RuntimeComponent;
> import org.apache.tuscany.sca.runtime.RuntimeComponentService;
> -import org.apache.tuscany.sca.runtime.RuntimeWire;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
>
> /**
> * Implementation of an HTTP binding provider.
> *
> * @version $Rev$ $Date$
> */
> -public class HTTPServiceBindingProvider implements
> ServiceBindingProviderRRB {
> +public class HTTPServiceBindingProvider implements EndpointProvider {
> private ExtensionPointRegistry extensionPoints;
>
> - private Endpoint endpoint;
> + private RuntimeEndpoint endpoint;
> private RuntimeComponent component;
> private RuntimeComponentService service;
> private InterfaceContract serviceContract;
> @@ -63,7 +62,7 @@
> private String servletMapping;
> private HTTPBindingListenerServlet bindingListenerServlet;
>
> - public HTTPServiceBindingProvider(Endpoint endpoint,
> + public HTTPServiceBindingProvider(RuntimeEndpoint endpoint,
> ExtensionPointRegistry
> extensionPoints,
> MessageFactory messageFactory,
> ServletHost servletHost) {
> @@ -86,7 +85,7 @@
> // Configure the interceptors for operation selection
> OperationSelectorProviderFactory osProviderFactory =
> (OperationSelectorProviderFactory)
> providerFactories.getProviderFactory(binding.getOperationSelector().getClass());
> if (osProviderFactory != null) {
> - this.osProvider =
> osProviderFactory.createServiceOperationSelectorProvider(component,
> service, binding);
> + this.osProvider =
> osProviderFactory.createServiceOperationSelectorProvider(endpoint);
> }
> }
>
> @@ -94,7 +93,7 @@
> // Configure the interceptors for wire format
> WireFormatProviderFactory wfProviderFactory =
> (WireFormatProviderFactory)
> providerFactories.getProviderFactory(binding.getRequestWireFormat().getClass());
> if (wfProviderFactory != null) {
> - this.wfProvider =
> wfProviderFactory.createServiceWireFormatProvider(component, service,
> binding);
> + this.wfProvider =
> wfProviderFactory.createServiceWireFormatProvider(endpoint);
> }
> }
>
> @@ -116,11 +115,9 @@
>
> public void start() {
> // Get the invokers for the supported operations
> - RuntimeComponentService componentService =
> (RuntimeComponentService) service;
> - RuntimeWire wire = componentService.getRuntimeWire(binding);
> Servlet servlet = null;
> bindingListenerServlet = new HTTPBindingListenerServlet(binding,
> messageFactory );
> - for (InvocationChain invocationChain :
> wire.getInvocationChains()) {
> + for (InvocationChain invocationChain :
> endpoint.getInvocationChains()) {
> Operation operation = invocationChain.getTargetOperation();
> String operationName = operation.getName();
> if (operationName.equals("get")) {
> @@ -195,9 +192,9 @@
> * Add specific http interceptor to invocation chain
> * @param runtimeWire
> */
> - public void configureBindingChain(RuntimeWire runtimeWire) {
> + public void configure() {
>
> - InvocationChain bindingChain =
> runtimeWire.getBindingInvocationChain();
> + InvocationChain bindingChain =
> endpoint.getBindingInvocationChain();
>
> if(osProvider != null) {
>
> bindingChain.addInterceptor(Phase.SERVICE_BINDING_OPERATION_SELECTOR,
> osProvider.createInterceptor());
>
> Modified:
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
> (original)
> +++
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
> Fri Nov 13 21:49:15 2009
> @@ -40,9 +40,8 @@
> import org.apache.tuscany.sca.invocation.Interceptor;
> import org.apache.tuscany.sca.invocation.Invoker;
> import org.apache.tuscany.sca.invocation.Message;
> -import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
> -import org.apache.tuscany.sca.runtime.RuntimeComponentService;
> -import org.apache.tuscany.sca.runtime.RuntimeWire;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
>
> /**
> *
> @@ -51,7 +50,7 @@
> public class HeaderReferenceInterceptor implements Interceptor {
>
> private Invoker next;
> - private RuntimeWire runtimeWire;
> + private RuntimeEndpointReference runtimeWire;
> private JMSResourceFactory jmsResourceFactory;
> private JMSBinding jmsBinding;
> private JMSMessageProcessor requestMessageProcessor;
> @@ -60,7 +59,7 @@
> private WireFormat requestWireFormat;
> private WireFormat responseWireFormat;
>
> - public HeaderReferenceInterceptor(JMSBinding jmsBinding,
> JMSResourceFactory jmsResourceFactory, RuntimeWire runtimeWire,
> ExtensionPointRegistry extensions) {
> + public HeaderReferenceInterceptor(ExtensionPointRegistry extensions,
> JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory,
> RuntimeEndpointReference runtimeWire) {
> super();
> this.jmsBinding = jmsBinding;
> this.runtimeWire = runtimeWire;
> @@ -85,7 +84,7 @@
>
> Operation operation = tuscanyMsg.getOperation();
> String operationName = operation.getName();
> - RuntimeComponentReference reference =
> (RuntimeComponentReference)runtimeWire.getEndpointReference().getReference();
> + RuntimeEndpointReference reference = runtimeWire;
>
> // I think the OASIS spec suggests we do not need to do
> anything with
> // @nativeOperation here on the reference side.
> @@ -145,11 +144,10 @@
> }
>
>
> - protected String getCallbackDestinationName(RuntimeComponentReference
> reference) {
> - RuntimeComponentService s =
> (RuntimeComponentService)reference.getCallbackService();
> - JMSBinding b = s.getBinding(JMSBinding.class);
> - if (b != null) {
> - JMSBindingServiceBindingProvider bp =
> (JMSBindingServiceBindingProvider)s.getBindingProvider(b);
> + protected String getCallbackDestinationName(RuntimeEndpointReference
> reference) {
> + RuntimeEndpoint endpoint = (RuntimeEndpoint)
> reference.getCallbackEndpoint();
> + if (endpoint != null) {
> + JMSBindingServiceBindingProvider bp =
> (JMSBindingServiceBindingProvider)endpoint.getBindingProvider();
> return bp.getDestinationName();
> }
> return null;
>
> Modified:
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java
> (original)
> +++
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java
> Fri Nov 13 21:49:15 2009
> @@ -41,8 +41,8 @@
>
> JMSResourceFactory rf =
> ((JMSBindingServiceBindingProvider)jmsSLD).getResourceFactory();
>
> - MessageListener listener = new
> DefaultServiceInvoker(jmsSLD.getJmsBinding(), jmsSLD.getService(),
> jmsSLD.getTargetBinding(), jmsSLD.getMessageFactory(), rf);
> - RuntimeComponentService service = jmsSLD.getService();
> + RuntimeComponentService service = (RuntimeComponentService)
> jmsSLD.getEndpoint().getService();
> + MessageListener listener = new
> DefaultServiceInvoker(jmsSLD.getEndpoint(), jmsSLD.getTargetBinding(),
> jmsSLD.getMessageFactory(), rf);
>
> // return new ASFListener(listener, service.getName(),
> service.isCallback(), jmsSLD.getJmsBinding(), workScheduler, rf);
> // TODO: 2.x migration, service.isCallback()
>
> Modified:
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java
> (original)
> +++
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java
> Fri Nov 13 21:49:15 2009
> @@ -28,11 +28,13 @@
> import javax.naming.NamingException;
>
> import org.apache.tuscany.sca.assembly.Binding;
> +import org.apache.tuscany.sca.assembly.Endpoint;
> import org.apache.tuscany.sca.binding.jms.JMSBinding;
> import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
> import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
> import org.apache.tuscany.sca.invocation.MessageFactory;
> import org.apache.tuscany.sca.runtime.RuntimeComponentService;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
>
> /**
> * TODO RRB experiement
> @@ -44,16 +46,18 @@
>
> private static final Logger logger =
> Logger.getLogger(DefaultServiceInvoker.class.getName());
>
> + private RuntimeEndpoint endpoint;
> private JMSBinding jmsBinding;
> private Binding targetBinding;
> private JMSResourceFactory jmsResourceFactory;
> private RuntimeComponentService service;
> private MessageFactory messageFactory;
>
> - public DefaultServiceInvoker(JMSBinding jmsBinding,
> RuntimeComponentService service, Binding targetBinding, MessageFactory
> messageFactory, JMSResourceFactory rf) throws NamingException {
> - this.jmsBinding = jmsBinding;
> + public DefaultServiceInvoker(RuntimeEndpoint endpoint, Binding
> targetBinding, MessageFactory messageFactory, JMSResourceFactory rf)
> throws NamingException {
> + this.endpoint = endpoint;
> + this.jmsBinding = (JMSBinding) endpoint.getBinding();
> this.jmsResourceFactory = rf;
> - this.service = service;
> + this.service = (RuntimeComponentService) endpoint.getService();
> this.targetBinding = targetBinding;
> this.messageFactory = messageFactory;
>
> @@ -86,8 +90,17 @@
>
> // call the runtime wire - the response is handled by the
> // transport interceptor
> - service.getRuntimeWire(targetBinding).invoke(tuscanyMsg);
> + getEndpoint(targetBinding).invoke(tuscanyMsg);
>
> - }
> + }
> +
> + private RuntimeEndpoint getEndpoint(Binding targetBinding) {
> + for(Endpoint ep: service.getEndpoints()) {
> + if(ep.getBinding() == targetBinding) {
> + return (RuntimeEndpoint) ep;
> + }
> + }
> + return endpoint;
> + }
>
> }
>
> Modified:
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java
> (original)
> +++
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java
> Fri Nov 13 21:49:15 2009
> @@ -22,18 +22,15 @@
> import org.apache.tuscany.sca.assembly.Binding;
> import org.apache.tuscany.sca.binding.jms.JMSBinding;
> import org.apache.tuscany.sca.invocation.MessageFactory;
> -import org.apache.tuscany.sca.runtime.RuntimeComponent;
> -import org.apache.tuscany.sca.runtime.RuntimeComponentService;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
>
> public interface JMSServiceListenerDetails {
>
> JMSBinding getJmsBinding();
>
> Binding getTargetBinding();
> -
> - RuntimeComponentService getService();
> -
> - RuntimeComponent getComponent();
> +
> + RuntimeEndpoint getEndpoint();
>
> MessageFactory getMessageFactory();
>
>
> Modified:
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
> (original)
> +++
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
> Fri Nov 13 21:49:15 2009
> @@ -19,14 +19,12 @@
>
> package
> org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.runtime;
>
> -import org.apache.tuscany.sca.assembly.Binding;
> import
> org.apache.tuscany.sca.binding.jms.operationselector.OperationSelectorJMSDefault;
> import org.apache.tuscany.sca.core.ExtensionPointRegistry;
> import org.apache.tuscany.sca.provider.OperationSelectorProvider;
> import org.apache.tuscany.sca.provider.OperationSelectorProviderFactory;
> -import org.apache.tuscany.sca.runtime.RuntimeComponent;
> -import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
> -import org.apache.tuscany.sca.runtime.RuntimeComponentService;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
>
> /**
> * @version $Rev$ $Date$
> @@ -41,18 +39,14 @@
>
> /**
> */
> - public OperationSelectorProvider
> createReferenceOperationSelectorProvider(RuntimeComponent component,
> -
> RuntimeComponentReference reference,
> - Binding binding)
> {
> + public OperationSelectorProvider
> createReferenceOperationSelectorProvider(RuntimeEndpointReference
> endpointReference) {
> return null;
> }
>
> /**
> */
> - public OperationSelectorProvider
> createServiceOperationSelectorProvider(RuntimeComponent component,
> -
> RuntimeComponentService service,
> - Binding
> binding) {
> - return new OperationSelectorJMSDefaultServiceProvider(registry,
> component, service, binding);
> + public OperationSelectorProvider
> createServiceOperationSelectorProvider(RuntimeEndpoint endpoint) {
> + return new OperationSelectorJMSDefaultServiceProvider(registry,
> endpoint);
> }
>
> /**
>
> Modified:
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
> (original)
> +++
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
> Fri Nov 13 21:49:15 2009
> @@ -45,7 +45,7 @@
> import org.apache.tuscany.sca.invocation.Invoker;
> import org.apache.tuscany.sca.invocation.Message;
> import org.apache.tuscany.sca.runtime.RuntimeComponentService;
> -import org.apache.tuscany.sca.runtime.RuntimeWire;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
>
> /**
> * Policy handler to handle PolicySet related to Logging with the QName
> @@ -58,7 +58,7 @@
> private static final String ON_MESSAGE_METHOD_NAME = "onMessage";
>
> private Invoker next;
> - private RuntimeWire runtimeWire;
> + private RuntimeEndpoint endpint;
> private JMSResourceFactory jmsResourceFactory;
> private JMSBinding jmsBinding;
> private JMSMessageProcessor requestMessageProcessor;
> @@ -67,15 +67,14 @@
> private List<Operation> serviceOperations;
>
>
> - public
> OperationSelectorJMSDefaultServiceInterceptor(ExtensionPointRegistry
> registry, JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory,
> - RuntimeWire runtimeWire) {
> + public
> OperationSelectorJMSDefaultServiceInterceptor(ExtensionPointRegistry
> registry, JMSResourceFactory jmsResourceFactory, RuntimeEndpoint endpoint)
> {
> super();
> - this.jmsBinding = jmsBinding;
> - this.runtimeWire = runtimeWire;
> + this.endpint = endpoint;
> + this.jmsBinding = (JMSBinding) endpoint.getBinding();
> this.jmsResourceFactory = jmsResourceFactory;
> this.requestMessageProcessor =
> JMSMessageProcessorUtil.getRequestMessageProcessor(registry, jmsBinding);
> this.responseMessageProcessor =
> JMSMessageProcessorUtil.getResponseMessageProcessor(registry, jmsBinding);
> - this.service =
> (RuntimeComponentService)runtimeWire.getEndpoint().getService();
> + this.service = (RuntimeComponentService)endpoint.getService();
> this.serviceOperations =
> service.getInterfaceContract().getInterface().getOperations();
> }
>
>
> Modified:
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
> (original)
> +++
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
> Fri Nov 13 21:49:15 2009
> @@ -19,38 +19,29 @@
>
> package
> org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.runtime;
>
> -import org.apache.tuscany.sca.assembly.Binding;
> -import org.apache.tuscany.sca.binding.jms.JMSBinding;
> import org.apache.tuscany.sca.core.ExtensionPointRegistry;
> import org.apache.tuscany.sca.invocation.Interceptor;
> import org.apache.tuscany.sca.invocation.Phase;
> import org.apache.tuscany.sca.provider.OperationSelectorProvider;
> -import org.apache.tuscany.sca.runtime.RuntimeComponent;
> -import org.apache.tuscany.sca.runtime.RuntimeComponentService;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
>
> /**
> * @version $Rev$ $Date$
> */
> public class OperationSelectorJMSDefaultServiceProvider implements
> OperationSelectorProvider {
> - private RuntimeComponent component;
> - private RuntimeComponentService service;
> - private Binding binding;
> + private RuntimeEndpoint endpoint;
> private ExtensionPointRegistry registry;
> -
> - public
> OperationSelectorJMSDefaultServiceProvider(ExtensionPointRegistry
> registry, RuntimeComponent component, RuntimeComponentService service,
> Binding binding) {
> +
> + public
> OperationSelectorJMSDefaultServiceProvider(ExtensionPointRegistry
> registry, RuntimeEndpoint endpoint) {
> super();
> - this.component = component;
> - this.service = service;
> - this.binding = binding;
> + this.endpoint = endpoint;
> this.registry = registry;
> }
>
> /**
> */
> public Interceptor createInterceptor() {
> - return new
> OperationSelectorJMSDefaultServiceInterceptor(registry,
> (JMSBinding)binding,
> - null,
> -
> service.getRuntimeWire(binding));
> + return new
> OperationSelectorJMSDefaultServiceInterceptor(registry, null, endpoint);
> }
>
> /**
>
> Modified:
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java
> (original)
> +++
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java
> Fri Nov 13 21:49:15 2009
> @@ -19,14 +19,12 @@
>
> package
> org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop.runtime;
>
> -import org.apache.tuscany.sca.assembly.Binding;
> import
> org.apache.tuscany.sca.binding.jms.operationselector.OperationSelectorJMSUserProp;
> import org.apache.tuscany.sca.core.ExtensionPointRegistry;
> import org.apache.tuscany.sca.provider.OperationSelectorProvider;
> import org.apache.tuscany.sca.provider.OperationSelectorProviderFactory;
> -import org.apache.tuscany.sca.runtime.RuntimeComponent;
> -import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
> -import org.apache.tuscany.sca.runtime.RuntimeComponentService;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
>
> public class OperationSelectorJMSUserPropProviderFactory implements
> OperationSelectorProviderFactory<OperationSelectorJMSUserProp> {
> private ExtensionPointRegistry registry;
> @@ -38,18 +36,14 @@
>
> /**
> */
> - public OperationSelectorProvider
> createReferenceOperationSelectorProvider(RuntimeComponent component,
> -
> RuntimeComponentReference reference,
> - Binding binding)
> {
> + public OperationSelectorProvider
> createReferenceOperationSelectorProvider(RuntimeEndpointReference
> endpointReference) {
> return null;
> }
>
> /**
> */
> - public OperationSelectorProvider
> createServiceOperationSelectorProvider(RuntimeComponent component,
> -
> RuntimeComponentService service,
> - Binding
> binding) {
> - return new OperationSelectorJMSUserPropServiceProvider(component,
> service, binding);
> + public OperationSelectorProvider
> createServiceOperationSelectorProvider(RuntimeEndpoint endpoint) {
> + return new OperationSelectorJMSUserPropServiceProvider(endpoint);
> }
>
> /**
>
> Modified:
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java
> (original)
> +++
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java
> Fri Nov 13 21:49:15 2009
> @@ -31,7 +31,7 @@
> import org.apache.tuscany.sca.invocation.Invoker;
> import org.apache.tuscany.sca.invocation.Message;
> import org.apache.tuscany.sca.runtime.RuntimeComponentService;
> -import org.apache.tuscany.sca.runtime.RuntimeWire;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
>
> /**
> * Interceptor for user property based operation selection
> @@ -42,18 +42,18 @@
> public class OperationSelectorJMSUserPropServiceInterceptor implements
> Interceptor {
>
> private Invoker next;
> - private RuntimeWire runtimeWire;
> + private RuntimeEndpoint endpoint;
> private JMSBinding jmsBinding;
> private OperationSelectorJMSUserProp operationSelector;
> private RuntimeComponentService service;
> private List<Operation> serviceOperations;
>
> - public OperationSelectorJMSUserPropServiceInterceptor(JMSBinding
> jmsBinding, RuntimeWire runtimeWire) {
> + public OperationSelectorJMSUserPropServiceInterceptor(RuntimeEndpoint
> endpoint) {
> super();
> - this.jmsBinding = jmsBinding;
> + this.jmsBinding = (JMSBinding) endpoint.getBinding();
> this.operationSelector =
> (OperationSelectorJMSUserProp)jmsBinding.getOperationSelector();
> - this.runtimeWire = runtimeWire;
> - this.service = (RuntimeComponentService)
> runtimeWire.getEndpoint().getService();
> + this.endpoint = endpoint;
> + this.service = (RuntimeComponentService) endpoint.getService();
> this.serviceOperations =
> service.getInterfaceContract().getInterface().getOperations();
> }
>
>
> Modified:
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java
> (original)
> +++
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java
> Fri Nov 13 21:49:15 2009
> @@ -19,30 +19,23 @@
>
> package
> org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop.runtime;
>
> -import org.apache.tuscany.sca.assembly.Binding;
> -import org.apache.tuscany.sca.binding.jms.JMSBinding;
> import org.apache.tuscany.sca.invocation.Interceptor;
> import org.apache.tuscany.sca.invocation.Phase;
> import org.apache.tuscany.sca.provider.OperationSelectorProvider;
> -import org.apache.tuscany.sca.runtime.RuntimeComponent;
> -import org.apache.tuscany.sca.runtime.RuntimeComponentService;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
>
> public class OperationSelectorJMSUserPropServiceProvider implements
> OperationSelectorProvider {
> - private RuntimeComponent component;
> - private RuntimeComponentService service;
> - private Binding binding;
> + private RuntimeEndpoint endpoint;
>
> - public OperationSelectorJMSUserPropServiceProvider(RuntimeComponent
> component, RuntimeComponentService service, Binding binding) {
> + public OperationSelectorJMSUserPropServiceProvider(RuntimeEndpoint
> endpoint) {
> super();
> - this.component = component;
> - this.service = service;
> - this.binding = binding;
> + this.endpoint = endpoint;
> }
>
> /**
> */
> public Interceptor createInterceptor() {
> - return new
> OperationSelectorJMSUserPropServiceInterceptor((JMSBinding)binding,
> service.getRuntimeWire(binding));
> + return new
> OperationSelectorJMSUserPropServiceInterceptor(endpoint);
> }
>
> /**
>
> Modified:
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
> (original)
> +++
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
> Fri Nov 13 21:49:15 2009
> @@ -19,8 +19,6 @@
>
> package org.apache.tuscany.sca.binding.jms.provider;
>
> -import org.apache.tuscany.sca.assembly.Endpoint;
> -import org.apache.tuscany.sca.assembly.EndpointReference;
> import org.apache.tuscany.sca.binding.jms.JMSBinding;
> import
> org.apache.tuscany.sca.binding.jms.host.DefaultJMSHostExtensionPoint;
> import org.apache.tuscany.sca.binding.jms.host.JMSHostExtensionPoint;
> @@ -29,9 +27,8 @@
> import org.apache.tuscany.sca.provider.BindingProviderFactory;
> import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
> import org.apache.tuscany.sca.provider.ServiceBindingProvider;
> -import org.apache.tuscany.sca.runtime.RuntimeComponent;
> -import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
> -import org.apache.tuscany.sca.runtime.RuntimeComponentService;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
>
> /**
> * A factory from creating the JMS binding provider.
> @@ -61,15 +58,15 @@
> serviceListenerFactory =
> jmsHostExtensionPoint.getJMSServiceListenerFactory();
> }
>
> - public ReferenceBindingProvider
> createReferenceBindingProvider(EndpointReference endpointReference) {
> + public ReferenceBindingProvider
> createReferenceBindingProvider(RuntimeEndpointReference endpointReference)
> {
> JMSResourceFactory jmsRF =
> jmsRFEP.createJMSResourceFactory((JMSBinding)endpointReference.getBinding());
> - return new
> JMSBindingReferenceBindingProvider((RuntimeComponent)endpointReference.getComponent(),
> (RuntimeComponentReference) endpointReference.getReference(),
> (JMSBinding)endpointReference.getBinding(), extensionPoints, jmsRF);
> + return new JMSBindingReferenceBindingProvider(endpointReference,
> extensionPoints, jmsRF);
> }
>
> - public ServiceBindingProvider createServiceBindingProvider(Endpoint
> endpoint) {
> + public ServiceBindingProvider
> createServiceBindingProvider(RuntimeEndpoint endpoint) {
> JMSBinding binding = (JMSBinding)endpoint.getBinding();
> JMSResourceFactory jmsRF =
> jmsRFEP.createJMSResourceFactory(binding);
> - return new JMSBindingServiceBindingProvider(extensionPoints,
> (RuntimeComponent)endpoint.getComponent(),
> (RuntimeComponentService)endpoint.getService(), binding, binding,
> serviceListenerFactory, extensionPoints, jmsRF);
> + return new JMSBindingServiceBindingProvider(extensionPoints,
> endpoint, serviceListenerFactory, extensionPoints, jmsRF);
> }
>
> public Class<JMSBinding> getModelType() {
>
> Modified:
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java?rev=836009&r1=836008&r2=836009&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
> (original)
> +++
> tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
> Fri Nov 13 21:49:15 2009
> @@ -31,21 +31,22 @@
> import org.apache.tuscany.sca.invocation.InvocationChain;
> import org.apache.tuscany.sca.invocation.Invoker;
> import org.apache.tuscany.sca.invocation.Phase;
> +import org.apache.tuscany.sca.provider.EndpointReferenceProvider;
> import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
> -import org.apache.tuscany.sca.provider.ReferenceBindingProviderRRB;
> import org.apache.tuscany.sca.provider.WireFormatProvider;
> import org.apache.tuscany.sca.provider.WireFormatProviderFactory;
> import org.apache.tuscany.sca.runtime.RuntimeComponent;
> import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
> -import org.apache.tuscany.sca.runtime.RuntimeWire;
> +import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
>
> /**
> * Implementation of the JMS reference binding provider.
> *
> * @version $Rev$ $Date$
> */
> -public class JMSBindingReferenceBindingProvider implements
> ReferenceBindingProviderRRB {
> +public class JMSBindingReferenceBindingProvider implements
> EndpointReferenceProvider {
>
> + private RuntimeEndpointReference endpointReference;
> private RuntimeComponentReference reference;
> private JMSBinding jmsBinding;
> private JMSResourceFactory jmsResourceFactory;
> @@ -61,11 +62,12 @@
> private WireFormatProviderFactory responseWireFormatProviderFactory;
> private WireFormatProvider responseWireFormatProvider;
>
> - public JMSBindingReferenceBindingProvider(RuntimeComponent component,
> RuntimeComponentReference reference, JMSBinding binding,
> ExtensionPointRegistry extensions, JMSResourceFactory jmsResourceFactory)
> {
> - this.reference = reference;
> - this.jmsBinding = binding;
> + public JMSBindingReferenceBindingProvider(RuntimeEndpointReference
> endpointReference, ExtensionPointRegistry extensions, JMSResourceFactory
> jmsResourceFactory) {
> + this.endpointReference = endpointReference;
> + this.reference = (RuntimeComponentReference)
> endpointReference.getReference();
> + this.jmsBinding = (JMSBinding) endpointReference.getBinding();
> this.extensions = extensions;
> - this.component = component;
> + this.component = (RuntimeComponent)
> endpointReference.getComponent();
> this.jmsResourceFactory = jmsResourceFactory;
>
> // Get the factories/providers for operation selection
> @@ -75,13 +77,13 @@
> this.requestWireFormatProviderFactory =
>
> (WireFormatProviderFactory)providerFactories.getProviderFactory(jmsBinding.getRequestWireFormat().getClass());
> if (this.requestWireFormatProviderFactory != null){
> - this.requestWireFormatProvider =
> requestWireFormatProviderFactory.createReferenceWireFormatProvider(component,
> reference, jmsBinding);
> + this.requestWireFormatProvider =
> requestWireFormatProviderFactory.createReferenceWireFormatProvider(endpointReference);
> }
>
> this.responseWireFormatProviderFactory =
>
> (WireFormatProviderFactory)providerFactories.getProviderFactory(jmsBinding.getResponseWireFormat().getClass());
> if (this.responseWireFormatProviderFactory != null){
> - this.responseWireFormatProvider =
> responseWireFormatProviderFactory.createReferenceWireFormatProvider(component,
> reference, jmsBinding);
> + this.responseWireFormatProvider =
> responseWireFormatProviderFactory.createReferenceWireFormatProvider(endpointReference);
> }
>
> // create an interface contract that reflects both request and
> response
> @@ -105,7 +107,7 @@
> }
>
> Invoker invoker = null;
> - invoker = new RRBJMSBindingInvoker(jmsBinding, operation,
> jmsResourceFactory, reference);
> + invoker = new RRBJMSBindingInvoker(operation, jmsResourceFactory,
> endpointReference);
>
> return invoker;
> }
> @@ -135,15 +137,15 @@
> * set up the reference binding wire with the right set of jms
> reference
> * interceptors
> */
> - public void configureBindingChain(RuntimeWire runtimeWire) {
> + public void configure() {
>
> - InvocationChain bindingChain =
> runtimeWire.getBindingInvocationChain();
> + InvocationChain bindingChain =
> endpointReference.getBindingInvocationChain();
>
> // add transport interceptor
> bindingChain.addInterceptor(Phase.REFERENCE_BINDING_TRANSPORT,
> new
> TransportReferenceInterceptor(jmsBinding,
>
> jmsResourceFactory,
> -
> runtimeWire) );
> +
> endpointReference) );
>
> // add request wire format
> bindingChain.addInterceptor(requestWireFormatProvider.getPhase(),
> @@ -158,9 +160,10 @@
> // add the header processor that comes after the wire formatter
> but before the
> // policy interceptors
> bindingChain.addInterceptor(Phase.REFERENCE_BINDING_WIREFORMAT,
> - new
> HeaderReferenceInterceptor(jmsBinding,
> + new
> HeaderReferenceInterceptor(extensions,
> +
> jmsBinding,
>
> jmsResourceFactory,
> -
> runtimeWire, extensions) );
> +
> endpointReference) );
> }
>
> }
>
>
Re: [2.x] Update on RuntimeEndpoint/RuntimeEndpointReference SPIs,
Re: svn commit: r836009 [1/7]
Posted by Simon Laws <si...@googlemail.com>.
The thought that comes to mind is that InvocationChain would be more
indicative of the purpose of the interface.
Simon
Re: [2.x] Update on RuntimeEndpoint/RuntimeEndpointReference SPIs, Re: svn commit: r836009 [1/7]
Posted by Raymond Feng <en...@gmail.com>.
Hi,
What's a good base term for RuntimeEndpoint and RuntimeEndpointReference? I
use Invocable at this moment. If we can agree on that (say XYZ), we can then
use XYZProcessor ...
Thanks,
Raymond
--------------------------------------------------
From: "Simon Laws" <si...@googlemail.com>
Sent: Monday, November 16, 2009 6:24 AM
To: <de...@tuscany.apache.org>
Subject: Re: [2.x] Update on RuntimeEndpoint/RuntimeEndpointReference SPIs,
Re: svn commit: r836009 [1/7]
> Thanks for the heads up Raymond. Something else I'd like to add to the
> list for consideration....
>
> - The naming of the RuntimeWireProcessor and its associated extension
> point.
>
> Seems a little odd now that we don't have runtime wires.
> ChainProcessor? Don't want to make change for changes sake so could
> live with it as is. WDYT?
>
> Simon
Re: [2.x] Update on RuntimeEndpoint/RuntimeEndpointReference SPIs,
Re: svn commit: r836009 [1/7]
Posted by Simon Laws <si...@googlemail.com>.
Thanks for the heads up Raymond. Something else I'd like to add to the
list for consideration....
- The naming of the RuntimeWireProcessor and its associated extension point.
Seems a little odd now that we don't have runtime wires.
ChainProcessor? Don't want to make change for changes sake so could
live with it as is. WDYT?
Simon