0
@@ -97,7 +97,7 @@ WS_COMMONS          = struct(
0
 )
0
 XBEAN               = group("xbean-classloader", "xbean-kernel", "xbean-server", "xbean-spring",
0
                         :under=>"org.apache.xbean", :version=>"2.8")
0
-XMLBEANS            = "xmlbeans:xbean:jar:2.2.0"
0
+XMLBEANS            = "xmlbeans:xbean:jar:2.3.0"
0
 
0
 repositories.remote << "http://pxe.intalio.org/public/maven2"
0
 repositories.remote << "http://people.apache.org/repo/m2-incubating-repository"

0
@@ -69,7 +69,7 @@ public abstract class XPath10ExpressionCompilerImpl implements ExpressionCompile
0
         _qnFnGetVariableData = new QName(_bpelNsURI, "getVariableData");
0
         _qnFnGetVariableProperty = new QName(_bpelNsURI, "getVariableProperty");
0
         _qnFnGetLinkStatus = new QName(_bpelNsURI, "getLinkStatus");
0
-        _properties.put("runtime-class", "org.apache.ode.bpel.elang.xpath10.runtime.XPath10ExpressionRuntime");        
0
+        _properties.put("runtime-class", "org.apache.ode.bpel.jrep.v2.xpath10.XPath10ExpressionRuntime");        
0
     }
0
 
0
     /**

0
@@ -71,7 +71,7 @@ public class XPath20ExpressionCompilerImpl implements ExpressionCompiler {
0
         _qnVarData = new QName(_bpelNS, Constants.EXT_FUNCTION_GETVARIABLEDATA);
0
         _qnXslTransform = new QName(_bpelNS, Constants.EXT_FUNCTION_DOXSLTRANSFORM);
0
 
0
-        _properties.put("runtime-class", "org.apache.ode.bpel.elang.xpath20.runtime.XPath20ExpressionRuntime");
0
+        _properties.put("runtime-class", "org.apache.ode.bpel.jrep.v2.xpath20.XPath20ExpressionRuntime");
0
         TransformerFactory trsf = new net.sf.saxon.TransformerFactoryImpl();
0
         XslTransformHandler.getInstance().setTransformerFactory(trsf);
0
     }

0
@@ -115,7 +115,6 @@ class OdeProcess {
0
 
0
     DebuggerSupport _debugger;
0
 
0
-
0
     final ProcessConf _pconf;
0
 
0
     /** {@link MessageExchangeInterceptor}s registered for this process. */
0
@@ -142,7 +141,6 @@ class OdeProcess {
0
 
0
     OdeProcess(BpelServerImpl server, ProcessConf conf, BpelEventListener debugger, OdeRuntime odeRuntime) {
0
         _runtime = odeRuntime;
0
-        _runtime.init(conf);
0
         _server = server;
0
         _pid = conf.getProcessId();
0
         _pconf = conf;
0
@@ -1075,8 +1073,6 @@ class OdeProcess {
0
 
0
     class HydrationLatch extends NStateLatch {
0
 
0
-        private OdeRTInstance _runtime;
0
-
0
     HydrationLatch() {
0
             super(new Runnable[2]);
0
             _transitions[0] = new Runnable() {
0
@@ -1084,13 +1080,11 @@ class OdeProcess {
0
                     doDehydrate();
0
                 }
0
             };
0
-
0
             _transitions[1] = new Runnable() {
0
                 public void run() {
0
                     doHydrate();
0
                 }
0
             };
0
-
0
         }
0
 
0
         private void doDehydrate() {
0
@@ -1098,12 +1092,16 @@ class OdeProcess {
0
             _partnerRoles = null;
0
             _myRoles = null;
0
             _endpointToMyRoleMap = null;
0
+            _runtime.clear();
0
         }
0
 
0
         private void doHydrate() {
0
             markused();
0
             __log.debug("Rehydrating process " + _pconf.getProcessId());
0
-            
0
+
0
+            _runtime.init(_pconf);
0
+            _processModel = _runtime.getModel();
0
+
0
             setRoles(_processModel);
0
 
0
             if (!_hydratedOnce) {

0
@@ -16,5 +16,9 @@ public interface OdeRuntime {
0
 
0
     ReplacementMap getReplacementMap(QName processName);
0
 
0
+    ProcessModel getModel();
0
+
0
+    void clear();
0
+
0
     String extractProperty(Element msgData, PropertyAliasModel alias, String target) throws FaultException;
0
 }

0
@@ -8,10 +8,7 @@ import java.util.Set;
0
 
0
 import org.apache.commons.logging.Log;
0
 import org.apache.commons.logging.LogFactory;
0
-import org.apache.ode.bpel.engine.rapi.OdeRTInstance;
0
-import org.apache.ode.bpel.engine.rapi.OdeRTInstanceContext;
0
-import org.apache.ode.bpel.engine.rapi.OdeRuntime;
0
-import org.apache.ode.bpel.engine.rapi.PropertyAliasModel;
0
+import org.apache.ode.bpel.engine.rapi.*;
0
 import org.apache.ode.bpel.iapi.BpelEngineException;
0
 import org.apache.ode.bpel.iapi.ProcessConf;
0
 import org.apache.ode.bpel.jrep.v2.api.ConfigurationException;
0
@@ -99,11 +96,15 @@ public class Bpel20V2Runtime implements OdeRuntime {
0
     }
0
 
0
     public ReplacementMap getReplacementMap(QName processName) {
0
-        if (_oprocess.getQName().equals(processName))
0
+        if (_pconf.getProcessId().equals(processName))
0
             return new ReplacementMapImpl(_oprocess);
0
         else throw new UnsupportedOperationException("Implement the creation of replacement map for other version.");
0
     }
0
 
0
+    public ProcessModel getModel() {
0
+        return _oprocess;
0
+    }
0
+
0
     /**
0
      * Extract the value of a BPEL property from a BPEL messsage variable.
0
      *
0
@@ -143,6 +144,14 @@ public class Bpel20V2Runtime implements OdeRuntime {
0
             return null;
0
     }
0
 
0
+    public void clear() {
0
+        _pconf = null;
0
+        _oprocess = null;
0
+        _mustUnderstandExtensions = null;
0
+        _replacementMap = null;
0
+        _expLangRuntimeRegistry = null;
0
+        _extensionRegistry = null;
0
+    }
0
 
0
     /**
0
      * Read an {@link OProcess} representation from a stream.
0
@@ -160,4 +169,5 @@ public class Bpel20V2Runtime implements OdeRuntime {
0
         return compiledProcess;
0
     }
0
 
0
+
0
 }

0
@@ -23,9 +23,6 @@ import org.apache.commons.logging.LogFactory;
0
 import org.apache.ode.bpel.common.CorrelationKey;
0
 import org.apache.ode.bpel.common.FaultException;
0
 import org.apache.ode.bpel.engine.rapi.OdeRTInstanceContext;
0
-import org.apache.ode.bpel.jrep.v2.OBase;
0
-import org.apache.ode.bpel.jrep.v2.OProcess;
0
-import org.apache.ode.bpel.jrep.v2.OVarType;
0
 import org.apache.ode.bpel.jrep.v2.channels.FaultData;
0
 import org.apache.ode.jacob.JacobRunnable;
0
 import org.apache.ode.jacob.vpu.JacobVPU;
0
@@ -45,7 +42,7 @@ public abstract class BpelJacobRunnable extends JacobRunnable {
0
     private static final Log __log = LogFactory.getLog(BpelJacobRunnable.class);
0
 
0
     protected Bpel20V2RTInstanceImpl getBpelRuntime() {
0
-        Bpel20V2RTInstanceImpl nativeApi = (Bpel20V2RTInstanceImpl) JacobVPU.activeJacobThread().getExtension(Bpel20V2RTInstanceImpl.class);
0
+        Bpel20V2RTInstanceImpl nativeApi = (Bpel20V2RTInstanceImpl) JacobVPU.activeJacobThread().getExtension(OdeRTInstanceContext.class);
0
         assert nativeApi != null;
0
         return nativeApi;
0
     }

0
@@ -49,7 +49,7 @@ public class VariableInstance implements Serializable, Variable {
0
   }
0
 
0
   public long getScopeId() {
0
-		return declaration.declaringScope.getId();
0
+		return scopeInstance;
0
   }
0
 
0
 }