Author: lresende
Date: Fri Apr 18 17:16:35 2008
New Revision: 649730
URL: http://svn.apache.org/viewvc?rev=649730&view=rev
Log:
Minor cleanup to get the helloworld-reference test to pass
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java?rev=649730&r1=649729&r2=649730&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
Fri Apr 18 17:16:35 2008
@@ -21,7 +21,6 @@
import java.util.concurrent.Callable;
import javax.wsdl.Part;
-import javax.wsdl.Service;
import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
@@ -31,7 +30,6 @@
import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
import org.apache.ode.bpel.iapi.Scheduler;
import org.apache.ode.utils.DOMUtils;
-import org.apache.tuscany.sca.interfacedef.Interface;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
@@ -207,7 +205,6 @@
Element parameters = odeMessage.getPart("parameters");
if (parameters != null && parameters.hasChildNodes()) {
- // payload = (Element) parameters.getFirstChild().getFirstChild();
payload = (Element)parameters.getFirstChild();
}
@@ -243,27 +240,29 @@
}
- private Message createResponseMessage(PartnerRoleMessageExchange
partnerRoleMessageExchange, Operation operation, Element invocationResult) {
- Document dom = DOMUtils.newDocument();
-
- String operationName = operation.getName();
- Part bpelOperationOutputPart = (Part)
((WSDLInterface)operation.getInterface()).getPortType().getOperation(operationName,null,null).getOutput().getMessage().getParts().values().iterator().next();
-
+ private Message createResponseMessage(PartnerRoleMessageExchange
partnerRoleMessageExchange,
+ Operation operation,
+ Element invocationResult) {
+ Document dom = DOMUtils.newDocument();
+
+ String operationName = operation.getName();
+ Part bpelOperationOutputPart =
+
(Part)((WSDLInterface)operation.getInterface()).getPortType().getOperation(operationName,
null, null)
+
.getOutput().getMessage().getParts().values().iterator().next();
+
Element contentMessage = dom.createElement("message");
Element contentPart =
dom.createElement(bpelOperationOutputPart.getName());
- //Element contentPart2 =
dom.createElement(partnerRoleMessageExchange.getOperation().getOutput().getName());
-
+
contentPart.appendChild(dom.importNode(invocationResult, true));
- //contentPart.appendChild(dom.importNode(contentPart2, true));
contentMessage.appendChild(contentPart);
dom.appendChild(contentMessage);
-
+
System.out.println("::result message:: " +
DOMUtils.domToString(dom.getDocumentElement()));
- QName id =
partnerRoleMessageExchange.getOperation().getOutput().getMessage().getQName();
- Message response = partnerRoleMessageExchange.createMessage(id);
- response.setMessage(dom.getDocumentElement());
-
+ QName id =
partnerRoleMessageExchange.getOperation().getOutput().getMessage().getQName();
+ Message response = partnerRoleMessageExchange.createMessage(id);
+ response.setMessage(dom.getDocumentElement());
+
return response;
}
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java?rev=649730&r1=649729&r2=649730&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
Fri Apr 18 17:16:35 2008
@@ -119,20 +119,21 @@
/**
* Find the SCA Reference operation
+ *
* @param operationName
* @param runtimeComponentReference
* @return
*/
private Operation findOperation(String operationName,
RuntimeComponentReference runtimeComponentReference) {
- Operation reseultOperation = null;
-
- for(Operation operation :
runtimeComponentReference.getInterfaceContract().getInterface().getOperations())
{
- if (operationName.equalsIgnoreCase(operation.getName())) {
- reseultOperation = operation;
- break;
- }
- }
- return reseultOperation;
+ Operation reseultOperation = null;
+
+ for(Operation operation :
runtimeComponentReference.getInterfaceContract().getInterface().getOperations())
{
+ if (operationName.equalsIgnoreCase(operation.getName())) {
+ reseultOperation = operation;
+ break;
+ }
+ }
+ return reseultOperation;
}
/**
@@ -141,14 +142,14 @@
* @return
*/
private Element getPayload(Message odeMessage) {
- Element payload = null;
- Element parameters = odeMessage.getPart("parameters");
-
- if( parameters != null && parameters.hasChildNodes()) {
- payload = (Element) parameters.getFirstChild().getFirstChild();
- }
-
- return payload;
+ Element payload = null;
+ Element parameters = odeMessage.getPart("parameters");
+
+ if (parameters != null && parameters.hasChildNodes()) {
+ payload = (Element)parameters.getFirstChild();
+ }
+
+ return payload;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
