servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r392635 - in /incubator/servicemix/trunk/servicemix-bpe/src: main/java/org/apache/servicemix/bpe/ main/java/org/apache/servicemix/bpe/external/ main/java/org/apache/servicemix/bpe/timer/ test/java/loanbroker/ test/resources/loanbroker/
Date Sat, 08 Apr 2006 23:39:31 GMT
Author: gnodet
Date: Sat Apr  8 16:39:28 2006
New Revision: 392635

URL: http://svn.apache.org/viewcvs?rev=392635&view=rev
Log:
SM-376: wsdl:part name must be "payload"   	
Message parts are now retrieved from the wsdl associated to the bpel process.

Modified:
    incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEComponent.java
    incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEDeployer.java
    incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEEndpoint.java
    incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEServiceUnit.java
    incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/external/JbiInvokeAction.java
    incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/timer/BPETimerJdk.java
    incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/timer/BPETimerServiceJdk.java
    incubator/servicemix/trunk/servicemix-bpe/src/test/java/loanbroker/CreditAgency.java
    incubator/servicemix/trunk/servicemix-bpe/src/test/resources/loanbroker/creditagency.wsdl
    incubator/servicemix/trunk/servicemix-bpe/src/test/resources/loanbroker/loanbroker.bpel

Modified: incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEComponent.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEComponent.java?rev=392635&r1=392634&r2=392635&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEComponent.java
(original)
+++ incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEComponent.java
Sat Apr  8 16:39:28 2006
@@ -26,16 +26,6 @@
 
     public static String PART_PAYLOAD = "payload";
     
-    private static final ThreadLocal COMPONENT = new ThreadLocal();
-    
-    public static BPEComponent getCurrent() {
-        return (BPEComponent) COMPONENT.get();
-    }
-    
-    public static void setCurrent(BPEComponent component) {
-        COMPONENT.set(component);
-    }
-    
     public BPEComponent() {
     }
     

Modified: incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEDeployer.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEDeployer.java?rev=392635&r1=392634&r2=392635&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEDeployer.java
(original)
+++ incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEDeployer.java
Sat Apr  8 16:39:28 2006
@@ -29,7 +29,6 @@
 import javax.wsdl.Definition;
 import javax.wsdl.Import;
 import javax.wsdl.Message;
-import javax.wsdl.Part;
 import javax.wsdl.Port;
 import javax.wsdl.Service;
 import javax.wsdl.WSDLException;
@@ -87,7 +86,8 @@
             su.setName(serviceUnitName);
             su.setRootPath(serviceUnitRootPath);
 			Definition rootDef = loadMainWsdl(serviceUnitRootPath);
-            checkDefinition(rootDef);
+            checkDefinition(rootDef, true);
+            su.setDefinition(rootDef);
             WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter();
             WSDLFlattener flattener = new WSDLFlattener(rootDef);
 			for (Iterator it = rootDef.getServices().values().iterator(); it.hasNext();) {
@@ -115,7 +115,7 @@
 		}
 	}
 
-	protected void checkDefinition(Definition rootDef) throws DeploymentException {
+	protected void checkDefinition(Definition rootDef, boolean main) throws DeploymentException
{
         // Check that messages have only one part named "payload"
         Collection msgs = rootDef.getMessages().values();
         for (Iterator iter = msgs.iterator(); iter.hasNext();) {
@@ -123,12 +123,6 @@
             if (msg.getParts().size() > 1) {
                 throw failure("deploy", 
                         "WSDL Message '" + msg.getQName() + "' has more than one part", null);
-            } else if (msg.getParts().size() == 1) {
-                Part part = (Part) msg.getParts().values().iterator().next();
-                if (!part.getName().equals(BPEComponent.PART_PAYLOAD)) {
-                    throw failure("deploy", 
-                            "WSDL Message '" + msg.getQName() + "' part should be named 'payload'",
null);
-                }
             }
         }
         // Check imported wsdls
@@ -137,7 +131,7 @@
             List imps = (List) iter.next();
             for (Iterator iterator = imps.iterator(); iterator.hasNext();) {
                 Import imp = (Import) iterator.next();
-                checkDefinition(imp.getDefinition());
+                checkDefinition(imp.getDefinition(), false);
             }
         }
     }

Modified: incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEEndpoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEEndpoint.java?rev=392635&r1=392634&r2=392635&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEEndpoint.java
(original)
+++ incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEEndpoint.java
Sat Apr  8 16:39:28 2006
@@ -15,6 +15,8 @@
  */
 package org.apache.servicemix.bpe;
 
+import java.util.Map;
+
 import javax.jbi.component.ComponentContext;
 import javax.jbi.messaging.DeliveryChannel;
 import javax.jbi.messaging.ExchangeStatus;
@@ -27,13 +29,10 @@
 import javax.jbi.messaging.RobustInOnly;
 import javax.jbi.messaging.MessageExchange.Role;
 import javax.jbi.servicedesc.ServiceEndpoint;
+import javax.wsdl.Operation;
+import javax.wsdl.PortType;
 import javax.xml.transform.dom.DOMSource;
 
-import org.apache.servicemix.common.Endpoint;
-import org.apache.servicemix.common.ExchangeProcessor;
-import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.w3c.dom.Document;
-
 import org.apache.ode.bpe.bped.EventDirector;
 import org.apache.ode.bpe.client.IFormattableValue;
 import org.apache.ode.bpe.event.BPELStaticKey;
@@ -43,6 +42,10 @@
 import org.apache.ode.bpe.interaction.InvocationFactory;
 import org.apache.ode.bpe.interaction.XMLInteractionObject;
 import org.apache.ode.bpe.scope.service.BPRuntimeException;
+import org.apache.servicemix.common.Endpoint;
+import org.apache.servicemix.common.ExchangeProcessor;
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.w3c.dom.Document;
 
 public class BPEEndpoint extends Endpoint implements ExchangeProcessor {
 
@@ -50,6 +53,16 @@
     protected DeliveryChannel channel;
     protected SourceTransformer transformer = new SourceTransformer();
 	
+    private static final ThreadLocal ENDPOINT = new ThreadLocal();
+    
+    public static BPEEndpoint getCurrent() {
+        return (BPEEndpoint) ENDPOINT.get();
+    }
+    
+    public static void setCurrent(BPEEndpoint endpoint) {
+        ENDPOINT.set(endpoint);
+    }
+    
 	public Role getRole() {
 		return Role.PROVIDER;
 	}
@@ -79,6 +92,22 @@
             return;
         }
         
+        String inputPartName = BPEComponent.PART_PAYLOAD;
+        String outputPartName = BPEComponent.PART_PAYLOAD;
+        if (exchange.getOperation() != null) {
+            PortType pt = getDefinition().getPortType(getInterfaceName());
+            Operation oper = pt.getOperation(exchange.getOperation().getLocalPart(), null,
null);
+            if (oper.getInput() != null && oper.getInput().getMessage() != null)
{
+                Map parts = oper.getInput().getMessage().getParts();
+                inputPartName = (String) parts.keySet().iterator().next(); 
+            }
+            if (oper.getOutput() != null && oper.getOutput().getMessage() != null)
{
+                Map parts = oper.getOutput().getMessage().getParts();
+                outputPartName = (String) parts.keySet().iterator().next(); 
+            }
+        }
+        
+        
 		BPELStaticKey bsk = new BPELStaticKey();
 		bsk.setTargetNamespace(getInterfaceName().getNamespaceURI());
 		bsk.setPortType(getInterfaceName().getLocalPart());
@@ -89,18 +118,18 @@
 		msg.setStaticKey(bsk);
 		XMLInteractionObject interaction = new XMLInteractionObject();
 		interaction.setDocument((Document) transformer.toDOMNode(exchange.getMessage("in")));
-		msg.setPart(BPEComponent.PART_PAYLOAD, interaction);
+		msg.setPart(inputPartName, interaction);
         
         EventDirector ed = ((BPEComponent) getServiceUnit().getComponent()).getEventDirector();
         try {
             IResponseMessage response;
             try {
-                BPEComponent.setCurrent((BPEComponent) serviceUnit.getComponent());
+                BPEEndpoint.setCurrent(this);
                 response = ed.sendEvent(msg, true);
             } finally {
-                BPEComponent.setCurrent(null);
+                BPEEndpoint.setCurrent(null);
             }
-            IInteraction payload = response.getPart(BPEComponent.PART_PAYLOAD);
+            IInteraction payload = response.getPart(outputPartName);
             if (response.getFault() != null) {
                 Exception e = response.getFault().getFaultException();
                 if (e != null) {

Modified: incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEServiceUnit.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEServiceUnit.java?rev=392635&r1=392634&r2=392635&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEServiceUnit.java
(original)
+++ incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/BPEServiceUnit.java
Sat Apr  8 16:39:28 2006
@@ -15,8 +15,26 @@
  */
 package org.apache.servicemix.bpe;
 
+import javax.wsdl.Definition;
+
 import org.apache.servicemix.common.ServiceUnit;
 
 public class BPEServiceUnit extends ServiceUnit {
 
+    private Definition definition;
+
+    /**
+     * @return Returns the definition.
+     */
+    public Definition getDefinition() {
+        return definition;
+    }
+
+    /**
+     * @param definition The definition to set.
+     */
+    public void setDefinition(Definition definition) {
+        this.definition = definition;
+    }
+    
 }

Modified: incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/external/JbiInvokeAction.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/external/JbiInvokeAction.java?rev=392635&r1=392634&r2=392635&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/external/JbiInvokeAction.java
(original)
+++ incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/external/JbiInvokeAction.java
Sat Apr  8 16:39:28 2006
@@ -17,6 +17,8 @@
 
 import java.net.URI;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.Properties;
 
 import javax.jbi.messaging.DeliveryChannel;
@@ -25,6 +27,11 @@
 import javax.jbi.messaging.MessageExchangeFactory;
 import javax.jbi.messaging.MessagingException;
 import javax.jbi.messaging.NormalizedMessage;
+import javax.wsdl.Definition;
+import javax.wsdl.Fault;
+import javax.wsdl.Operation;
+import javax.wsdl.Part;
+import javax.wsdl.PortType;
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
@@ -38,15 +45,16 @@
 import org.apache.ode.bpe.interaction.XMLInteractionObject;
 import org.apache.ode.bpe.scope.service.BPRuntimeException;
 import org.apache.servicemix.bpe.BPEComponent;
+import org.apache.servicemix.bpe.BPEEndpoint;
 import org.apache.servicemix.bpe.BPELifeCycle;
-import org.apache.servicemix.common.ExchangeProcessor;
+import org.apache.servicemix.bpe.BPEServiceUnit;
 import org.apache.servicemix.jbi.jaxp.BytesSource;
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.jbi.jaxp.StringSource;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-public class JbiInvokeAction implements IExternalAction, ExchangeProcessor {
+public class JbiInvokeAction implements IExternalAction {
 
     public static final String INTERFACE_NAMESPACE = "interfaceNamespace";
     public static final String INTERFACE_LOCALNAME = "interfaceLocalName";
@@ -66,8 +74,11 @@
     private QName serviceName;
     private String endpointName;
     private QName operationName;
+    private String inputPartName = BPEComponent.PART_PAYLOAD;
+    private String outputPartName = BPEComponent.PART_PAYLOAD;
     private URI mep;
     private SourceTransformer transformer;
+    private Operation wsdlOperation;
     
 	/**
 	 * Generated serial version UID
@@ -125,6 +136,34 @@
         }
         String mep = properties.getProperty(MEP);
         if (mep == null) {
+            BPEEndpoint ep = BPEEndpoint.getCurrent();
+            Definition def = ((BPEServiceUnit) ep.getServiceUnit()).getDefinition();
+            PortType pt = def.getPortType(interfaceName);
+            Operation oper = pt != null ? pt.getOperation(operationName.getLocalPart(), null,
null) : null;
+            if (oper != null) {
+                boolean output = oper.getOutput() != null && 
+                                 oper.getOutput().getMessage() != null &&
+                                 oper.getOutput().getMessage().getParts().size() > 0;
+                boolean faults = oper.getFaults().size() > 0;
+                if (output) {
+                    mep = "in-out";
+                } else if (faults) {
+                    mep = "robust-in-only";
+                } else {
+                    mep = "in-only";
+                }
+                if (oper.getInput() != null && oper.getInput().getMessage() != null)
{
+                    Map parts = oper.getInput().getMessage().getParts();
+                    inputPartName = (String) parts.keySet().iterator().next(); 
+                }
+                if (oper.getOutput() != null && oper.getOutput().getMessage() !=
null) {
+                    Map parts = oper.getOutput().getMessage().getParts();
+                    outputPartName = (String) parts.keySet().iterator().next(); 
+                }
+                wsdlOperation = oper;
+            }
+        }
+        if (mep == null) {
             mep = "in-out"; 
         }
         this.mep = URI.create("http://www.w3.org/2004/08/wsdl/" + mep);
@@ -135,11 +174,12 @@
         if (log.isDebugEnabled()) {
             log.debug("execute");
         }
-        Object payload = input.get(BPEComponent.PART_PAYLOAD);
+        Object payload = input.get(inputPartName);
         Source inputSource = getSourceFromPayload(payload);
         // Create and send exchange
         try {
-            BPEComponent component = BPEComponent.getCurrent();
+            BPEEndpoint endpoint = BPEEndpoint.getCurrent();
+            BPEComponent component = (BPEComponent) endpoint.getServiceUnit().getComponent();
             DeliveryChannel channel = ((BPELifeCycle) component.getLifeCycle()).getContext().getDeliveryChannel();
             MessageExchangeFactory factory = channel.createExchangeFactory();
             // TODO: need to configure mep
@@ -168,11 +208,27 @@
                         channel.send(me);
                     }
                     Element e = fault.getDocumentElement();
-                    BPRuntimeException bpre = new BPRuntimeException(e.getLocalName(), "");
+                    // Try to determine fault name
+                    String faultName = e.getLocalName();
+                    String partName = BPEComponent.PART_PAYLOAD;
+                    QName elemName = new QName(e.getNamespaceURI(), e.getLocalName());
+                    if (wsdlOperation != null) {
+                        for (Iterator itFault = wsdlOperation.getFaults().values().iterator();
itFault.hasNext();) {
+                            Fault f = (Fault) itFault.next();
+                            Part p = (Part) f.getMessage().getParts().values().iterator().next();
+                            if (elemName.equals(p.getTypeName())) {
+                                faultName = f.getName();
+                                partName = p.getName();
+                            }
+                        }
+                    }
+                    BPRuntimeException bpre = new BPRuntimeException(faultName, "");
                     bpre.setNameSpace(e.getNamespaceURI());
                     XMLInteractionObject interaction = new XMLInteractionObject();
                     interaction.setDocument(fault);
-                    bpre.addPartMessage("payload", interaction);
+                    bpre.addPartMessage(partName, interaction);
+                    // TODO: should retrieve part name from WSDL.
+                    // how can we know the fault name ?
                     throw bpre;
                 } else {
                     try {
@@ -180,7 +236,7 @@
                         if (nm != null) {
                             XMLInteractionObject result = new XMLInteractionObject();
                             result.setDocument((Document) transformer.toDOMNode(nm));
-                            output.put(BPEComponent.PART_PAYLOAD, result);
+                            output.put(outputPartName, result);
                         }
                         me.setStatus(ExchangeStatus.DONE);
                     } catch (Exception e) {
@@ -200,7 +256,7 @@
         }
         if (log.isDebugEnabled()) {
             log.debug("Request: " + payload);
-            log.debug("Response: " + output.get("payload"));
+            log.debug("Response: " + output.get(outputPartName));
         }
 	}
 

Modified: incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/timer/BPETimerJdk.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/timer/BPETimerJdk.java?rev=392635&r1=392634&r2=392635&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/timer/BPETimerJdk.java
(original)
+++ incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/timer/BPETimerJdk.java
Sat Apr  8 16:39:28 2006
@@ -21,6 +21,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.bpe.BPEComponent;
+import org.apache.servicemix.bpe.BPEEndpoint;
 
 import org.apache.ode.bpe.bped.EventDirector;
 import org.apache.ode.bpe.event.ITimerEvent;
@@ -31,11 +32,11 @@
     private static Log log = LogFactory.getLog(BPETimerJdk.class);
     
     private ITimerEvent te;
-    private BPEComponent component;
+    private BPEEndpoint endpoint;
     
-    public BPETimerJdk(ITimerEvent te, BPEComponent component) {
+    public BPETimerJdk(ITimerEvent te, BPEEndpoint endpoint) {
         this.te = te;
-        this.component = component;
+        this.endpoint = endpoint;
     }
 
     public Object getId() {
@@ -51,12 +52,12 @@
             if (log.isDebugEnabled()) {
                 log.debug("Timer " + te + " elapsed at " + new Date());
             }
-            EventDirector ed = component.getEventDirector();
+            EventDirector ed = ((BPEComponent) endpoint.getServiceUnit().getComponent()).getEventDirector();
             try {
-                BPEComponent.setCurrent(component);
+                BPEEndpoint.setCurrent(endpoint);
                 ed.getIInternalEventDirector().sendEvent(this, true);
             } finally {
-                BPEComponent.setCurrent(null);
+                BPEEndpoint.setCurrent(null);
             }
         } catch (Exception e) {
             e.printStackTrace();

Modified: incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/timer/BPETimerServiceJdk.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/timer/BPETimerServiceJdk.java?rev=392635&r1=392634&r2=392635&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/timer/BPETimerServiceJdk.java
(original)
+++ incubator/servicemix/trunk/servicemix-bpe/src/main/java/org/apache/servicemix/bpe/timer/BPETimerServiceJdk.java
Sat Apr  8 16:39:28 2006
@@ -26,7 +26,7 @@
 import org.apache.ode.bpe.timerservice.IBPETimerService;
 import org.apache.ode.bpe.util.BPEProperties;
 import org.apache.ode.bpe.util.BPException;
-import org.apache.servicemix.bpe.BPEComponent;
+import org.apache.servicemix.bpe.BPEEndpoint;
 
 public class BPETimerServiceJdk implements IBPETimerService {
 
@@ -41,7 +41,7 @@
         if (log.isDebugEnabled()) {
             log.debug("Schedule timer " + timerEvent + " for " + startDuration);
         }
-        BPETimerJdk tt = new BPETimerJdk(timerEvent, BPEComponent.getCurrent());
+        BPETimerJdk tt = new BPETimerJdk(timerEvent, BPEEndpoint.getCurrent());
         timer.schedule(tt, startDuration);
         return tt;
     }
@@ -50,7 +50,7 @@
         if (log.isDebugEnabled()) {
             log.debug("Schedule timer " + timerEvent + " at " + startTime);
         }
-        BPETimerJdk tt = new BPETimerJdk(timerEvent, BPEComponent.getCurrent());
+        BPETimerJdk tt = new BPETimerJdk(timerEvent, BPEEndpoint.getCurrent());
         timer.schedule(tt, startTime);
         return tt;
     }

Modified: incubator/servicemix/trunk/servicemix-bpe/src/test/java/loanbroker/CreditAgency.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/src/test/java/loanbroker/CreditAgency.java?rev=392635&r1=392634&r2=392635&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/src/test/java/loanbroker/CreditAgency.java (original)
+++ incubator/servicemix/trunk/servicemix-bpe/src/test/java/loanbroker/CreditAgency.java Sat
Apr  8 16:39:28 2006
@@ -59,7 +59,7 @@
             } 
             if (!ssn.startsWith("1")) {
                 Fault fault = inOut.createFault();
-                fault.setContent(new StringSource("<InvalidSSN xmlns=\"urn:logicblaze:soa:creditagency\"><ssn>"
+ ssn + "</ssn></InvalidSSN>"));
+                fault.setContent(new StringSource("<invalidSSNFault xmlns=\"urn:logicblaze:soa:creditagency:types\"><ssn>"
+ ssn + "</ssn></invalidSSNFault>"));
                 fail(inOut, fault);
             } else {
                 String operation = null;

Modified: incubator/servicemix/trunk/servicemix-bpe/src/test/resources/loanbroker/creditagency.wsdl
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/src/test/resources/loanbroker/creditagency.wsdl?rev=392635&r1=392634&r2=392635&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/src/test/resources/loanbroker/creditagency.wsdl
(original)
+++ incubator/servicemix/trunk/servicemix-bpe/src/test/resources/loanbroker/creditagency.wsdl
Sat Apr  8 16:39:28 2006
@@ -45,11 +45,11 @@
 	</types>
 
 	<message name="getCreditScoreRequest">
-		<part name="payload" type="typens:getCreditScoreRequest" />
+		<part name="request" type="typens:getCreditScoreRequest" />
 	</message>
 
 	<message name="getCreditScoreResponse">
-		<part name="payload" type="typens:getCreditScoreResponse" />
+		<part name="response" type="typens:getCreditScoreResponse" />
 	</message>
 
 	<message name="getCreditHistoryLengthRequest">

Modified: incubator/servicemix/trunk/servicemix-bpe/src/test/resources/loanbroker/loanbroker.bpel
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/src/test/resources/loanbroker/loanbroker.bpel?rev=392635&r1=392634&r2=392635&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/src/test/resources/loanbroker/loanbroker.bpel
(original)
+++ incubator/servicemix/trunk/servicemix-bpe/src/test/resources/loanbroker/loanbroker.bpel
Sat Apr  8 16:39:28 2006
@@ -84,7 +84,7 @@
 				<bpel:assign>
 					<bpel:copy>
 						<bpel:from variable="request" part="payload" query="/tns:getLoanQuoteRequest/tns:ssn"
/>
-						<bpel:to variable="ca-score-request" part="payload" query="/ca:getCreditScoreRequest/ca:ssn"
/>
+						<bpel:to variable="ca-score-request" part="request" query="/ca:getCreditScoreRequest/ca:ssn"
/>
 					</bpel:copy>
 				</bpel:assign>
 		
@@ -109,7 +109,7 @@
 				<bpel:to variable="bk-loanquote-request" part="payload" query="/bk:getLoanQuoteRequest/bk:duration"/>
 			</bpel:copy>
 			<bpel:copy>
-				<bpel:from variable="ca-score-response" part="payload" query="/ca:getCreditScoreResponse/ca:score"
/>
+				<bpel:from variable="ca-score-response" part="response" query="/ca:getCreditScoreResponse/ca:score"
/>
 				<bpel:to variable="bk-loanquote-request" part="payload" query="/bk:getLoanQuoteRequest/bk:score"/>
 			</bpel:copy>
 			<bpel:copy>



Mime
View raw message