Author: mriou
Date: Fri Aug 22 17:23:57 2008
New Revision: 688231
URL: http://svn.apache.org/viewvc?rev=688231&view=rev
Log:
Many bug fixes. Got hello world and dynpartner to run.
Modified:
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompilerImpl.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerImpl.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerImpl.java
ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/Serializers.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExpressionLanguageRuntimeRegistry.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PROCESS.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/SEQUENCE.java
Modified:
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java?rev=688231&r1=688230&r2=688231&view=diff
==============================================================================
---
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java
(original)
+++
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java
Fri Aug 22 17:23:57 2008
@@ -44,14 +44,12 @@
* the <code><propertyAlias;></code> BPEL process document element).
* </p>
*/
-public class CorrelationKey {
- // Changed so that it's not serializable
+public class CorrelationKey implements Serializable {
private static final long serialVersionUID = 1L;
/** CorrelationSet identifier. */
private int _csetId;
-
/** Key values. */
private final String _keyValues[];
Modified:
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompilerImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompilerImpl.java?rev=688231&r1=688230&r2=688231&view=diff
==============================================================================
---
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompilerImpl.java
(original)
+++
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompilerImpl.java
Fri Aug 22 17:23:57 2008
@@ -665,7 +665,7 @@
_konstExprLang.debugInfo = createDebugInfo(_processDef, "Constant
Value Expression Language");
_konstExprLang.expressionLanguageUri =
"uri:www.fivesight.com/konstExpression";
_konstExprLang.properties.put("runtime-class",
-
"org.apache.ode.bpel.runtime.explang.konst.KonstExpressionLanguageRuntimeImpl");
+
"org.apache.ode.bpel.rtrep.v2.KonstExpressionLanguageRuntimeImpl");
_oprocess.expressionLanguages.add(_konstExprLang);
// Process the imports. Note, we expect all processes (Event BPEL 1.1)
Modified:
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerImpl.java?rev=688231&r1=688230&r2=688231&view=diff
==============================================================================
---
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerImpl.java
(original)
+++
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerImpl.java
Fri Aug 22 17:23:57 2008
@@ -71,7 +71,7 @@
_qnFnGetVariableData = new QName(_bpelNsURI, "getVariableData");
_qnFnGetVariableProperty = new QName(_bpelNsURI,
"getVariableProperty");
_qnFnGetLinkStatus = new QName(_bpelNsURI, "getLinkStatus");
- _properties.put("runtime-class",
"org.apache.ode.bpel.elang.xpath10.runtime.XPath10ExpressionRuntime");
+ _properties.put("runtime-class",
"org.apache.ode.bpel.rtrep.v2.xpath10.XPath10ExpressionRuntime");
}
/**
Modified:
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerImpl.java?rev=688231&r1=688230&r2=688231&view=diff
==============================================================================
---
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerImpl.java
(original)
+++
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerImpl.java
Fri Aug 22 17:23:57 2008
@@ -73,7 +73,7 @@
_qnVarData = new QName(_bpelNS,
Constants.EXT_FUNCTION_GETVARIABLEDATA);
_qnXslTransform = new QName(_bpelNS,
Constants.EXT_FUNCTION_DOXSLTRANSFORM);
- _properties.put("runtime-class",
"org.apache.ode.bpel.elang.xpath20.runtime.XPath20ExpressionRuntime");
+ _properties.put("runtime-class",
"org.apache.ode.bpel.rtrep.v2.xpath20.XPath20ExpressionRuntime");
TransformerFactory trsf = new net.sf.saxon.TransformerFactoryImpl();
XslTransformHandler.getInstance().setTransformerFactory(trsf);
}
Modified:
ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java?rev=688231&r1=688230&r2=688231&view=diff
==============================================================================
---
ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
(original)
+++
ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
Fri Aug 22 17:23:57 2008
@@ -392,6 +392,7 @@
// We have a match, so we can get rid of the routing entries.
correlator.removeRoutes(mroute.getGroupId(), instanceDao);
+ mexdao.setInstance(instanceDao);
// Found message matching one of our selectors.
if (__log.isDebugEnabled()) {
@@ -1196,7 +1197,6 @@
}
assert mexdao.getStatus() == Status.ACK || mexdao.getStatus() ==
Status.ASYNC;
-
}
/**
Modified:
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/Serializers.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/Serializers.java?rev=688231&r1=688230&r2=688231&view=diff
==============================================================================
---
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/Serializers.java
(original)
+++
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/Serializers.java
Fri Aug 22 17:23:57 2008
@@ -3,6 +3,7 @@
import org.apache.ode.bpel.rapi.Serializer;
import java.io.InputStream;
+import java.io.IOException;
/**
* Factory to instantiate OModel serializers/deserializers for a specific
version of the model. It's
@@ -13,8 +14,8 @@
public static Serializer getLatest() {
return new
org.apache.ode.bpel.rtrep.v2.Serializer(System.currentTimeMillis());
}
- public static Serializer getLatest(InputStream stream) {
- return new
org.apache.ode.bpel.rtrep.v2.Serializer(System.currentTimeMillis());
+ public static Serializer getLatest(InputStream stream) throws IOException {
+ return new org.apache.ode.bpel.rtrep.v2.Serializer(stream);
}
@@ -22,7 +23,7 @@
// TODO switch on the version when we'll have more than one
return getLatest();
}
- public static Serializer getVersion(InputStream stream, int version) {
+ public static Serializer getVersion(InputStream stream, int version)
throws IOException {
// TODO switch on the version when we'll have more than one
return getLatest(stream);
}
Modified:
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExpressionLanguageRuntimeRegistry.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExpressionLanguageRuntimeRegistry.java?rev=688231&r1=688230&r2=688231&view=diff
==============================================================================
---
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExpressionLanguageRuntimeRegistry.java
(original)
+++
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExpressionLanguageRuntimeRegistry.java
Fri Aug 22 17:23:57 2008
@@ -40,22 +40,18 @@
}
public void registerRuntime(OExpressionLanguage oelang) throws
ConfigurationException {
+ String className = oelang.properties.get("runtime-class");
try {
- String className = oelang.properties.get("runtime-class");
- // backward compatibility.
- className = className.replace("com.fs.pxe.", "org.apache.ode.");
Class cls = Class.forName(className);
ExpressionLanguageRuntime elangRT = (ExpressionLanguageRuntime)
cls.newInstance();
elangRT.initialize(oelang.properties);
_runtimes.put(oelang, elangRT);
- } catch (ConfigurationException ce) {
- throw ce;
} catch (IllegalAccessException e) {
throw new ConfigurationException("Illegal Access Error", e);
} catch (InstantiationException e) {
throw new ConfigurationException("Instantiation Error", e);
} catch (ClassNotFoundException e) {
- throw new ConfigurationException("Class Not Found Error", e);
+ throw new ConfigurationException("Class Not Found Error: " +
className, e);
}
}
Modified:
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java?rev=688231&r1=688230&r2=688231&view=diff
==============================================================================
---
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java
(original)
+++
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java
Fri Aug 22 17:23:57 2008
@@ -128,7 +128,7 @@
}
}
- instance(new WAITING(pickResponseChannel));
+ instance(new WAITING(_scopeFrame, pickResponseChannel));
}
/**
@@ -236,8 +236,9 @@
private PickResponseChannel _pickResponseChannel;
- private WAITING(PickResponseChannel pickResponseChannel) {
+ private WAITING(ScopeFrame scopeFrame, PickResponseChannel
pickResponseChannel) {
this._pickResponseChannel = pickResponseChannel;
+ this._scopeFrame = scopeFrame;
}
public void run() {
Modified:
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PROCESS.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PROCESS.java?rev=688231&r1=688230&r2=688231&view=diff
==============================================================================
---
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PROCESS.java
(original)
+++
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PROCESS.java
Fri Aug 22 17:23:57 2008
@@ -62,7 +62,7 @@
}
public void completed(FaultData fault, Set<CompensationHandler>
compensations) {
- RuntimeInstanceImpl nativeAPI = (RuntimeInstanceImpl)
getExtension(RuntimeInstanceImpl.class);
+ RuntimeInstanceImpl nativeAPI = getBpelRuntime();
if (fault == null) {
nativeAPI.completedOk();
} else {
Modified:
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java?rev=688231&r1=688230&r2=688231&view=diff
==============================================================================
---
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java
(original)
+++
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java
Fri Aug 22 17:23:57 2008
@@ -632,6 +632,7 @@
importChannel(invokeId,
InvokeResponseChannel.class).onResponse();
}
});
+ break;
case FAULT:
_vpu.inject(new BpelJacobRunnable() {
private static final long serialVersionUID =
-1095444335740879981L;
@@ -640,6 +641,7 @@
importChannel(invokeId,
InvokeResponseChannel.class).onFault();
}
});
+ break;
case FAILURE:
_vpu.inject(new BpelJacobRunnable() {
private static final long serialVersionUID =
-1095444335740879981L;
@@ -648,6 +650,7 @@
importChannel(invokeId,
InvokeResponseChannel.class).onFailure();
}
});
+ break;
}
}
Modified:
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/SEQUENCE.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/SEQUENCE.java?rev=688231&r1=688230&r2=688231&view=diff
==============================================================================
---
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/SEQUENCE.java
(original)
+++
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/SEQUENCE.java
Fri Aug 22 17:23:57 2008
@@ -60,7 +60,7 @@
_remaining.get(0),
newChannel(TerminationChannel.class),
newChannel(ParentScopeChannel.class));
instance(createChild(child, _scopeFrame, _linkFrame));
- instance(new ACTIVE(child));
+ instance(new ACTIVE(_scopeFrame, child));
}
private class ACTIVE extends BpelJacobRunnable {
@@ -68,7 +68,8 @@
private ActivityInfo _child;
private boolean _terminateRequested = false;
- ACTIVE(ActivityInfo child) {
+ ACTIVE(ScopeFrame scopeFrame, ActivityInfo child) {
+ _scopeFrame = scopeFrame;
_child = child;
}
