You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/09/08 00:23:43 UTC
svn commit: r573734 - in
/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core:
assembly/EndpointReferenceImpl.java context/CallableReferenceImpl.java
Author: jsdelfino
Date: Fri Sep 7 15:23:43 2007
New Revision: 573734
URL: http://svn.apache.org/viewvc?rev=573734&view=rev
Log:
Added a FIXME comment. Fixed algorithm to determine component URI.
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java?rev=573734&r1=573733&r2=573734&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java Fri Sep 7 15:23:43 2007
@@ -51,7 +51,7 @@
this.contract = contract;
this.binding = binding;
this.interfaceContract = interfaceContract;
- this.uri = (component != null ? component.getName() : "") + '/' +
+ this.uri = (component != null ? component.getURI() : "") + '/' +
(contract != null ? contract.getName() : "");
}
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java?rev=573734&r1=573733&r2=573734&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java Fri Sep 7 15:23:43 2007
@@ -151,6 +151,7 @@
public B getInstance() throws ObjectCreationException {
try {
resolve();
+ //FIXME Can't we just return a single proxy
return businessInterface.cast(proxyFactory.createProxy(this));
} catch (Exception e) {
throw new ObjectCreationException(e);
@@ -218,13 +219,13 @@
this.conversationID = parameters.getConversationID();
this.componentURI = parameters.getComponentURI();
}
- URI uri = URI.create("/" + componentURI);
+ URI uri = URI.create(componentURI + "/");
for (Binding binding : reference.getBindings()) {
if (binding instanceof WireableBinding) {
String targetURI = uri.resolve(binding.getURI()).toString();
int index = targetURI.lastIndexOf('/');
String serviceName = targetURI.substring(index + 1);
- targetURI = targetURI.substring(1, index);
+ targetURI = targetURI.substring(0, index);
Component targetComponet = compositeActivator.resolve(targetURI);
ComponentService targetService = null;
if (targetComponet != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org