[riftsaw-commits] riftsaw SVN: r1312 - in branches/ODE/RiftSaw-ODE-trunk: bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom and 2 other directories.

Thursday, 24 February 2011


Author: objectiser
Date: 2011-02-24 06:47:25 -0500 (Thu, 24 Feb 2011)
New Revision: 1312

Added:
  
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/AssignHelper.java
Modified:
  
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java
  
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
  
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Variable.java
  
branches/ODE/RiftSaw-ODE-trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java
  
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
  
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
Log:
RIFTSAW-318. Reworked ODE-236 patch for ODE2 to work with ODE1.4.

Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java	2011-02-23
11:30:49 UTC (rev 1311)
+++
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java	2011-02-24
11:47:25 UTC (rev 1312)
@@ -153,7 +153,7 @@
         __log.debug("Copy verified OK: " + ocopy);
     }
 
-    private OAssign.RValue compileFrom(From from, Object requestedResultType) {
+    public OAssign.RValue compileFrom(From from, Object requestedResultType) {
         assert from != null;
         try {
             if (from.isExtensionVal()) {

Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java	2011-02-23
11:30:49 UTC (rev 1311)
+++
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java	2011-02-24
11:47:25 UTC (rev 1312)
@@ -65,6 +65,7 @@
 import org.apache.ode.bpel.compiler.bom.Expression;
 import org.apache.ode.bpel.compiler.bom.Expression11;
 import org.apache.ode.bpel.compiler.bom.FaultHandler;
+import org.apache.ode.bpel.compiler.bom.From;
 import org.apache.ode.bpel.compiler.bom.Import;
 import org.apache.ode.bpel.compiler.bom.LinkSource;
 import org.apache.ode.bpel.compiler.bom.LinkTarget;
@@ -1170,14 +1171,6 @@
         try {
             compile(oscope, src, new Runnable() {
                 public void run() {
-                    for (Variable var : src.getVariables()) {
-                        try {
-                            compile(var);
-                        } catch (CompilationException ce) {
-                            recoveredFromError(var, ce);
-                        }
-                    }
-
                     for (CorrelationSet cset : src.getCorrelationSetDecls()) {
                         try {
                             compile(cset);
@@ -1194,6 +1187,15 @@
                         }
                     }
 
+                    // Changed order in case variable initialization based on partner
link
+                    for (Variable var : src.getVariables()) {
+                        try {
+                            compile(var);
+                        } catch (CompilationException ce) {
+                            recoveredFromError(var, ce);
+                        }
+                    }
+
                     if (!src.getEvents().isEmpty() || !src.getAlarms().isEmpty()) {
                         oscope.eventHandler = new OEventHandler(_oprocess);
                         oscope.eventHandler.debugInfo = createDebugInfo(src, "Event
Handler for " + src);
@@ -1432,10 +1434,22 @@
         }
 
         OScope.Variable ovar = new OScope.Variable(_oprocess, varType);
+        
+        //madars.vitolins _at gmail.com 2009.03.25 Inline variable initialization
+        //reusing 'compileFrom()' from AssignGenerator
+        AssignGenerator agen = new AssignGenerator();
+        agen.setContext(this);
+        
         ovar.name = src.getName();
         ovar.declaringScope = oscope;
         ovar.debugInfo = createDebugInfo(src, null);
         
+        From varfromSpec=src.getFrom();
+        if (varfromSpec!=null)
+        	ovar.from=agen.compileFrom(varfromSpec, varType);
+        else
+        	ovar.from=null;
+        
         ovar.extVar = compileExtVar(src);
 
         oscope.addLocalVariable(ovar);

Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Variable.java
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Variable.java	2011-02-23
11:30:49 UTC (rev 1311)
+++
branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Variable.java	2011-02-24
11:47:25 UTC (rev 1312)
@@ -113,4 +113,14 @@
     public String getRelated() {
     	return  getAttribute(ExtensibilityQNames.EXTVAR_RELATED, null);
     }
+    
+    /**
+     * Get the 'from' specification.
+     * 
+     * @return the 'from' specification
+     */
+    public From getFrom() {
+        return getFirstChild(From.class);
+    }
+
 }

Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java	2011-02-23
11:30:49 UTC (rev 1311)
+++
branches/ODE/RiftSaw-ODE-trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java	2011-02-24
11:47:25 UTC (rev 1312)
@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -53,7 +54,12 @@
     public OEventHandler eventHandler;
 
     /** Variables declared within the scope. */
-    public final HashMap<String,Variable> variables = new
HashMap<String,Variable>();
+    /* madars.vitolins _at gmail.com 2009.04.11 Inline variable initialization
+     * We need LinkedHashMap because order of variables are significant!
+	 * So that next variable can be initialized from previous (if previous is inline
initialized)
+	 * LinkedHashMap acts like HashMap but it keeps the order
+	 */
+    public final LinkedHashMap<String,Variable> variables = new
LinkedHashMap<String,Variable>();
 
     /** OCorrelation sets declared within the scope. */
     public final Map<String,CorrelationSet> correlationSets = new
HashMap<String, CorrelationSet>();
@@ -177,6 +183,10 @@
         /** If not-null indicates that this variable has an external representation. */
         public OExtVar extVar;
         
+        //madars.vitolins _at gmail.com 2009.03.25
+        //Inline variable initialization
+        /** Handler of from-spec */
+        public OAssign.RValue from;
         
         public Variable(OProcess owner, OVarType type) {
             super(owner);

Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java	2011-02-23
11:30:49 UTC (rev 1311)
+++
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java	2011-02-24
11:47:25 UTC (rev 1312)
@@ -81,9 +81,11 @@
 
         FaultData faultData = null;
 
-        for (OAssign.Copy aCopy : oassign.copy) {
+		AssignHelper assignHelper = new AssignHelper(_self, _scopeFrame, _linkFrame);
+
+		for (OAssign.Copy aCopy : oassign.copy) {
             try {
-                copy(aCopy);
+                assignHelper.copy(aCopy);
             } catch (FaultException fault) {
                 if (aCopy.ignoreMissingFromData) {
                     if
(fault.getQName().equals(getOAsssign().getOwner().constants.qnSelectionFailure)
&&
@@ -124,616 +126,4 @@
     private OAssign getOAsssign() {
         return (OAssign) _self.o;
     }
-
-    private Node evalLValue(OAssign.LValue to) throws FaultException,
ExternalVariableModuleException {
-        final BpelRuntimeContext napi = getBpelRuntimeContext();
-        Node lval = null;
-        if (!(to instanceof OAssign.PartnerLinkRef)) {
-            VariableInstance lvar;
-            try {
-                lvar = _scopeFrame.resolve(to.getVariable());
-            } catch (RuntimeException e) {
-                __log.error("iid: " + getBpelRuntimeContext().getPid() + "
error evaluating lvalue");
-                throw new
FaultException(getOAsssign().getOwner().constants.qnSelectionFailure, e.getMessage());
-            }
-            if (lvar == null) {
-                String msg = __msgs.msgEvalException(to.toString(), "Could not
resolve variable in current scope");
-                if (__log.isDebugEnabled()) __log.debug(to + ": " + msg);
-                throw new
FaultException(getOAsssign().getOwner().constants.qnSelectionFailure, msg);
-            }
-            if (!napi.isVariableInitialized(lvar)) {
-                Document doc = DOMUtils.newDocument();
-                Node val = to.getVariable().type.newInstance(doc);
-                if (val.getNodeType() == Node.TEXT_NODE) {
-                    Element tempwrapper = doc.createElementNS(null,
"temporary-simple-type-wrapper");
-                    doc.appendChild(tempwrapper);
-                    tempwrapper.appendChild(val);
-                    val = tempwrapper;
-                } else doc.appendChild(val);
-                // Only external variables need to be initialized, others are new and
going to be overwtitten
-                if (lvar.declaration.extVar != null) lval = initializeVariable(lvar,
val);
-                else lval = val;
-            } else
-                lval = fetchVariableData(lvar, true);
-        }
-        return lval;
-    }
-
-    /**
-     * Get the r-value. There are several possibilities:
-     * <ul>
-     * <li>a message is selected - an element representing the whole message is
-     * returned.</li>
-     * <li>a (element) message part is selected - the element is returned.
-     * </li>
-     * <li>a (typed) message part is select - a wrapper element is returned.
-     * </li>
-     * <li>an attribute is selected - an attribute node is returned. </li>
-     * <li>a text node/string expression is selected - a text node is returned.
-     * </li>
-     * </ul>
-     *
-     * @param from
-     *
-     * @return Either {@link Element}, {@link org.w3c.dom.Text}, or
-     *         {@link org.w3c.dom.Attr} node representing the r-value.
-     *
-     * @throws FaultException
-     *             DOCUMENTME
-     * @throws UnsupportedOperationException
-     *             DOCUMENTME
-     * @throws IllegalStateException
-     *             DOCUMENTME
-     */
-    private Node evalRValue(OAssign.RValue from) throws FaultException,
ExternalVariableModuleException {
-        if (__log.isDebugEnabled())
-            __log.debug("Evaluating FROM expression \"" + from +
"\".");
-
-        Node retVal;
-        if (from instanceof DirectRef) {
-            OAssign.DirectRef dref = (OAssign.DirectRef) from;
-            sendVariableReadEvent(_scopeFrame.resolve(dref.variable));
-            Node data = fetchVariableData(
-                    _scopeFrame.resolve(dref.variable), false);
-            retVal = DOMUtils.findChildByName((Element)data, dref.elName);
-        } else if (from instanceof OAssign.VariableRef) {
-            OAssign.VariableRef varRef = (OAssign.VariableRef) from;
-            sendVariableReadEvent(_scopeFrame.resolve(varRef.variable));
-            Node data = fetchVariableData(_scopeFrame.resolve(varRef.variable), false);
-            retVal = evalQuery(data, varRef.part != null ? varRef.part :
varRef.headerPart, varRef.location, getEvaluationContext());
-        } else if (from instanceof OAssign.PropertyRef) {
-            OAssign.PropertyRef propRef = (OAssign.PropertyRef) from;
-            sendVariableReadEvent(_scopeFrame.resolve(propRef.variable));
-            Node data = fetchVariableData(_scopeFrame.resolve(propRef.variable), false);
-            retVal = evalQuery(data, propRef.propertyAlias.part,
-                    propRef.propertyAlias.location, getEvaluationContext());
-        } else if (from instanceof OAssign.PartnerLinkRef) {
-            OAssign.PartnerLinkRef pLinkRef = (OAssign.PartnerLinkRef) from;
-            PartnerLinkInstance pLink = _scopeFrame.resolve(pLinkRef.partnerLink);
-            Node tempVal =pLinkRef.isMyEndpointReference ?
-                    getBpelRuntimeContext().fetchMyRoleEndpointReferenceData(pLink)
-                    :
getBpelRuntimeContext().fetchPartnerRoleEndpointReferenceData(pLink);
-            if (__log.isDebugEnabled())
-                __log.debug("RValue is a partner link, corresponding endpoint
"
-                        + tempVal.getClass().getName() + " has value " +
DOMUtils.domToString(tempVal));
-            retVal = tempVal;
-        } else if (from instanceof OAssign.Expression) {
-            List<Node> l;
-            OExpression expr = ((OAssign.Expression) from).expression;
-            try {
-                l = getBpelRuntimeContext().getExpLangRuntime().evaluate(expr,
getEvaluationContext());
-            } catch (EvaluationException e) {
-                String msg = __msgs.msgEvalException(from.toString(), e.getMessage());
-                if (__log.isDebugEnabled()) __log.debug(from + ": " + msg);
-                if (e.getCause() instanceof FaultException) throw
(FaultException)e.getCause();
-                throw new
FaultException(getOAsssign().getOwner().constants.qnSelectionFailure, msg);
-            }
-            if (l.size() == 0) {
-                String msg = __msgs.msgRValueNoNodesSelected(expr.toString());
-                if (__log.isDebugEnabled()) __log.debug(from + ": " + msg);
-                throw new
FaultException(getOAsssign().getOwner().constants.qnSelectionFailure, msg, new
Throwable("ignoreMissingFromData"));
-            } else if (l.size() > 1) {
-                String msg = __msgs.msgRValueMultipleNodesSelected(expr.toString());
-                if (__log.isDebugEnabled()) __log.debug(from + ": " + msg);
-                throw new
FaultException(getOAsssign().getOwner().constants.qnSelectionFailure, msg);
-            }
-            retVal = (Node) l.get(0);
-        } else if (from instanceof OAssign.Literal) {
-            String literal = ((OAssign.Literal) from).getXmlLiteral();
-            Element literalRoot;
-            try {
-                literalRoot = DOMUtils.stringToDOM(literal);
-            } catch (Exception e) {
-                throw new RuntimeException("XML literal parsing failed " +
literal, e);
-            }
-            assert literalRoot.getLocalName().equals("literal");
-            // We'd like a single text node...
-
-            literalRoot.normalize();
-            retVal = literalRoot.getFirstChild();
-
-            // Adjust for whitespace before an element.
-            if (retVal != null && retVal.getNodeType() == Node.TEXT_NODE
-                    && retVal.getTextContent().trim().length() == 0
-                    && retVal.getNextSibling() != null) {
-                retVal = retVal.getNextSibling();
-            }
-
-            if (retVal == null) {
-                // Special case, no children --> empty TII
-                retVal = literalRoot.getOwnerDocument().createTextNode("");
-            } else if (retVal.getNodeType() == Node.ELEMENT_NODE) {
-                // Make sure there is no more elements.
-                Node x = retVal.getNextSibling();
-                while (x != null) {
-                    if (x.getNodeType() == Node.ELEMENT_NODE) {
-                        String msg = __msgs.msgLiteralContainsMultipleEIIs();
-                        if (__log.isDebugEnabled())
-                            __log.debug(from + ": " + msg);
-                        throw new FaultException(
-                                getOAsssign().getOwner().constants.qnSelectionFailure,
-                                msg);
-
-                    }
-                    x = x.getNextSibling();
-                }
-            } else if (retVal.getNodeType() == Node.TEXT_NODE) {
-                // Make sure there are no elements following this text node.
-                Node x = retVal.getNextSibling();
-                while (x != null) {
-                    if (x.getNodeType() == Node.ELEMENT_NODE) {
-                        String msg = __msgs.msgLiteralContainsMixedContent();
-                        if (__log.isDebugEnabled())
-                            __log.debug(from + ": " + msg);
-                        throw new FaultException(
-                                getOAsssign().getOwner().constants.qnSelectionFailure,
-                                msg);
-
-                    }
-                    x = x.getNextSibling();
-                }
-
-            }
-
-            if (retVal == null) {
-                String msg = __msgs.msgLiteralMustContainTIIorEII();
-                if (__log.isDebugEnabled())
-                    __log.debug(from + ": " + msg);
-                throw new FaultException(
-                        getOAsssign().getOwner().constants.qnSelectionFailure,
-                        msg);
-            }
-        } else {
-            String msg = __msgs
-                    .msgInternalError("Unknown RVALUE type: " + from);
-            if (__log.isErrorEnabled())
-                __log.error(from + ": " + msg);
-            throw new FaultException(
-                    getOAsssign().getOwner().constants.qnSelectionFailure, msg);
-        }
-
-        // Now verify we got something.
-        if (retVal == null) {
-            String msg = __msgs.msgEmptyRValue();
-            if (__log.isDebugEnabled())
-                __log.debug(from + ": " + msg);
-            throw new FaultException(
-                    getOAsssign().getOwner().constants.qnSelectionFailure, msg);
-        }
-
-        // Now check that we got the right thing.
-        switch (retVal.getNodeType()) {
-            case Node.TEXT_NODE:
-            case Node.ATTRIBUTE_NODE:
-            case Node.ELEMENT_NODE:
-            case Node.CDATA_SECTION_NODE:
-                break;
-            default:
-                String msg = __msgs.msgInvalidRValue();
-                if (__log.isDebugEnabled())
-                    __log.debug(from + ": " + msg);
-
-                throw new FaultException(
-                        getOAsssign().getOwner().constants.qnSelectionFailure, msg);
-
-        }
-
-        return retVal;
-    }
-
-    private void copy(OAssign.Copy ocopy) throws FaultException,
ExternalVariableModuleException {
-
-        if (__log.isDebugEnabled())
-            __log.debug("Assign.copy(" + ocopy + ")");
-        
-        ScopeEvent se;
-
-        // Check for message to message - copy, we can do this efficiently in
-        // the database.
-        if ((ocopy.to instanceof VariableRef && ((VariableRef) ocopy.to)
-                .isMessageRef())
-                || (ocopy.from instanceof VariableRef && ((VariableRef)
ocopy.from)
-                .isMessageRef())) {
-
-            if ((ocopy.to instanceof VariableRef && ((VariableRef) ocopy.to)
-                    .isMessageRef())
-                    && ocopy.from instanceof VariableRef
-                    && ((VariableRef) ocopy.from).isMessageRef()) {
-
-                final VariableInstance lval = _scopeFrame.resolve(ocopy.to
-                        .getVariable());
-                final VariableInstance rval = _scopeFrame
-                        .resolve(((VariableRef) ocopy.from).getVariable());
-                Element lvalue = (Element) fetchVariableData(rval, false);
-                initializeVariable(lval, lvalue);
-                se = new VariableModificationEvent(lval.declaration.name);
-                ((VariableModificationEvent)se).setNewValue(lvalue);
-            } else {
-                // This really should have been caught by the compiler.
-                __log
-                        .fatal("Message/Non-Message Assignment, should be caught by
compiler:"
-                                + ocopy);
-                throw new FaultException(
-                        ocopy.getOwner().constants.qnSelectionFailure,
-                        "Message/Non-Message Assignment:  " + ocopy);
-            }
-        } else {
-            // Conventional Assignment logic.
-            Node rvalue = evalRValue(ocopy.from);
-            Node lvalue = evalLValue(ocopy.to);
-            if (__log.isDebugEnabled()) {
-                __log.debug("lvalue after eval " + lvalue);
-                if (lvalue != null) __log.debug("content " +
DOMUtils.domToString(lvalue));
-            }
-
-            // Get a pointer within the lvalue.
-            Node lvaluePtr = lvalue;
-            boolean headerAssign = false;
-            if (ocopy.to instanceof OAssign.DirectRef) {
-                DirectRef dref = ((DirectRef) ocopy.to);
-                Element el = DOMUtils.findChildByName((Element)lvalue, dref.elName);
-                if (el == null) {
-                    el = (Element)
((Element)lvalue).appendChild(lvalue.getOwnerDocument()
-                            .createElementNS(dref.elName.getNamespaceURI(),
dref.elName.getLocalPart()));
-                }
-                lvaluePtr = el;
-            } else if (ocopy.to instanceof OAssign.VariableRef) {
-                VariableRef varRef = ((VariableRef) ocopy.to);
-                if (varRef.headerPart != null) headerAssign = true;
-                lvaluePtr = evalQuery(lvalue, varRef.part != null ? varRef.part :
varRef.headerPart, varRef.location,
-                        new EvaluationContextProxy(varRef.getVariable(), lvalue));
-            } else if (ocopy.to instanceof OAssign.PropertyRef) {
-                PropertyRef propRef = ((PropertyRef) ocopy.to);
-                lvaluePtr = evalQuery(lvalue, propRef.propertyAlias.part,
-                        propRef.propertyAlias.location,
-                        new EvaluationContextProxy(propRef.getVariable(),
-                                lvalue));
-            } else if (ocopy.to instanceof OAssign.LValueExpression) {
-                LValueExpression lexpr = (LValueExpression) ocopy.to;
-                lexpr.setInsertMissingToData(ocopy.insertMissingToData);
-                lvaluePtr = evalQuery(lvalue, null, lexpr.expression,
-                        new EvaluationContextProxy(lexpr.getVariable(), lvalue));
-                if (__log.isDebugEnabled())
-                    __log.debug("lvaluePtr expr res " + lvaluePtr);
-            }
-
-            // For partner link assignmenent, the whole content is assigned.
-            if (ocopy.to instanceof OAssign.PartnerLinkRef) {
-                OAssign.PartnerLinkRef pLinkRef = ((OAssign.PartnerLinkRef) ocopy.to);
-                PartnerLinkInstance plval = _scopeFrame
-                        .resolve(pLinkRef.partnerLink);
-                replaceEndpointRefence(plval, rvalue);
-                se = new PartnerLinkModificationEvent(((OAssign.PartnerLinkRef)
ocopy.to).partnerLink.getName());
-            } else {
-                // Sneakily converting the EPR if it's not the format expected by the
lvalue
-                if (ocopy.from instanceof OAssign.PartnerLinkRef) {
-                    rvalue =
getBpelRuntimeContext().convertEndpointReference((Element)rvalue, lvaluePtr);
-                    if (rvalue.getNodeType() == Node.DOCUMENT_NODE)
-                        rvalue = ((Document)rvalue).getDocumentElement();
-                }
-
-                 Node parentNode = lvaluePtr.getParentNode();
-                if (headerAssign && parentNode != null &&
"message".equals(parentNode.getNodeName()) &&
rvalue.getNodeType()==Node.ELEMENT_NODE ) {
-                    lvalue = copyInto((Element)lvalue, (Element) lvaluePtr, (Element)
rvalue);
-                } else if (rvalue.getNodeType() == Node.ELEMENT_NODE &&
lvaluePtr.getNodeType() == Node.ELEMENT_NODE) {
-                    lvalue = replaceElement((Element)lvalue, (Element) lvaluePtr,
(Element) rvalue,
-                            ocopy.keepSrcElementName);
-                } else {
-                    lvalue = replaceContent(lvalue, lvaluePtr, rvalue.getTextContent());
-                }
-                final VariableInstance lval =
_scopeFrame.resolve(ocopy.to.getVariable());
-                if (__log.isDebugEnabled())
-                    __log.debug("ASSIGN Writing variable '" +
lval.declaration.name +
-                                "' value '" +
DOMUtils.domToString(lvalue) +"'");
-                commitChanges(lval, lvalue);
-                se = new VariableModificationEvent(lval.declaration.name);
-                ((VariableModificationEvent)se).setNewValue(lvalue);
-            }
-        }
-
-        if (ocopy.debugInfo != null)
-            se.setLineNo(ocopy.debugInfo.startLine);
-        sendEvent(se);
-    }
-
-    @Override
-    Node fetchVariableData(VariableInstance variable, boolean forWriting)
-            throws FaultException {
-        try {
-            return super.fetchVariableData(variable, forWriting);
-        } catch (FaultException fe) {
-            if (forWriting) {
-                fe = new FaultException(fe.getQName(), fe.getMessage(), new
Throwable("throwUninitializedToVariable"));
-            }
-            throw fe;
-        }
-    }
-    
-    private void replaceEndpointRefence(PartnerLinkInstance plval, Node rvalue) throws
FaultException {
-      if (rvalue.getNodeType() == Node.ATTRIBUTE_NODE){
-          rvalue = rvalue.getOwnerDocument().createTextNode(((Attr) rvalue).getValue());
-      }
-        // Eventually wrapping with service-ref element if we've been directly
assigned some
-        // value that isn't wrapped.
-        if (rvalue.getNodeType() == Node.TEXT_NODE ||
-                (rvalue.getNodeType() == Node.ELEMENT_NODE &&
!rvalue.getLocalName().equals("service-ref"))) {
-            Document doc = DOMUtils.newDocument();
-            Element serviceRef = doc.createElementNS(Namespaces.WSBPEL2_0_FINAL_SERVREF,
"service-ref");
-            doc.appendChild(serviceRef);
-            serviceRef.appendChild(doc.importNode(rvalue, true));
-            rvalue = serviceRef;
-        }
-
-        getBpelRuntimeContext().writeEndpointReference(plval, (Element)rvalue);
-    }
-
-    private Element replaceElement(Element lval, Element ptr, Element src,
-                                boolean keepSrcElement) {
-        Document doc = ptr.getOwnerDocument();
-        Node parent = ptr.getParentNode();
-        if (keepSrcElement) {
-            Element replacement = (Element)doc.importNode(src, true);
-            parent.replaceChild(replacement, ptr);
-            return (lval == ptr) ? replacement :  lval;
-        }
-
-        Element replacement = doc.createElementNS(ptr.getNamespaceURI(),
ptr.getTagName());
-        NodeList nl = src.getChildNodes();
-        for (int i = 0; i < nl.getLength(); ++i)
-            replacement.appendChild(doc.importNode(nl.item(i), true));
-        NamedNodeMap attrs = src.getAttributes();
-        for (int i = 0; i < attrs.getLength(); ++i) {
-            Attr attr = (Attr)attrs.item(i);
-            if (!attr.getName().startsWith("xmlns")) {
-                replacement.setAttributeNodeNS((Attr)doc.importNode(attrs.item(i),
true));
-                // Case of qualified attribute values, we're forced to add
corresponding namespace declaration manually
-                int colonIdx = attr.getValue().indexOf(":");
-                if (colonIdx > 0) {
-                    String prefix = attr.getValue().substring(0, colonIdx);
-                    String attrValNs = src.lookupPrefix(prefix);
-                    if (attrValNs != null)
-                       replacement.setAttributeNS(DOMUtils.NS_URI_XMLNS,
"xmlns:"+ prefix, attrValNs);
-                }
-            }
-        }
-        parent.replaceChild(replacement, ptr);
-        DOMUtils.copyNSContext(ptr, replacement);
-        
-        return (lval == ptr) ? replacement :  lval;
-    }
-
-    private Element copyInto(Element lval, Element ptr, Element src) {
-        ptr.appendChild(ptr.getOwnerDocument().importNode(src, true));
-        return lval;
-    }
-
-    /**
-     * isInsert flag desginates this as an 'element' type insertion, which
-     * requires insert the actual element value, rather than it's children
-     *
-     * @return
-     * @throws FaultException
-     */
-    private Node replaceContent(Node lvalue, Node lvaluePtr, String rvalue)
-            throws FaultException {
-        Document d = lvaluePtr.getOwnerDocument();
-
-        if (__log.isDebugEnabled()) {
-            __log.debug("lvaluePtr type " + lvaluePtr.getNodeType());
-            __log.debug("lvaluePtr " + DOMUtils.domToString(lvaluePtr));
-            __log.debug("lvalue " + lvalue);
-            __log.debug("rvalue " + rvalue);
-        }
-
-        switch (lvaluePtr.getNodeType()) {
-            case Node.ELEMENT_NODE:
-
-                // Remove all the children.
-                while (lvaluePtr.hasChildNodes())
-                    lvaluePtr.removeChild(lvaluePtr.getFirstChild());
-
-                // Append a new text node.
-                lvaluePtr.appendChild(d.createTextNode(rvalue));
-
-                // If lvalue is a text, removing all lvaluePtr children had just removed
it
-                // so we need to rebuild it as a child of lvaluePtr
-                if (lvalue instanceof Text)
-                    lvalue = lvaluePtr.getFirstChild();
-                break;
-
-            case Node.TEXT_NODE:
-
-                Node newval = d.createTextNode(rvalue);
-                // Replace ourselves .
-                lvaluePtr.getParentNode().replaceChild(newval, lvaluePtr);
-
-                // A little kludge, let our caller know that the root element has
changed.
-                // (used for assignment to a simple typed variable)
-                if (lvalue.getNodeType() == Node.ELEMENT_NODE) {
-                    // No children, adding an empty text children to point to
-                    if (lvalue.getFirstChild() == null) {
-                        Text txt =
lvalue.getOwnerDocument().createTextNode("");
-                        lvalue.appendChild(txt);
-                    }
-                    if (lvalue.getFirstChild().getNodeType() == Node.TEXT_NODE)
-                        lvalue = lvalue.getFirstChild();
-                }
-                if (lvalue.getNodeType() == Node.TEXT_NODE && ((Text)
lvalue).getWholeText().equals(
-                        ((Text) lvaluePtr).getWholeText()))
-                    lvalue = lvaluePtr = newval;
-                break;
-
-            case Node.ATTRIBUTE_NODE:
-
-                ((Attr) lvaluePtr).setValue(rvalue);
-                break;
-
-            default:
-                // This could occur if the expression language selects something
-                // like
-                // a PI or a CDATA.
-                String msg = __msgs.msgInvalidLValue();
-                if (__log.isDebugEnabled())
-                    __log.debug(lvaluePtr + ": " + msg);
-                throw new FaultException(
-                        getOAsssign().getOwner().constants.qnSelectionFailure, msg);
-        }
-
-        return lvalue;
-    }
-
-    private Node evalQuery(Node data, OMessageVarType.Part part,
-                           OExpression expression, EvaluationContext ec) throws
FaultException {
-        assert data != null;
-
-        if (part != null) {
-            QName partName = new QName(null, part.name);
-            Node qualLVal = DOMUtils.findChildByName((Element) data, partName);
-            if (part.type instanceof OElementVarType) {
-                QName elName = ((OElementVarType) part.type).elementType;
-                qualLVal = DOMUtils.findChildByName((Element) qualLVal, elName);
-            } else if (part.type == null) {
-                // Special case of header parts never referenced in the WSDL def
-                if (qualLVal != null && qualLVal.getNodeType() ==
Node.ELEMENT_NODE
-                        &&
((Element)qualLVal).getAttribute("headerPart") != null
-                        && DOMUtils.getTextContent(qualLVal) == null)
-                    qualLVal = DOMUtils.getFirstChildElement((Element) qualLVal);
-                // The needed part isn't there, dynamically creating it
-                if (qualLVal == null) {
-                    qualLVal = data.getOwnerDocument().createElementNS(null, part.name);
-                    ((Element)qualLVal).setAttribute("headerPart",
"true");
-                    data.appendChild(qualLVal);
-                }
-            }
-            data = qualLVal;
-        }
-
-        if (expression != null) {
-            // Neat little trick....
-            try {
-                data = ec.evaluateQuery(data, expression);
-            } catch (EvaluationException e) {
-                String msg = __msgs.msgEvalException(expression.toString(),
e.getMessage());
-                if (__log.isDebugEnabled()) __log.debug(expression + ": " +
msg);
-                if (e.getCause() instanceof FaultException) throw
(FaultException)e.getCause();
-                throw new
FaultException(getOAsssign().getOwner().constants.qnSubLanguageExecutionFault, msg);
-            }
-        }
-
-        return data;
-    }
-
-    private class EvaluationContextProxy implements EvaluationContext {
-
-        private Variable _var;
-
-        private Node _varNode;
-
-        private Node _rootNode;
-
-        private EvaluationContext _ctx;
-        
-
-        private EvaluationContextProxy(Variable var, Node varNode) {
-            _var = var;
-            _varNode = varNode;
-            _ctx = getEvaluationContext();
-        }
-        
-        public Node readVariable(OScope.Variable variable, OMessageVarType.Part part)
throws FaultException {
-            if (variable.name.equals(_var.name)) {
-                if (part == null) return _varNode;
-                return _ctx.getPartData((Element)_varNode, part);
-
-            } else
-                return _ctx.readVariable(variable, part);
-
-        }       /**
-     * @see
org.apache.ode.bpel.explang.EvaluationContext#readMessageProperty(org.apache.ode.bpel.o.OScope.Variable,
-     *      org.apache.ode.bpel.o.OProcess.OProperty)
-     */
-    public String readMessageProperty(Variable variable, OProperty property)
-            throws FaultException {
-        return _ctx.readMessageProperty(variable, property);
-    }
-
-        /**
-         * @see
org.apache.ode.bpel.explang.EvaluationContext#isLinkActive(org.apache.ode.bpel.o.OLink)
-         */
-        public boolean isLinkActive(OLink olink) throws FaultException {
-            return _ctx.isLinkActive(olink);
-        }
-
-        /**
-         * @see org.apache.ode.bpel.explang.EvaluationContext#getRootNode()
-         */
-        public Node getRootNode() {
-            return _rootNode;
-        }
-
-        /**
-         * @see
org.apache.ode.bpel.explang.EvaluationContext#evaluateQuery(org.w3c.dom.Node,
-         *      org.apache.ode.bpel.o.OExpression)
-         */
-        public Node evaluateQuery(Node root, OExpression expr)
-                throws FaultException {
-            _rootNode = root;
-            try {
-                return getBpelRuntimeContext().getExpLangRuntime()
-                        .evaluateNode(expr, this);
-            } catch (org.apache.ode.bpel.explang.EvaluationException e) {
-                throw new InvalidProcessException("Expression Failed: " +
expr,
-                        e);
-            }
-        }
-
-        public Node getPartData(Element message, Part part) throws FaultException {
-            return _ctx.getPartData(message,part);
-        }
-
-        public Long getProcessId() {
-            return _ctx.getProcessId();
-        }
-
-        public boolean narrowTypes() {
-            return false;
-        }
-
-        public URI getBaseResourceURI() {
-            return _ctx.getBaseResourceURI();
-        }
-
-        public Node getPropertyValue(QName propertyName) {
-            return _ctx.getPropertyValue(propertyName);
-        }
-
-        public QName getProcessQName() {
-            return _ctx.getProcessQName();
-        }
-
-        public Date getCurrentEventDateTime() {
-            return Calendar.getInstance().getTime(); 
-        }
-    }
-
 }

Added:
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/AssignHelper.java
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/AssignHelper.java	
                       (rev 0)
+++
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/AssignHelper.java	2011-02-24
11:47:25 UTC (rev 1312)
@@ -0,0 +1,805 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ode.bpel.runtime;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.common.FaultException;
+import org.apache.ode.bpel.evt.PartnerLinkModificationEvent;
+import org.apache.ode.bpel.evt.ScopeEvent;
+import org.apache.ode.bpel.evt.VariableModificationEvent;
+import org.apache.ode.bpel.explang.EvaluationContext;
+import org.apache.ode.bpel.explang.EvaluationException;
+import org.apache.ode.bpel.o.OActivity;
+import org.apache.ode.bpel.o.OAssign;
+import org.apache.ode.bpel.o.OAssign.DirectRef;
+import org.apache.ode.bpel.o.OAssign.LValueExpression;
+import org.apache.ode.bpel.o.OAssign.PropertyRef;
+import org.apache.ode.bpel.o.OAssign.VariableRef;
+import org.apache.ode.bpel.o.OElementVarType;
+import org.apache.ode.bpel.o.OExpression;
+import org.apache.ode.bpel.o.OLink;
+import org.apache.ode.bpel.o.OMessageVarType;
+import org.apache.ode.bpel.o.OMessageVarType.Part;
+import org.apache.ode.bpel.o.OProcess.OProperty;
+import org.apache.ode.bpel.o.OScope;
+import org.apache.ode.bpel.o.OScope.Variable;
+import org.apache.ode.bpel.runtime.channels.FaultData;
+import org.apache.ode.utils.DOMUtils;
+import org.apache.ode.utils.Namespaces;
+import org.apache.ode.utils.msg.MessageBundle;
+import org.apache.ode.bpel.evar.ExternalVariableModuleException;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+import org.xml.sax.SAXException;
+
+import javax.xml.namespace.QName;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Assign activity run-time template.
+ */
+class AssignHelper extends ACTIVITY {
+    private static final long serialVersionUID = 1L;
+
+    private static final Log __log = LogFactory.getLog(AssignHelper.class);
+
+    private static final ASSIGNMessages __msgs = MessageBundle
+            .getMessages(ASSIGNMessages.class);
+
+    public AssignHelper(ActivityInfo self, ScopeFrame scopeFrame, LinkFrame linkFrame) {
+        super(self, scopeFrame, linkFrame);
+    }
+
+	/**
+	 * Initializes single variable by using it's 'from-spec'
+	 * @param var
+	 * @author madars.vitolins _at gmail.com, 2009.04.17
+	 */
+	public void initVar(Variable var) throws FaultException,
+						ExternalVariableModuleException {
+		if (__log.isDebugEnabled())
+			__log.debug("Initializing variable [" + var.name + "]");
+			
+		// Init variable from another variable
+		if (var.type instanceof OMessageVarType
+					&& var.from instanceof OAssign.VariableRef
+					&& ((OAssign.VariableRef) var.from).isMessageRef()) {
+			final VariableInstance lval = _scopeFrame.resolve(var);
+			final VariableInstance rval = _scopeFrame
+					.resolve(((OAssign.VariableRef) var.from).getVariable());
+			Element lvalue = (Element) fetchVariableData(rval, false);
+			initializeVariable(lval, lvalue);
+		} else {
+			Node rvalue = evalRValue(var.from);
+			Node lvalue = evalLValue(var);
+			// Dump r-value
+			if (__log.isDebugEnabled()) {
+				__log.debug("rvalue after eval " + rvalue);
+				if (rvalue != null)
+					__log.debug("content " + DOMUtils.domToString(rvalue));
+			}
+			// Dump l-value
+			if (__log.isDebugEnabled()) {
+				__log.debug("lvalue after eval " + rvalue);
+				if (lvalue != null)
+					__log.debug("content " + DOMUtils.domToString(lvalue));
+			}
+			
+			Node lvaluePtr = lvalue;
+			// Sneakily converting the EPR if it's not the format expected by
+			// the lvalue
+			if (var.from instanceof OAssign.PartnerLinkRef) {
+				rvalue = getBpelRuntimeContext().convertEndpointReference(
+							(Element) rvalue, lvaluePtr);
+				if (rvalue.getNodeType() == Node.DOCUMENT_NODE)
+					rvalue = ((Document) rvalue).getDocumentElement();
+			}
+
+			if (rvalue.getNodeType() == Node.ELEMENT_NODE
+					&& lvaluePtr.getNodeType() == Node.ELEMENT_NODE) {
+				lvalue = replaceElement((Element) lvalue,
+							(Element) lvaluePtr, (Element) rvalue, true);
+			} else {
+				lvalue = replaceContent(lvalue, lvaluePtr, rvalue
+							.getTextContent());
+			}
+			final VariableInstance lval = _scopeFrame.resolve(var);
+			if (__log.isDebugEnabled())
+				__log.debug("SCOPE initialized variable '"
+						+ lval.declaration.name + "' value '"
+						+ DOMUtils.domToString(lvalue) + "'");
+
+			// Commit changes!
+			commitChanges(lval, lvalue);
+		}
+	}// initVar()
+    
+    public void run() {
+		String errMsg="AssignHelper cannot be ran as ACTIVITY";
+		__log.error(errMsg);
+		_self.parent.failure(errMsg, null);
+	}
+
+    protected Log log() {
+        return __log;
+    }
+
+    private OActivity getOActivity() {
+        return (OActivity) _self.o;
+    }
+
+    private Node evalLValue(OAssign.LValue to) throws FaultException,
ExternalVariableModuleException {
+        final BpelRuntimeContext napi = getBpelRuntimeContext();
+        Node lval = null;
+        if (!(to instanceof OAssign.PartnerLinkRef)) {
+            VariableInstance lvar;
+            try {
+                lvar = _scopeFrame.resolve(to.getVariable());
+            } catch (RuntimeException e) {
+                __log.error("iid: " + getBpelRuntimeContext().getPid() + "
error evaluating lvalue");
+                throw new
FaultException(getOActivity().getOwner().constants.qnSelectionFailure, e.getMessage());
+            }
+            if (lvar == null) {
+                String msg = __msgs.msgEvalException(to.toString(), "Could not
resolve variable in current scope");
+                if (__log.isDebugEnabled()) __log.debug(to + ": " + msg);
+                throw new
FaultException(getOActivity().getOwner().constants.qnSelectionFailure, msg);
+            }
+            if (!napi.isVariableInitialized(lvar)) {
+                Document doc = DOMUtils.newDocument();
+                Node val = to.getVariable().type.newInstance(doc);
+                if (val.getNodeType() == Node.TEXT_NODE) {
+                    Element tempwrapper = doc.createElementNS(null,
"temporary-simple-type-wrapper");
+                    doc.appendChild(tempwrapper);
+                    tempwrapper.appendChild(val);
+                    val = tempwrapper;
+                } else doc.appendChild(val);
+                // Only external variables need to be initialized, others are new and
going to be overwtitten
+                if (lvar.declaration.extVar != null) lval = initializeVariable(lvar,
val);
+                else lval = val;
+            } else
+                lval = fetchVariableData(lvar, true);
+        }
+        return lval;
+    }
+
+	/**
+	 * Assumes that variable is variable not kind of partner links. 
+	 * 
+	 * @param var
+	 * @return
+	 * @throws FaultException
+	 * @throws ExternalVariableModuleException
+	 * @author madars.vitolins _at gmail.com
+	 */
+	public Node evalLValue(Variable var) throws FaultException,
+				ExternalVariableModuleException {
+		final BpelRuntimeContext napi = getBpelRuntimeContext();
+		Node lval = null;
+		VariableInstance lvar = _scopeFrame.resolve(var);
+		if (!napi.isVariableInitialized(lvar)) {
+			Document doc = DOMUtils.newDocument();
+			Node val = var.type.newInstance(doc);
+			if (val.getNodeType() == Node.TEXT_NODE) {
+				Element tempwrapper = doc.createElementNS(null,
+					"temporary-simple-type-wrapper");
+				doc.appendChild(tempwrapper);
+				tempwrapper.appendChild(val);
+				val = tempwrapper;
+			} else
+				doc.appendChild(val);
+			// Only external variables need to be initialized, others are new
+			// and going to be overwritten
+			if (lvar.declaration.extVar != null)
+				lval = initializeVariable(lvar, val);
+			else
+				lval = val;
+		} else
+			lval = fetchVariableData(lvar, true);
+		return lval;
+	}
+    
+    /**
+     * Get the r-value. There are several possibilities:
+     * <ul>
+     * <li>a message is selected - an element representing the whole message is
+     * returned.</li>
+     * <li>a (element) message part is selected - the element is returned.
+     * </li>
+     * <li>a (typed) message part is select - a wrapper element is returned.
+     * </li>
+     * <li>an attribute is selected - an attribute node is returned. </li>
+     * <li>a text node/string expression is selected - a text node is returned.
+     * </li>
+     * </ul>
+     *
+     * @param from
+     *
+     * @return Either {@link Element}, {@link org.w3c.dom.Text}, or
+     *         {@link org.w3c.dom.Attr} node representing the r-value.
+     *
+     * @throws FaultException
+     *             DOCUMENTME
+     * @throws UnsupportedOperationException
+     *             DOCUMENTME
+     * @throws IllegalStateException
+     *             DOCUMENTME
+     */
+    private Node evalRValue(OAssign.RValue from) throws FaultException,
ExternalVariableModuleException {
+        if (__log.isDebugEnabled())
+            __log.debug("Evaluating FROM expression \"" + from +
"\".");
+
+        Node retVal;
+        if (from instanceof DirectRef) {
+            OAssign.DirectRef dref = (OAssign.DirectRef) from;
+            sendVariableReadEvent(_scopeFrame.resolve(dref.variable));
+            Node data = fetchVariableData(
+                    _scopeFrame.resolve(dref.variable), false);
+            retVal = DOMUtils.findChildByName((Element)data, dref.elName);
+        } else if (from instanceof OAssign.VariableRef) {
+            OAssign.VariableRef varRef = (OAssign.VariableRef) from;
+            sendVariableReadEvent(_scopeFrame.resolve(varRef.variable));
+            Node data = fetchVariableData(_scopeFrame.resolve(varRef.variable), false);
+            retVal = evalQuery(data, varRef.part != null ? varRef.part :
varRef.headerPart, varRef.location, getEvaluationContext());
+        } else if (from instanceof OAssign.PropertyRef) {
+            OAssign.PropertyRef propRef = (OAssign.PropertyRef) from;
+            sendVariableReadEvent(_scopeFrame.resolve(propRef.variable));
+            Node data = fetchVariableData(_scopeFrame.resolve(propRef.variable), false);
+            retVal = evalQuery(data, propRef.propertyAlias.part,
+                    propRef.propertyAlias.location, getEvaluationContext());
+        } else if (from instanceof OAssign.PartnerLinkRef) {
+            OAssign.PartnerLinkRef pLinkRef = (OAssign.PartnerLinkRef) from;
+            PartnerLinkInstance pLink = _scopeFrame.resolve(pLinkRef.partnerLink);
+            Node tempVal =pLinkRef.isMyEndpointReference ?
+                    getBpelRuntimeContext().fetchMyRoleEndpointReferenceData(pLink)
+                    :
getBpelRuntimeContext().fetchPartnerRoleEndpointReferenceData(pLink);
+            if (__log.isDebugEnabled())
+                __log.debug("RValue is a partner link, corresponding endpoint
"
+                        + tempVal.getClass().getName() + " has value " +
DOMUtils.domToString(tempVal));
+            retVal = tempVal;
+        } else if (from instanceof OAssign.Expression) {
+            List<Node> l;
+            OExpression expr = ((OAssign.Expression) from).expression;
+            try {
+                l = getBpelRuntimeContext().getExpLangRuntime().evaluate(expr,
getEvaluationContext());
+            } catch (EvaluationException e) {
+                String msg = __msgs.msgEvalException(from.toString(), e.getMessage());
+                if (__log.isDebugEnabled()) __log.debug(from + ": " + msg);
+                if (e.getCause() instanceof FaultException) throw
(FaultException)e.getCause();
+                throw new
FaultException(getOActivity().getOwner().constants.qnSelectionFailure, msg);
+            }
+            if (l.size() == 0) {
+                String msg = __msgs.msgRValueNoNodesSelected(expr.toString());
+                if (__log.isDebugEnabled()) __log.debug(from + ": " + msg);
+                throw new
FaultException(getOActivity().getOwner().constants.qnSelectionFailure, msg, new
Throwable("ignoreMissingFromData"));
+            } else if (l.size() > 1) {
+                String msg = __msgs.msgRValueMultipleNodesSelected(expr.toString());
+                if (__log.isDebugEnabled()) __log.debug(from + ": " + msg);
+                throw new
FaultException(getOActivity().getOwner().constants.qnSelectionFailure, msg);
+            }
+            retVal = (Node) l.get(0);
+        } else if (from instanceof OAssign.Literal) {
+            String literal = ((OAssign.Literal) from).getXmlLiteral();
+            Element literalRoot;
+            try {
+                literalRoot = DOMUtils.stringToDOM(literal);
+            } catch (Exception e) {
+                throw new RuntimeException("XML literal parsing failed " +
literal, e);
+            }
+            assert literalRoot.getLocalName().equals("literal");
+            // We'd like a single text node...
+
+            literalRoot.normalize();
+            retVal = literalRoot.getFirstChild();
+
+            // Adjust for whitespace before an element.
+            if (retVal != null && retVal.getNodeType() == Node.TEXT_NODE
+                    && retVal.getTextContent().trim().length() == 0
+                    && retVal.getNextSibling() != null) {
+                retVal = retVal.getNextSibling();
+            }
+
+            if (retVal == null) {
+                // Special case, no children --> empty TII
+                retVal = literalRoot.getOwnerDocument().createTextNode("");
+            } else if (retVal.getNodeType() == Node.ELEMENT_NODE) {
+                // Make sure there is no more elements.
+                Node x = retVal.getNextSibling();
+                while (x != null) {
+                    if (x.getNodeType() == Node.ELEMENT_NODE) {
+                        String msg = __msgs.msgLiteralContainsMultipleEIIs();
+                        if (__log.isDebugEnabled())
+                            __log.debug(from + ": " + msg);
+                        throw new FaultException(
+                                getOActivity().getOwner().constants.qnSelectionFailure,
+                                msg);
+
+                    }
+                    x = x.getNextSibling();
+                }
+            } else if (retVal.getNodeType() == Node.TEXT_NODE) {
+                // Make sure there are no elements following this text node.
+                Node x = retVal.getNextSibling();
+                while (x != null) {
+                    if (x.getNodeType() == Node.ELEMENT_NODE) {
+                        String msg = __msgs.msgLiteralContainsMixedContent();
+                        if (__log.isDebugEnabled())
+                            __log.debug(from + ": " + msg);
+                        throw new FaultException(
+                                getOActivity().getOwner().constants.qnSelectionFailure,
+                                msg);
+
+                    }
+                    x = x.getNextSibling();
+                }
+
+            }
+
+            if (retVal == null) {
+                String msg = __msgs.msgLiteralMustContainTIIorEII();
+                if (__log.isDebugEnabled())
+                    __log.debug(from + ": " + msg);
+                throw new FaultException(
+                        getOActivity().getOwner().constants.qnSelectionFailure,
+                        msg);
+            }
+        } else {
+            String msg = __msgs
+                    .msgInternalError("Unknown RVALUE type: " + from);
+            if (__log.isErrorEnabled())
+                __log.error(from + ": " + msg);
+            throw new FaultException(
+                    getOActivity().getOwner().constants.qnSelectionFailure, msg);
+        }
+
+        // Now verify we got something.
+        if (retVal == null) {
+            String msg = __msgs.msgEmptyRValue();
+            if (__log.isDebugEnabled())
+                __log.debug(from + ": " + msg);
+            throw new FaultException(
+                    getOActivity().getOwner().constants.qnSelectionFailure, msg);
+        }
+
+        // Now check that we got the right thing.
+        switch (retVal.getNodeType()) {
+            case Node.TEXT_NODE:
+            case Node.ATTRIBUTE_NODE:
+            case Node.ELEMENT_NODE:
+            case Node.CDATA_SECTION_NODE:
+                break;
+            default:
+                String msg = __msgs.msgInvalidRValue();
+                if (__log.isDebugEnabled())
+                    __log.debug(from + ": " + msg);
+
+                throw new FaultException(
+                        getOActivity().getOwner().constants.qnSelectionFailure, msg);
+
+        }
+
+        return retVal;
+    }
+
+    protected void copy(OAssign.Copy ocopy) throws FaultException,
ExternalVariableModuleException {
+
+        if (__log.isDebugEnabled())
+            __log.debug("Assign.copy(" + ocopy + ")");
+        
+        ScopeEvent se;
+
+        // Check for message to message - copy, we can do this efficiently in
+        // the database.
+        if ((ocopy.to instanceof VariableRef && ((VariableRef) ocopy.to)
+                .isMessageRef())
+                || (ocopy.from instanceof VariableRef && ((VariableRef)
ocopy.from)
+                .isMessageRef())) {
+
+            if ((ocopy.to instanceof VariableRef && ((VariableRef) ocopy.to)
+                    .isMessageRef())
+                    && ocopy.from instanceof VariableRef
+                    && ((VariableRef) ocopy.from).isMessageRef()) {
+
+                final VariableInstance lval = _scopeFrame.resolve(ocopy.to
+                        .getVariable());
+                final VariableInstance rval = _scopeFrame
+                        .resolve(((VariableRef) ocopy.from).getVariable());
+                Element lvalue = (Element) fetchVariableData(rval, false);
+                initializeVariable(lval, lvalue);
+                se = new VariableModificationEvent(lval.declaration.name);
+                ((VariableModificationEvent)se).setNewValue(lvalue);
+            } else {
+                // This really should have been caught by the compiler.
+                __log
+                        .fatal("Message/Non-Message Assignment, should be caught by
compiler:"
+                                + ocopy);
+                throw new FaultException(
+                        ocopy.getOwner().constants.qnSelectionFailure,
+                        "Message/Non-Message Assignment:  " + ocopy);
+            }
+        } else {
+            // Conventional Assignment logic.
+            Node rvalue = evalRValue(ocopy.from);
+            Node lvalue = evalLValue(ocopy.to);
+            if (__log.isDebugEnabled()) {
+                __log.debug("lvalue after eval " + lvalue);
+                if (lvalue != null) __log.debug("content " +
DOMUtils.domToString(lvalue));
+            }
+
+            // Get a pointer within the lvalue.
+            Node lvaluePtr = lvalue;
+            boolean headerAssign = false;
+            if (ocopy.to instanceof OAssign.DirectRef) {
+                DirectRef dref = ((DirectRef) ocopy.to);
+                Element el = DOMUtils.findChildByName((Element)lvalue, dref.elName);
+                if (el == null) {
+                    el = (Element)
((Element)lvalue).appendChild(lvalue.getOwnerDocument()
+                            .createElementNS(dref.elName.getNamespaceURI(),
dref.elName.getLocalPart()));
+                }
+                lvaluePtr = el;
+            } else if (ocopy.to instanceof OAssign.VariableRef) {
+                VariableRef varRef = ((VariableRef) ocopy.to);
+                if (varRef.headerPart != null) headerAssign = true;
+                lvaluePtr = evalQuery(lvalue, varRef.part != null ? varRef.part :
varRef.headerPart, varRef.location,
+                        new EvaluationContextProxy(varRef.getVariable(), lvalue));
+            } else if (ocopy.to instanceof OAssign.PropertyRef) {
+                PropertyRef propRef = ((PropertyRef) ocopy.to);
+                lvaluePtr = evalQuery(lvalue, propRef.propertyAlias.part,
+                        propRef.propertyAlias.location,
+                        new EvaluationContextProxy(propRef.getVariable(),
+                                lvalue));
+            } else if (ocopy.to instanceof OAssign.LValueExpression) {
+                LValueExpression lexpr = (LValueExpression) ocopy.to;
+                lexpr.setInsertMissingToData(ocopy.insertMissingToData);
+                lvaluePtr = evalQuery(lvalue, null, lexpr.expression,
+                        new EvaluationContextProxy(lexpr.getVariable(), lvalue));
+                if (__log.isDebugEnabled())
+                    __log.debug("lvaluePtr expr res " + lvaluePtr);
+            }
+
+            // For partner link assignmenent, the whole content is assigned.
+            if (ocopy.to instanceof OAssign.PartnerLinkRef) {
+                OAssign.PartnerLinkRef pLinkRef = ((OAssign.PartnerLinkRef) ocopy.to);
+                PartnerLinkInstance plval = _scopeFrame
+                        .resolve(pLinkRef.partnerLink);
+                replaceEndpointRefence(plval, rvalue);
+                se = new PartnerLinkModificationEvent(((OAssign.PartnerLinkRef)
ocopy.to).partnerLink.getName());
+            } else {
+                // Sneakily converting the EPR if it's not the format expected by the
lvalue
+                if (ocopy.from instanceof OAssign.PartnerLinkRef) {
+                    rvalue =
getBpelRuntimeContext().convertEndpointReference((Element)rvalue, lvaluePtr);
+                    if (rvalue.getNodeType() == Node.DOCUMENT_NODE)
+                        rvalue = ((Document)rvalue).getDocumentElement();
+                }
+
+                 Node parentNode = lvaluePtr.getParentNode();
+                if (headerAssign && parentNode != null &&
"message".equals(parentNode.getNodeName()) &&
rvalue.getNodeType()==Node.ELEMENT_NODE ) {
+                    lvalue = copyInto((Element)lvalue, (Element) lvaluePtr, (Element)
rvalue);
+                } else if (rvalue.getNodeType() == Node.ELEMENT_NODE &&
lvaluePtr.getNodeType() == Node.ELEMENT_NODE) {
+                    lvalue = replaceElement((Element)lvalue, (Element) lvaluePtr,
(Element) rvalue,
+                            ocopy.keepSrcElementName);
+                } else {
+                    lvalue = replaceContent(lvalue, lvaluePtr, rvalue.getTextContent());
+                }
+                final VariableInstance lval =
_scopeFrame.resolve(ocopy.to.getVariable());
+                if (__log.isDebugEnabled())
+                    __log.debug("ASSIGN Writing variable '" +
lval.declaration.name +
+                                "' value '" +
DOMUtils.domToString(lvalue) +"'");
+                commitChanges(lval, lvalue);
+                se = new VariableModificationEvent(lval.declaration.name);
+                ((VariableModificationEvent)se).setNewValue(lvalue);
+            }
+        }
+
+        if (ocopy.debugInfo != null)
+            se.setLineNo(ocopy.debugInfo.startLine);
+        sendEvent(se);
+    }
+
+    @Override
+    Node fetchVariableData(VariableInstance variable, boolean forWriting)
+            throws FaultException {
+        try {
+            return super.fetchVariableData(variable, forWriting);
+        } catch (FaultException fe) {
+            if (forWriting) {
+                fe = new FaultException(fe.getQName(), fe.getMessage(), new
Throwable("throwUninitializedToVariable"));
+            }
+            throw fe;
+        }
+    }
+    
+    private void replaceEndpointRefence(PartnerLinkInstance plval, Node rvalue) throws
FaultException {
+      if (rvalue.getNodeType() == Node.ATTRIBUTE_NODE){
+          rvalue = rvalue.getOwnerDocument().createTextNode(((Attr) rvalue).getValue());
+      }
+        // Eventually wrapping with service-ref element if we've been directly
assigned some
+        // value that isn't wrapped.
+        if (rvalue.getNodeType() == Node.TEXT_NODE ||
+                (rvalue.getNodeType() == Node.ELEMENT_NODE &&
!rvalue.getLocalName().equals("service-ref"))) {
+            Document doc = DOMUtils.newDocument();
+            Element serviceRef = doc.createElementNS(Namespaces.WSBPEL2_0_FINAL_SERVREF,
"service-ref");
+            doc.appendChild(serviceRef);
+            serviceRef.appendChild(doc.importNode(rvalue, true));
+            rvalue = serviceRef;
+        }
+
+        getBpelRuntimeContext().writeEndpointReference(plval, (Element)rvalue);
+    }
+
+    private Element replaceElement(Element lval, Element ptr, Element src,
+                                boolean keepSrcElement) {
+        Document doc = ptr.getOwnerDocument();
+        Node parent = ptr.getParentNode();
+        if (keepSrcElement) {
+            Element replacement = (Element)doc.importNode(src, true);
+            parent.replaceChild(replacement, ptr);
+            return (lval == ptr) ? replacement :  lval;
+        }
+
+        Element replacement = doc.createElementNS(ptr.getNamespaceURI(),
ptr.getTagName());
+        NodeList nl = src.getChildNodes();
+        for (int i = 0; i < nl.getLength(); ++i)
+            replacement.appendChild(doc.importNode(nl.item(i), true));
+        NamedNodeMap attrs = src.getAttributes();
+        for (int i = 0; i < attrs.getLength(); ++i) {
+            Attr attr = (Attr)attrs.item(i);
+            if (!attr.getName().startsWith("xmlns")) {
+                replacement.setAttributeNodeNS((Attr)doc.importNode(attrs.item(i),
true));
+                // Case of qualified attribute values, we're forced to add
corresponding namespace declaration manually
+                int colonIdx = attr.getValue().indexOf(":");
+                if (colonIdx > 0) {
+                    String prefix = attr.getValue().substring(0, colonIdx);
+                    String attrValNs = src.lookupPrefix(prefix);
+                    if (attrValNs != null)
+                       replacement.setAttributeNS(DOMUtils.NS_URI_XMLNS,
"xmlns:"+ prefix, attrValNs);
+                }
+            }
+        }
+        parent.replaceChild(replacement, ptr);
+        DOMUtils.copyNSContext(ptr, replacement);
+        
+        return (lval == ptr) ? replacement :  lval;
+    }
+
+    private Element copyInto(Element lval, Element ptr, Element src) {
+        ptr.appendChild(ptr.getOwnerDocument().importNode(src, true));
+        return lval;
+    }
+
+    /**
+     * isInsert flag desginates this as an 'element' type insertion, which
+     * requires insert the actual element value, rather than it's children
+     *
+     * @return
+     * @throws FaultException
+     */
+    private Node replaceContent(Node lvalue, Node lvaluePtr, String rvalue)
+            throws FaultException {
+        Document d = lvaluePtr.getOwnerDocument();
+
+        if (__log.isDebugEnabled()) {
+            __log.debug("lvaluePtr type " + lvaluePtr.getNodeType());
+            __log.debug("lvaluePtr " + DOMUtils.domToString(lvaluePtr));
+            __log.debug("lvalue " + lvalue);
+            __log.debug("rvalue " + rvalue);
+        }
+
+        switch (lvaluePtr.getNodeType()) {
+            case Node.ELEMENT_NODE:
+
+                // Remove all the children.
+                while (lvaluePtr.hasChildNodes())
+                    lvaluePtr.removeChild(lvaluePtr.getFirstChild());
+
+                // Append a new text node.
+                lvaluePtr.appendChild(d.createTextNode(rvalue));
+
+                // If lvalue is a text, removing all lvaluePtr children had just removed
it
+                // so we need to rebuild it as a child of lvaluePtr
+                if (lvalue instanceof Text)
+                    lvalue = lvaluePtr.getFirstChild();
+                break;
+
+            case Node.TEXT_NODE:
+
+                Node newval = d.createTextNode(rvalue);
+                // Replace ourselves .
+                lvaluePtr.getParentNode().replaceChild(newval, lvaluePtr);
+
+                // A little kludge, let our caller know that the root element has
changed.
+                // (used for assignment to a simple typed variable)
+                if (lvalue.getNodeType() == Node.ELEMENT_NODE) {
+                    // No children, adding an empty text children to point to
+                    if (lvalue.getFirstChild() == null) {
+                        Text txt =
lvalue.getOwnerDocument().createTextNode("");
+                        lvalue.appendChild(txt);
+                    }
+                    if (lvalue.getFirstChild().getNodeType() == Node.TEXT_NODE)
+                        lvalue = lvalue.getFirstChild();
+                }
+                if (lvalue.getNodeType() == Node.TEXT_NODE && ((Text)
lvalue).getWholeText().equals(
+                        ((Text) lvaluePtr).getWholeText()))
+                    lvalue = lvaluePtr = newval;
+                break;
+
+            case Node.ATTRIBUTE_NODE:
+
+                ((Attr) lvaluePtr).setValue(rvalue);
+                break;
+
+            default:
+                // This could occur if the expression language selects something
+                // like
+                // a PI or a CDATA.
+                String msg = __msgs.msgInvalidLValue();
+                if (__log.isDebugEnabled())
+                    __log.debug(lvaluePtr + ": " + msg);
+                throw new FaultException(
+                        getOActivity().getOwner().constants.qnSelectionFailure, msg);
+        }
+
+        return lvalue;
+    }
+
+    private Node evalQuery(Node data, OMessageVarType.Part part,
+                           OExpression expression, EvaluationContext ec) throws
FaultException {
+        assert data != null;
+
+        if (part != null) {
+            QName partName = new QName(null, part.name);
+            Node qualLVal = DOMUtils.findChildByName((Element) data, partName);
+            if (part.type instanceof OElementVarType) {
+                QName elName = ((OElementVarType) part.type).elementType;
+                qualLVal = DOMUtils.findChildByName((Element) qualLVal, elName);
+            } else if (part.type == null) {
+                // Special case of header parts never referenced in the WSDL def
+                if (qualLVal != null && qualLVal.getNodeType() ==
Node.ELEMENT_NODE
+                        &&
((Element)qualLVal).getAttribute("headerPart") != null
+                        && DOMUtils.getTextContent(qualLVal) == null)
+                    qualLVal = DOMUtils.getFirstChildElement((Element) qualLVal);
+                // The needed part isn't there, dynamically creating it
+                if (qualLVal == null) {
+                    qualLVal = data.getOwnerDocument().createElementNS(null, part.name);
+                    ((Element)qualLVal).setAttribute("headerPart",
"true");
+                    data.appendChild(qualLVal);
+                }
+            }
+            data = qualLVal;
+        }
+
+        if (expression != null) {
+            // Neat little trick....
+            try {
+                data = ec.evaluateQuery(data, expression);
+            } catch (EvaluationException e) {
+                String msg = __msgs.msgEvalException(expression.toString(),
e.getMessage());
+                if (__log.isDebugEnabled()) __log.debug(expression + ": " +
msg);
+                if (e.getCause() instanceof FaultException) throw
(FaultException)e.getCause();
+                throw new
FaultException(getOActivity().getOwner().constants.qnSubLanguageExecutionFault, msg);
+            }
+        }
+
+        return data;
+    }
+
+    private class EvaluationContextProxy implements EvaluationContext {
+
+        private Variable _var;
+
+        private Node _varNode;
+
+        private Node _rootNode;
+
+        private EvaluationContext _ctx;
+        
+
+        private EvaluationContextProxy(Variable var, Node varNode) {
+            _var = var;
+            _varNode = varNode;
+            _ctx = getEvaluationContext();
+        }
+        
+        public Node readVariable(OScope.Variable variable, OMessageVarType.Part part)
throws FaultException {
+            if (variable.name.equals(_var.name)) {
+                if (part == null) return _varNode;
+                return _ctx.getPartData((Element)_varNode, part);
+
+            } else
+                return _ctx.readVariable(variable, part);
+
+        }       /**
+     * @see
org.apache.ode.bpel.explang.EvaluationContext#readMessageProperty(org.apache.ode.bpel.o.OScope.Variable,
+     *      org.apache.ode.bpel.o.OProcess.OProperty)
+     */
+    public String readMessageProperty(Variable variable, OProperty property)
+            throws FaultException {
+        return _ctx.readMessageProperty(variable, property);
+    }
+
+        /**
+         * @see
org.apache.ode.bpel.explang.EvaluationContext#isLinkActive(org.apache.ode.bpel.o.OLink)
+         */
+        public boolean isLinkActive(OLink olink) throws FaultException {
+            return _ctx.isLinkActive(olink);
+        }
+
+        /**
+         * @see org.apache.ode.bpel.explang.EvaluationContext#getRootNode()
+         */
+        public Node getRootNode() {
+            return _rootNode;
+        }
+
+        /**
+         * @see
org.apache.ode.bpel.explang.EvaluationContext#evaluateQuery(org.w3c.dom.Node,
+         *      org.apache.ode.bpel.o.OExpression)
+         */
+        public Node evaluateQuery(Node root, OExpression expr)
+                throws FaultException {
+            _rootNode = root;
+            try {
+                return getBpelRuntimeContext().getExpLangRuntime()
+                        .evaluateNode(expr, this);
+            } catch (org.apache.ode.bpel.explang.EvaluationException e) {
+                throw new InvalidProcessException("Expression Failed: " +
expr,
+                        e);
+            }
+        }
+
+        public Node getPartData(Element message, Part part) throws FaultException {
+            return _ctx.getPartData(message,part);
+        }
+
+        public Long getProcessId() {
+            return _ctx.getProcessId();
+        }
+
+        public boolean narrowTypes() {
+            return false;
+        }
+
+        public URI getBaseResourceURI() {
+            return _ctx.getBaseResourceURI();
+        }
+
+        public Node getPropertyValue(QName propertyName) {
+            return _ctx.getPropertyValue(propertyName);
+        }
+
+        public QName getProcessQName() {
+            return _ctx.getProcessQName();
+        }
+
+        public Date getCurrentEventDateTime() {
+            return Calendar.getInstance().getTime(); 
+        }
+    }
+
+}

Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java	2011-02-23
11:30:49 UTC (rev 1311)
+++
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java	2011-02-24
11:47:25 UTC (rev 1312)
@@ -54,6 +54,8 @@
 import org.apache.ode.jacob.ChannelListener;
 import org.apache.ode.jacob.SynchChannel;
 import org.w3c.dom.Element;
+import org.apache.ode.bpel.common.FaultException;
+import org.apache.ode.bpel.evar.ExternalVariableModuleException;
 
 /**
  * An active scope.
@@ -72,8 +74,38 @@
         super(self, frame, linkFrame);
         _oscope = (OScope) self.o;
         assert _oscope.activity != null;
+
+        // madars.vitolins _at gmail.com 2009.03.29
+        // inline variable initialization
+        // Initialize variables at scope creation
+        try{
+        	initVars();
+        } catch (ExternalVariableModuleException e) {
+        	__log.error("Exception while doing inline external variable
initialization", e);
+        	_self.parent.failure(e.toString(), null);
+        	return;
+        } catch (FaultException e){
+        	__log.error("Exception while doing inline variable initialization",
e);
+        	_self.parent.failure(e.toString(), null);
+        }	
     }
 
+	/**
+	 * Initialize variables (at inline)
+	 * It processes all scope's variables
+	 * @author madars.vitolins _at gmail.com, 2009.03.28
+	 */
+	private void initVars() throws FaultException,
+					ExternalVariableModuleException {
+		AssignHelper assignHelper = new AssignHelper(_self, _scopeFrame, _linkFrame);
+		for (OScope.Variable var : _oscope.variables.values()) {
+     
+			if (var != null && var.from != null) {
+				assignHelper.initVar(var);
+			}// if var..
+		}// for (OScope
+	}
+
     public void run() {
         
         // Start the child activity.


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[riftsaw-commits] riftsaw SVN: r1312 - in branches/ODE/RiftSaw-ODE-trunk: bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom and 2 other directories.