Author: slaws
Date: Thu Aug 25 11:51:11 2011
New Revision: 1161525
URL: http://svn.apache.org/viewvc?rev=1161525&view=rev
Log:
Allow the binding.sca URI to be configured with the base URI as with all other
bindings. The default binding now delegates to other remote bindings which
require access to the properly based URI. I've had to make a change to the
hazelcast binding that was assuming that the binding URI was the same as the
EPR URI which is not the case.
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java?rev=1161525&r1=1161524&r2=1161525&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
Thu Aug 25 11:51:11 2011
@@ -225,16 +225,14 @@ public class BindingURIBuilderImpl imple
// calculate the base URI
URI baseURI = null;
- if (!(binding instanceof SCABinding)) {
- if (defaultBindings != null) {
- List<String> uris = defaultBindings.get(binding.getType());
+ if (defaultBindings != null) {
+ List<String> uris = defaultBindings.get(binding.getType());
+ if (uris != null && uris.size() > 0) {
+ baseURI = new URI(addSlashToPath(uris.get(0)));
+ } else {
+ uris = defaultBindings.get(DEFAULT);
if (uris != null && uris.size() > 0) {
baseURI = new URI(addSlashToPath(uris.get(0)));
- } else {
- uris = defaultBindings.get(DEFAULT);
- if (uris != null && uris.size() > 0) {
- baseURI = new URI(addSlashToPath(uris.get(0)));
- }
}
}
}
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java?rev=1161525&r1=1161524&r2=1161525&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java
Thu Aug 25 11:51:11 2011
@@ -39,7 +39,7 @@ public class HazelcastBindingProviderFac
public ReferenceBindingProvider
createReferenceBindingProvider(RuntimeEndpointReference endpointReference) {
InterfaceContract interfaceContract =
endpointReference.getGeneratedWSDLContract(endpointReference.getComponentReferenceInterfaceContract());
interfaceContract.getInterface().resetDataBinding(DOMDataBinding.NAME);
- return new HazelcastReferenceBindingProvider(extensionsRegistry,
endpointReference.getBinding().getURI(), interfaceContract);
+ return new HazelcastReferenceBindingProvider(extensionsRegistry,
endpointReference.getTargetEndpoint().getURI(), interfaceContract);
}
public ServiceBindingProvider createServiceBindingProvider(RuntimeEndpoint
endpoint) {
