You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2009/03/05 01:09:42 UTC

svn commit: r750248 - in /ode/branches/restful: bpel-api/src/main/java/org/apache/ode/bpel/iapi/ bpel-api/src/main/java/org/apache/ode/bpel/rapi/ bpel-dao/src/main/java/org/apache/ode/bpel/dao/ dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ da...

Author: mriou
Date: Thu Mar  5 00:09:41 2009
New Revision: 750248

URL: http://svn.apache.org/viewvc?rev=750248&view=rev
Log:
Handling of url parameters for RESTful mexs. When a matching variable name is met in the receiving scope, initializing the variable value from the parameter.

Modified:
    ode/branches/restful/bpel-api/src/main/java/org/apache/ode/bpel/iapi/RESTInMessageExchange.java
    ode/branches/restful/bpel-api/src/main/java/org/apache/ode/bpel/rapi/IOContext.java
    ode/branches/restful/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java
    ode/branches/restful/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
    ode/branches/restful/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
    ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
    ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/RESTInMessageExchangeImpl.java
    ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java
    ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java
    ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/EH_EVENT.java
    ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ExprEvaluationContextImpl.java
    ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OVarType.java
    ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OdeInternalInstance.java
    ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java
    ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java
    ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ScopeFrame.java
    ode/branches/restful/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v2/CoreBpelTest.java

Modified: ode/branches/restful/bpel-api/src/main/java/org/apache/ode/bpel/iapi/RESTInMessageExchange.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/bpel-api/src/main/java/org/apache/ode/bpel/iapi/RESTInMessageExchange.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/bpel-api/src/main/java/org/apache/ode/bpel/iapi/RESTInMessageExchange.java (original)
+++ ode/branches/restful/bpel-api/src/main/java/org/apache/ode/bpel/iapi/RESTInMessageExchange.java Thu Mar  5 00:09:41 2009
@@ -14,5 +14,14 @@
 
     void setRequest(Message message);
 
+    /**
+     * Does that resource instantiates a new process?
+     * @return
+     */
     boolean isInstantiatingResource();
+
+    /**
+     * Sets a query parameter extracted from the requested URL
+     */
+    void setParameter(String name, String value);
 }

Modified: ode/branches/restful/bpel-api/src/main/java/org/apache/ode/bpel/rapi/IOContext.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/bpel-api/src/main/java/org/apache/ode/bpel/rapi/IOContext.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/bpel-api/src/main/java/org/apache/ode/bpel/rapi/IOContext.java (original)
+++ ode/branches/restful/bpel-api/src/main/java/org/apache/ode/bpel/rapi/IOContext.java Thu Mar  5 00:09:41 2009
@@ -1,6 +1,7 @@
 package org.apache.ode.bpel.rapi;
 
 import java.util.Date;
+import java.util.Map;
 
 import javax.wsdl.Operation;
 import javax.xml.namespace.QName;
@@ -90,6 +91,8 @@
      */
     Element getMyRequest(String mexId);
 
+    public Map<String,String> getProperties(String mexId);
+
     void setInstantiatingMex(String mexId);
 
     void releasePartnerMex(String mexId);

Modified: ode/branches/restful/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java (original)
+++ ode/branches/restful/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java Thu Mar  5 00:09:41 2009
@@ -20,6 +20,7 @@
 
 import java.util.Date;
 import java.util.Set;
+import java.util.Map;
 
 import javax.xml.namespace.QName;
 
@@ -253,6 +254,8 @@
 
     Set<String> getPropertyNames();
 
+    Map<String,String> getProperties();
+
     void setPartnerLink(PartnerLinkDAO plinkDAO);
 
     PartnerLinkDAO getPartnerLink();

Modified: ode/branches/restful/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java (original)
+++ ode/branches/restful/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java Thu Mar  5 00:09:41 2009
@@ -22,6 +22,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.Set;
+import java.util.Map;
 
 import javax.xml.namespace.QName;
 
@@ -332,6 +333,10 @@
         return Collections.unmodifiableSet(_hself.getProperties().keySet());
     }
 
+    public Map<String,String> getProperties() {
+        return _hself.getProperties();
+    }
+
     public void release() {
         // no-op for now, could be used to do some cleanup
     }

Modified: ode/branches/restful/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java (original)
+++ ode/branches/restful/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java Thu Mar  5 00:09:41 2009
@@ -19,12 +19,7 @@
 
 package org.apache.ode.dao.jpa;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.StringTokenizer;
+import java.util.*;
 
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
@@ -241,6 +236,14 @@
         return propNames;
 	}
 
+    public Map<String,String> getProperties() {
+        HashMap<String,String> res = new  HashMap<String, String>();
+        for (MexProperty prop : _props) {
+            res.put(prop.getPropertyKey(), prop.getPropertyValue());
+        }
+        return res;
+    }
+
 	public MessageDAO getRequest() {
 		return _request;
 	}

Modified: ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java (original)
+++ ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java Thu Mar  5 00:09:41 2009
@@ -886,6 +886,11 @@
         return mergeHeaders(request);
     }
 
+    public Map<String,String> getProperties(String mexId) {
+        MessageExchangeDAO dao = getExistingMex(mexId);
+        return dao.getProperties();
+    }
+
     public void setInstantiatingMex(String mexId) {
         MessageExchangeDAO mex = getExistingMex(mexId);
         mex.setInstantiatingResource(true);

Modified: ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/RESTInMessageExchangeImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/RESTInMessageExchangeImpl.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/RESTInMessageExchangeImpl.java (original)
+++ ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/RESTInMessageExchangeImpl.java Thu Mar  5 00:09:41 2009
@@ -8,6 +8,7 @@
 
 import javax.xml.namespace.QName;
 import java.util.concurrent.*;
+import java.util.HashMap;
 
 public class RESTInMessageExchangeImpl extends MessageExchangeImpl implements RESTInMessageExchange {
 
@@ -69,6 +70,10 @@
         return _future;
     }
 
+    public void setParameter(String name, String value) {
+        setProperty(name, value);
+    }
+
     protected MessageExchangeDAO doInvoke() {
         if (getStatus() != Status.NEW) throw new IllegalStateException("Invalid state: " + getStatus());
         request();

Modified: ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java (original)
+++ ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java Thu Mar  5 00:09:41 2009
@@ -19,10 +19,7 @@
 
 package org.apache.ode.bpel.memdao;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
 import java.util.Map.Entry;
 
 import javax.xml.namespace.QName;
@@ -61,7 +58,7 @@
 	ProcessInstanceDAO instance;
 	char direction;
 	QName callee;
-	Properties properties = new Properties();
+	HashMap<String,String> properties = new HashMap<String,String>();
     PartnerLinkDAOImpl _plink;
     InvocationStyle _istyle;
     String _pipedExchange;
@@ -244,11 +241,11 @@
 	}
 
 	public String getProperty(String key) {
-		return properties.getProperty(key);
+		return properties.get(key);
 	}
 
 	public void setProperty(String key, String value) {
-		properties.setProperty(key,value);
+		properties.put(key,value);
 	}
 
     public void setPartnerLink(PartnerLinkDAO plinkDAO) {
@@ -262,12 +259,15 @@
 
     public Set<String> getPropertyNames() {
         HashSet<String> retVal = new HashSet<String>();
-        for (Entry<Object,Object> e : properties.entrySet()) {
-            retVal.add((String)e.getKey());
+        for (Entry<String,String> e : properties.entrySet()) {
+            retVal.add(e.getKey());
         }
         return retVal;
     }
 
+    public Map<String, String> getProperties() {
+        return properties;
+    }
 
     public void release() {
         instance = null;

Modified: ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java (original)
+++ ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java Thu Mar  5 00:09:41 2009
@@ -395,7 +395,7 @@
             } else if (ocopy.to.getVariable().type instanceof OPropertyVarType) {
                 // For poperty assignment, the property, the variable that points to it and the correlation set
                 // all have the same name
-                CorrelationSetInstance csetInstance = _scopeFrame.resolve(ocopy.to.getVariable().name);
+                CorrelationSetInstance csetInstance = _scopeFrame.resolveCorrelation(ocopy.to.getVariable().name);
                 CorrelationKey ckey = new CorrelationKey(csetInstance.declaration.getId(), new String[] { rvalue.getTextContent() });
                 if (__log.isDebugEnabled()) __log.debug("Writing correlation " + csetInstance.getName()
                         + " using value " + rvalue.getTextContent());

Modified: ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/EH_EVENT.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/EH_EVENT.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/EH_EVENT.java (original)
+++ ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/EH_EVENT.java Thu Mar  5 00:09:41 2009
@@ -20,6 +20,7 @@
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -36,10 +37,13 @@
 import org.apache.ode.bpel.rtrep.v2.channels.TerminationChannelListener;
 import org.apache.ode.bpel.rapi.InvalidProcessException;
 import org.apache.ode.bpel.evt.VariableModificationEvent;
+import org.apache.ode.bpel.evar.ExternalVariableModuleException;
 import org.apache.ode.jacob.ChannelListener;
 import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.utils.DOMUtils;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
+import org.w3c.dom.Document;
 
 /**
  * Message event handler.
@@ -255,6 +259,29 @@
                                 }
                             }
 
+                            if (_oevent.isRestful()) {
+                                // Retrieving the map of properties associated with a RESTful mex. Those are the query
+                                // parameters and are used to set implicit variables associated with these parameters
+                                // in the process.
+                                Map<String,String> props = getBpelRuntime().getProperties(mexId);
+                                for (Map.Entry<String, String> entry : props.entrySet()) {
+                                    VariableInstance vi = _scopeFrame.resolveVariable(entry.getKey());
+                                    if (vi != null) {
+                                        // Always expected to be a string
+                                        Document doc = DOMUtils.newDocument();
+                                        Node textNode = doc.createTextNode(entry.getValue());
+                                        try {
+                                            initializeVariable(vi, textNode);
+                                        } catch (ExternalVariableModuleException e) {
+                                            __log.error("Exception while initializing external variable", e);
+                                            _psc.failure(e.toString(), null);
+                                            return;
+                                        }
+                                    }
+                                }
+
+                            }
+
                             try {
                                 for (OScope.CorrelationSet cset : _oevent.initCorrelations) {
                                     initializeCorrelation(ehScopeFrame.resolve(cset), ehScopeFrame.resolve(_oevent.variable));

Modified: ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ExprEvaluationContextImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ExprEvaluationContextImpl.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ExprEvaluationContextImpl.java (original)
+++ ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ExprEvaluationContextImpl.java Thu Mar  5 00:09:41 2009
@@ -72,7 +72,7 @@
         if (variable.type instanceof OConstantVarType) {
             ret = ((OConstantVarType) variable.type).getValue();
         } else if (variable.type instanceof OPropertyVarType) {
-            CorrelationSetInstance set = _scopeInstance.resolve(variable.name);
+            CorrelationSetInstance set = _scopeInstance.resolveCorrelation(variable.name);
             CorrelationKey key = _native.readCorrelation(set);
             if (key == null) return null;
             String keyValue = key.getValues()[0];

Modified: ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OVarType.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OVarType.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OVarType.java (original)
+++ ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OVarType.java Thu Mar  5 00:09:41 2009
@@ -31,6 +31,7 @@
     public static int SCHEMA_TYPE = 0;
     public static int NUMBER_TYPE = 1;
     public static int STRING_TYPE = 2;
+    public static int BOOLEAN_TYPE = 3;
 
     public int underlyingType = SCHEMA_TYPE;
     

Modified: ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OdeInternalInstance.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OdeInternalInstance.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OdeInternalInstance.java (original)
+++ ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OdeInternalInstance.java Thu Mar  5 00:09:41 2009
@@ -17,6 +17,7 @@
 import javax.xml.namespace.QName;
 import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
 import java.net.URI;
 
 
@@ -73,6 +74,8 @@
 
     Element getMyRequest(String mexId);
 
+    Map<String,String> getProperties(String mexId);
+
     void setInstantiatingMex(String mexId);
 
     void registerTimer(TimerResponseChannel timerChannel, Date future);

Modified: ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java (original)
+++ ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java Thu Mar  5 00:09:41 2009
@@ -21,6 +21,7 @@
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
 
 import javax.xml.namespace.QName;
 
@@ -41,6 +42,7 @@
 import org.apache.ode.bpel.iapi.BpelEngineException;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
+import org.w3c.dom.Document;
 
 /**
  * Template for the BPEL <code>pick</code> activity.
@@ -217,6 +219,26 @@
                 }
 
             }
+        } else {
+            // Retrieving the map of properties associated with a RESTful mex. Those are the query
+            // parameters and are used to set implicit variables associated with these parameters
+            // in the process.
+            Map<String,String> props = getBpelRuntime().getProperties(mexId);
+            for (Map.Entry<String, String> entry : props.entrySet()) {
+                VariableInstance vi = _scopeFrame.resolveVariable(entry.getKey());
+                if (vi != null) {
+                    // Always expected to be a string
+                    Document doc = DOMUtils.newDocument();
+                    Node textNode = doc.createTextNode(entry.getValue());
+                    try {
+                        initializeVariable(vi, textNode);
+                    } catch (ExternalVariableModuleException e) {
+                        __log.error("Exception while initializing external variable", e);
+                        _self.parent.failure(e.toString(), null);
+                        return;
+                    }
+                }
+            }
         }
 
         VariableInstance vinst = _scopeFrame.resolve(onMessage.variable);

Modified: ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java (original)
+++ ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java Thu Mar  5 00:09:41 2009
@@ -4,6 +4,7 @@
 import java.io.OutputStream;
 import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
 import java.net.URI;
 
 import javax.wsdl.Operation;
@@ -372,6 +373,10 @@
         return _brc.getMyRequest(mexId);
     }
 
+    public Map<String,String> getProperties(String mexId) {
+        return _brc.getProperties(mexId);
+    }
+
     public void setInstantiatingMex(String mexId) {
         _brc.setInstantiatingMex(mexId);
     }

Modified: ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ScopeFrame.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ScopeFrame.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ScopeFrame.java (original)
+++ ode/branches/restful/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ScopeFrame.java Thu Mar  5 00:09:41 2009
@@ -99,14 +99,21 @@
         return new VariableInstance(scopeFrame.scopeInstanceId, variable);
     }
 
+    public VariableInstance resolveVariable(String variableName) {
+        OScope.Variable cset = oscope.getLocalVariable(variableName);
+        if (cset != null) return new VariableInstance(scopeInstanceId, cset);
+        else if (parent != null) return parent.resolveVariable(variableName);
+        else return null;
+    }
+
     public CorrelationSetInstance resolve(OScope.CorrelationSet cset) {
         return new CorrelationSetInstance(find(cset.declaringScope).scopeInstanceId, cset);
     }
 
-    public CorrelationSetInstance resolve(String correlationName) {
+    public CorrelationSetInstance resolveCorrelation(String correlationName) {
         OScope.CorrelationSet cset = oscope.getCorrelationSet(correlationName);
         if (cset != null) return new CorrelationSetInstance(scopeInstanceId, cset);
-        else if (parent != null) return parent.resolve(correlationName);
+        else if (parent != null) return parent.resolveCorrelation(correlationName);
         else return null;
     }
 

Modified: ode/branches/restful/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v2/CoreBpelTest.java
URL: http://svn.apache.org/viewvc/ode/branches/restful/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v2/CoreBpelTest.java?rev=750248&r1=750247&r2=750248&view=diff
==============================================================================
--- ode/branches/restful/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v2/CoreBpelTest.java (original)
+++ ode/branches/restful/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v2/CoreBpelTest.java Thu Mar  5 00:09:41 2009
@@ -24,6 +24,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Collection;
+import java.util.Map;
 
 import javax.wsdl.Operation;
 import javax.xml.namespace.QName;
@@ -114,6 +115,10 @@
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    public Map<String, String> getProperties(String mexId) {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
     public void initializeResource(Long parentScopeId, OResource resource, String url) {
         //To change body of implemented methods use File | Settings | File Templates.
     }