Author: vanto Date: Mon Jul 23 15:12:01 2007 New Revision: 558878 URL: http://svn.apache.org/viewvc?view=rev&rev=558878 Log: Parts within a message are now in the same order as defined in the WSDL.
Modified: incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java Modified: incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java?view=diff&rev=558878&r1=558877&r2=558878 ============================================================================== --- incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java (original) +++ incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java Mon Jul 23 15:12:01 2007 @@ -352,7 +352,7 @@ } List<OMessageVarType.Part> parts = new ArrayList<OMessageVarType.Part>(); - CollectionsX.transform(parts, ((Map<String, Part>) msg.getParts()).values(), + CollectionsX.transform(parts, ((List<Part>) msg.getOrderedParts(null)), new UnaryFunction<Part, OMessageVarType.Part>() { public OMessageVarType.Part apply(Part part) { OVarType partType; Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java?view=diff&rev=558878&r1=558877&r2=558878 ============================================================================== --- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java (original) +++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java Mon Jul 23 15:12:01 2007 @@ -18,16 +18,17 @@ */ package org.apache.ode.bpel.o; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -import javax.xml.namespace.QName; import java.util.Collection; -import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Map; +import javax.xml.namespace.QName; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + /** * Message variable type. */ @@ -35,7 +36,7 @@ private static final long serialVersionUID = 256680050844726425L; public QName messageType; - public final Map<String, Part> parts = new HashMap<String,Part>(); + public final Map<String, Part> parts = new LinkedHashMap<String,Part>(); /** For doc-lit-like message types , the element type of the only part. */ public final OElementVarType docLitType;