You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ka...@apache.org on 2009/01/06 23:27:49 UTC
svn commit: r732154 [1/2] - in /ode/branches/APACHE_ODE_1.X:
bpel-api/src/main/java/org/apache/ode/bpel/common/
bpel-api/src/main/java/org/apache/ode/bpel/evt/
bpel-api/src/test/java/org/apache/ode/bpel/common/
bpel-compiler/src/main/java/org/apache/od...
Author: karthick
Date: Tue Jan 6 14:27:48 2009
New Revision: 732154
URL: http://svn.apache.org/viewvc?rev=732154&view=rev
Log:
The unique correlation set feature (revision 728144) is being reverted from this branch and will only be available in the trunk.
Added:
ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKeySet.java
- copied unchanged from r728143, ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKeySet.java
Removed:
ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKeys.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/NonRetriableException.java
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationUnique/
Modified:
ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java
ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/CorrelationMatchEvent.java
ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/CorrelationNoMatchEvent.java
ode/branches/APACHE_ODE_1.X/bpel-api/src/test/java/org/apache/ode/bpel/common/CorrelationKeySetTest.java
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickReceiveGenerator.java
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/CorrelationSet.java
ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/CorrelatorDAO.java
ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageRouteDAO.java
ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java
ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OConstants.java
ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java
ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelManagementFacadeImpl.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/WorkEvent.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageRouteDaoImpl.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelJacobRunnable.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/InvalidProcessException.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/Selector.java
ode/branches/APACHE_ODE_1.X/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java
ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
Modified: ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/common/CorrelationKey.java Tue Jan 6 14:27:48 2009
@@ -53,9 +53,6 @@
/** Key values. */
private final String _keyValues[];
-
- /** System-Wide Unique? */
- private boolean unique = false;
/**
* Constructor.
@@ -127,20 +124,6 @@
}
/**
- * Is this correlation key system-wide unique?
- *
- * @return <code>true</code> if the key is declared to be unique
- * otherwise <code>false</code>
- */
- public boolean isUnique() {
- return unique;
- }
-
- public void setUnique(boolean unique) {
- this.unique = unique;
- }
-
- /**
* Equals comperator method.
*
* @param o
Modified: ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/CorrelationMatchEvent.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/CorrelationMatchEvent.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/CorrelationMatchEvent.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/CorrelationMatchEvent.java Tue Jan 6 14:27:48 2009
@@ -19,7 +19,7 @@
package org.apache.ode.bpel.evt;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import javax.xml.namespace.QName;
@@ -31,18 +31,18 @@
// left out for backward-compatibility
private CorrelationKey _correlationKey;
- private CorrelationKeys _correlationKeySet;
+ private CorrelationKeySet _correlationKeySet;
- public CorrelationMatchEvent(QName processName, QName processId, Long processInstanceId, CorrelationKeys correlationKeySet) {
+ public CorrelationMatchEvent(QName processName, QName processId, Long processInstanceId, CorrelationKeySet correlationKeySet) {
super(PROCESS_INPUT, processName, processId, processInstanceId);
_correlationKeySet = correlationKeySet;
}
- public CorrelationKeys getCorrelationKeySet() {
+ public CorrelationKeySet getCorrelationKeySet() {
// backward compatibility; add up
if (_correlationKey != null) {
if( _correlationKeySet == null ) {
- _correlationKeySet = new CorrelationKeys();
+ _correlationKeySet = new CorrelationKeySet();
}
if(!_correlationKeySet.contains(_correlationKey)) {
_correlationKeySet.add(_correlationKey);
@@ -52,7 +52,7 @@
return _correlationKeySet;
}
- public void setCorrelationKey(CorrelationKeys correlationKeySet) {
+ public void setCorrelationKey(CorrelationKeySet correlationKeySet) {
_correlationKeySet = correlationKeySet;
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/CorrelationNoMatchEvent.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/CorrelationNoMatchEvent.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/CorrelationNoMatchEvent.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-api/src/main/java/org/apache/ode/bpel/evt/CorrelationNoMatchEvent.java Tue Jan 6 14:27:48 2009
@@ -24,7 +24,7 @@
import javax.xml.namespace.QName;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
/**
* Message arrived and matched neither (a) createInstance or (b) correlation
@@ -35,19 +35,19 @@
// left out for backward-compatibility
private final Set<CorrelationKey> _keys = new HashSet<CorrelationKey>();
- private CorrelationKeys _keySet = null;
+ private CorrelationKeySet _keySet = null;
public CorrelationNoMatchEvent(QName qName, String opName, String mexId,
- CorrelationKeys keySet) {
+ CorrelationKeySet keySet) {
super(qName, opName, mexId);
_keySet = keySet;
}
- public CorrelationKeys getKeySet() {
+ public CorrelationKeySet getKeySet() {
// backward-compatibility; add up keys
if( _keys.size() > 0 && _keySet == null ) {
- _keySet = new CorrelationKeys();
+ _keySet = new CorrelationKeySet();
}
for (CorrelationKey aKey : _keys) {
if (aKey != null && !_keySet.contains(aKey)) {
@@ -58,7 +58,7 @@
return _keySet;
}
- public void setKeys(CorrelationKeys keySet) {
+ public void setKeys(CorrelationKeySet keySet) {
_keySet = keySet;
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-api/src/test/java/org/apache/ode/bpel/common/CorrelationKeySetTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-api/src/test/java/org/apache/ode/bpel/common/CorrelationKeySetTest.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-api/src/test/java/org/apache/ode/bpel/common/CorrelationKeySetTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-api/src/test/java/org/apache/ode/bpel/common/CorrelationKeySetTest.java Tue Jan 6 14:27:48 2009
@@ -14,7 +14,7 @@
@Test
public void testCanonicalString() throws Exception {
- CorrelationKeys setA = new CorrelationKeys();
+ CorrelationKeySet setA = new CorrelationKeySet();
setA.add(keyX);
setA.add(optY);
assertEquals("@2[1~a~b],[2~b~c]", setA.toCanonicalString());
@@ -22,8 +22,8 @@
@Test
public void testContainsAll() throws Exception {
- CorrelationKeys setA = new CorrelationKeys();
- CorrelationKeys setB = new CorrelationKeys();
+ CorrelationKeySet setA = new CorrelationKeySet();
+ CorrelationKeySet setB = new CorrelationKeySet();
assertTrue(setA.containsAll(setB));
setA.add(keyX);
@@ -39,32 +39,32 @@
@Test
public void testRestoreFromCanonicalForm() throws Exception {
- assertEquals(new CorrelationKeys(null), new CorrelationKeys());
- assertEquals(new CorrelationKeys(""), new CorrelationKeys());
+ assertEquals(new CorrelationKeySet(null), new CorrelationKeySet());
+ assertEquals(new CorrelationKeySet(""), new CorrelationKeySet());
- assertEquals(new CorrelationKeys("-1~session_key"),
- new CorrelationKeys().add(new CorrelationKey(-1, new String[] {"session_key"})));
- assertEquals(new CorrelationKeys("1~key1~key2"),
- new CorrelationKeys().add(new CorrelationKey(1, new String[] {"key1", "key2"})));
-
- assertEquals(new CorrelationKeys("@2"), new CorrelationKeys());
- assertEquals(new CorrelationKeys("@2[-1~session_key]"),
- new CorrelationKeys().add(new CorrelationKey(-1, new String[] {"session_key"})));
- assertEquals(new CorrelationKeys("@2[1~key1~key2]"),
- new CorrelationKeys().add(new CorrelationKey(1, new String[] {"key1", "key2"})));
- assertEquals(new CorrelationKeys("@2[1~key1],[2~key2~key3]"),
- new CorrelationKeys().add(new CorrelationKey(1, new String[] {"key1"}))
+ assertEquals(new CorrelationKeySet("-1~session_key"),
+ new CorrelationKeySet().add(new CorrelationKey(-1, new String[] {"session_key"})));
+ assertEquals(new CorrelationKeySet("1~key1~key2"),
+ new CorrelationKeySet().add(new CorrelationKey(1, new String[] {"key1", "key2"})));
+
+ assertEquals(new CorrelationKeySet("@2"), new CorrelationKeySet());
+ assertEquals(new CorrelationKeySet("@2[-1~session_key]"),
+ new CorrelationKeySet().add(new CorrelationKey(-1, new String[] {"session_key"})));
+ assertEquals(new CorrelationKeySet("@2[1~key1~key2]"),
+ new CorrelationKeySet().add(new CorrelationKey(1, new String[] {"key1", "key2"})));
+ assertEquals(new CorrelationKeySet("@2[1~key1],[2~key2~key3]"),
+ new CorrelationKeySet().add(new CorrelationKey(1, new String[] {"key1"}))
.add(new CorrelationKey(2, new String[] {"key2", "key3"})));
- assertEquals(new CorrelationKeys("@2[1~key1],[2~key2~key3]?"),
- new CorrelationKeys().add(new CorrelationKey(1, new String[] {"key1"}))
+ assertEquals(new CorrelationKeySet("@2[1~key1],[2~key2~key3]?"),
+ new CorrelationKeySet().add(new CorrelationKey(1, new String[] {"key1"}))
.add(new CorrelationKey(2, new String[] {"key2", "key3"})));
- assertEquals(3, new CorrelationKeys("@2[1~key1],[2~key2~key3]?").findSubSets().size());
+ assertEquals(3, new CorrelationKeySet("@2[1~key1],[2~key2~key3]?").findSubSets().size());
}
@Test
public void testRoutableTo() throws Exception {
- CorrelationKeys setA = new CorrelationKeys();
- CorrelationKeys setB = new CorrelationKeys();
+ CorrelationKeySet setA = new CorrelationKeySet();
+ CorrelationKeySet setB = new CorrelationKeySet();
assertTrue(setA.isRoutableTo(setB, false));
assertTrue(setA.isRoutableTo(setB, true));
@@ -81,8 +81,8 @@
assertTrue(setA.isRoutableTo(setB, false));
assertTrue(setA.isRoutableTo(setB, true));
- CorrelationKeys inbound = new CorrelationKeys();
- CorrelationKeys candidate = new CorrelationKeys();
+ CorrelationKeySet inbound = new CorrelationKeySet();
+ CorrelationKeySet candidate = new CorrelationKeySet();
candidate.add(new CorrelationKey("-1~session_key"));
assertFalse(inbound.isRoutableTo(candidate, false));
assertTrue(inbound.isRoutableTo(candidate, true));
@@ -102,7 +102,7 @@
@Test
public void testFindSubSets() throws Exception {
StringBuffer buf = new StringBuffer();
- for( CorrelationKeys subSet : new CorrelationKeys().findSubSets() ) {
+ for( CorrelationKeySet subSet : new CorrelationKeySet().findSubSets() ) {
if( buf.length() > 0 ) {
buf.append(",");
}
@@ -110,18 +110,18 @@
}
assertEquals("'@2'", buf.toString());
- CorrelationKeys keySet = new CorrelationKeys();
+ CorrelationKeySet keySet = new CorrelationKeySet();
keySet.add(keyX);
keySet.add(keyY);
keySet.add(keyZ);
assertTrue(keySet.findSubSets().size() == 7);
- keySet = new CorrelationKeys();
+ keySet = new CorrelationKeySet();
keySet.add(optX);
keySet.add(optY);
keySet.add(optZ);
buf = new StringBuffer();
- for( CorrelationKeys subSet : keySet.findSubSets() ) {
+ for( CorrelationKeySet subSet : keySet.findSubSets() ) {
if( buf.length() > 0 ) {
buf.append(",");
}
@@ -130,12 +130,12 @@
assertEquals("'@2[1~a~b]','@2[2~b~c]','@2[1~a~b],[2~b~c]','@2[3~c~d]','@2[1~a~b],[3~c~d]','@2[2~b~c],[3~c~d]','@2[1~a~b],[2~b~c],[3~c~d]'",
buf.toString());
- keySet = new CorrelationKeys();
+ keySet = new CorrelationKeySet();
keySet.add(keyX);
keySet.add(keyY);
keySet.add(optZ);
buf = new StringBuffer();
- for( CorrelationKeys subSet : keySet.findSubSets() ) {
+ for( CorrelationKeySet subSet : keySet.findSubSets() ) {
if( buf.length() > 0 ) {
buf.append(",");
}
@@ -143,12 +143,12 @@
}
assertEquals("'@2[1~a~b]','@2[2~b~c]','@2[1~a~b],[2~b~c]','@2[3~c~d]','@2[1~a~b],[3~c~d]','@2[2~b~c],[3~c~d]','@2[1~a~b],[2~b~c],[3~c~d]'", buf.toString());
- keySet = new CorrelationKeys();
+ keySet = new CorrelationKeySet();
keySet.add(keyX);
keySet.add(optY);
keySet.add(optZ);
buf = new StringBuffer();
- for( CorrelationKeys subSet : keySet.findSubSets() ) {
+ for( CorrelationKeySet subSet : keySet.findSubSets() ) {
if( buf.length() > 0 ) {
buf.append(",");
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java Tue Jan 6 14:27:48 2009
@@ -111,7 +111,6 @@
import org.apache.ode.bpel.o.OXslSheet;
import org.apache.ode.utils.GUID;
import org.apache.ode.utils.NSContext;
-import org.apache.ode.utils.Namespaces;
import org.apache.ode.utils.StreamUtils;
import org.apache.ode.utils.fs.FileUtils;
import org.apache.ode.utils.msg.MessageBundle;
@@ -768,10 +767,6 @@
constants.qnForEachCounterError = new QName(getBpwsNamespace(), "forEachCounterError");
constants.qnInvalidBranchCondition = new QName(getBpwsNamespace(), "invalidBranchCondition");
constants.qnInvalidExpressionValue = new QName(getBpwsNamespace(), "invalidExpressionValue");
-
- constants.qnDuplicateInstance = new QName(getOdeNamespace(), "duplicateInstance");
- constants.qnRetiredProcess = new QName(getOdeNamespace(), "retiredProcess");
- constants.qnUnknownFault = new QName(getOdeNamespace(), "unknownFault");
return constants;
}
@@ -1063,7 +1058,6 @@
QName[] setprops = cset.getProperties();
for (int j = 0; j < setprops.length; ++j)
ocset.properties.add(resolveProperty(setprops[j]));
- ocset.unique = cset.isUnique();
oscope.addCorrelationSet(ocset);
}
@@ -1305,7 +1299,6 @@
break;
case YES:
oevent.initCorrelations.add(cset);
- oevent.partnerLink.addUniqueCorrelationSetForOperation(oevent.operation, cset);
break;
case JOIN:
cset.hasJoinUseCases = true;
@@ -1654,10 +1647,6 @@
protected abstract String getDefaultExpressionLanguage();
protected abstract String getBpwsNamespace();
-
- protected String getOdeNamespace() {
- return Namespaces.ODE_EXTENSION_NS;
- }
protected void registerExpressionLanguage(String expLangUri, ExpressionCompiler expressionCompiler) {
_expLanguageCompilers.put(expLangUri, expressionCompiler);
Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickReceiveGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickReceiveGenerator.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickReceiveGenerator.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickReceiveGenerator.java Tue Jan 6 14:27:48 2009
@@ -103,7 +103,6 @@
break;
case YES:
onMessage.initCorrelations.add(cset);
- onMessage.partnerLink.addUniqueCorrelationSetForOperation(onMessage.operation, cset);
break;
case JOIN:
cset.hasJoinUseCases = true;
Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/CorrelationSet.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/CorrelationSet.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/CorrelationSet.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/CorrelationSet.java Tue Jan 6 14:27:48 2009
@@ -73,12 +73,4 @@
return _props;
}
- /**
- * Is the correlation set system-wide unique?
- *
- * @return <code>true</code> iff the set is unique
- */
- public boolean isUnique() {
- return getAttribute("unique", "no").equals("yes");
- }
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/CorrelatorDAO.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/CorrelatorDAO.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/CorrelatorDAO.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/CorrelatorDAO.java Tue Jan 6 14:27:48 2009
@@ -20,7 +20,7 @@
import java.util.List;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
/**
* <p>
@@ -60,7 +60,7 @@
* @param mex message exchange
* @param correlationKeys pre-computed set of correlation keys for this message
*/
- void enqueueMessage(MessageExchangeDAO mex, CorrelationKeys correlationKeySet);
+ void enqueueMessage(MessageExchangeDAO mex, CorrelationKeySet correlationKeySet);
/**
@@ -70,14 +70,14 @@
* @return opaque message-related data previously enqueued with the
* given correlation correlationKey
*/
- MessageExchangeDAO dequeueMessage(CorrelationKeys correlationKeySet);
+ MessageExchangeDAO dequeueMessage(CorrelationKeySet correlationKeySet);
/**
* Find a route matching the given correlation key.
* @param correlationKey correlation key
* @return route matching the given correlation key
*/
- List<MessageRouteDAO> findRoute(CorrelationKeys correlationKeySet);
+ List<MessageRouteDAO> findRoute(CorrelationKeySet correlationKeySet);
/**
* Add a route from the given correlation key to the given process instance.
@@ -86,7 +86,7 @@
* @param index relative order in which the route should be considered
* @param correlationKey correlation key to match
*/
- void addRoute(String routeGroupId, ProcessInstanceDAO target, int index, CorrelationKeys correlationKeySet, String routePolicy);
+ void addRoute(String routeGroupId, ProcessInstanceDAO target, int index, CorrelationKeySet correlationKeySet, String routePolicy);
/**
* Remove all routes with the given route-group identifier.
Modified: ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageRouteDAO.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageRouteDAO.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageRouteDAO.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageRouteDAO.java Tue Jan 6 14:27:48 2009
@@ -18,7 +18,7 @@
*/
package org.apache.ode.bpel.dao;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
/**
* Data access object representing a message consumer. A message consumer
@@ -44,5 +44,5 @@
* Returns a correlation key set for the message route
* @return
*/
- public CorrelationKeys getCorrelationKeys();
+ public CorrelationKeySet getCorrelationKeySet();
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java Tue Jan 6 14:27:48 2009
@@ -79,12 +79,11 @@
/**
* Locates a process instance based on a correlation key.
*
- * @param cckey correlation key
- * wait <code>false</code> if you don't want the query to block
+ * @param cckey
+ * correlation key
* @return collection of {@link ProcessInstanceDAO} that match correlation key, ordered by date
*/
Collection<ProcessInstanceDAO> findInstance(CorrelationKey cckey);
- Collection<ProcessInstanceDAO> findInstance(CorrelationKey cckey, boolean wait);
/**
* Remove the routes with the given Id for all the correlators in the process.
Modified: ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OConstants.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OConstants.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OConstants.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OConstants.java Tue Jan 6 14:27:48 2009
@@ -27,8 +27,6 @@
public class OConstants extends OBase {
private static final long serialVersionUID = 1L;
-
- // standard fault names
public QName qnMissingRequest;
public QName qnMissingReply;
public QName qnUninitializedVariable;
@@ -44,11 +42,7 @@
public QName qnForEachCounterError;
public QName qnInvalidBranchCondition;
public QName qnInvalidExpressionValue;
-
- // non-standard fault names
- public QName qnRetiredProcess;
- public QName qnDuplicateInstance;
- public QName qnUnknownFault;
+
public OConstants(OProcess owner) {
super(owner);
Modified: ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java Tue Jan 6 14:27:48 2009
@@ -57,9 +57,6 @@
/** The set of joining CorrelationSets that may be used as a match criteria, organized by {@link Operation} */
private final HashMap<String,Set<OScope.CorrelationSet>> _joiningCorrelationSets = new HashMap<String,Set<OScope.CorrelationSet>>();
- /** The set of initiating CorrelationSets that may be used as an uniqueness criteria, organized by {@link Operation} */
- private final HashMap<String,Set<OScope.CorrelationSet>> _uniqueInitiatingCorrelationSets = new HashMap<String,Set<OScope.CorrelationSet>>();
-
/** The set of {@link Operation}s that can be used to create a process instance. */
private final HashSet<String> _createInstanceOperations = new HashSet<String>();
@@ -96,7 +93,7 @@
* @param operation WSDL {@link Operation}
* @param cset non-initiating correlation used in this operation
*/
- public void addCorrelationSetForOperation(Operation operation, OScope.CorrelationSet cset, boolean isJoin) {
+ public void addCorrelationSetForOperation(Operation operation, OScope.CorrelationSet cset, boolean isJoin) {
if( !isJoin ) {
Set<OScope.CorrelationSet> ret = _nonIntitiatingCorrelationSets.get(operation.getName());
if (ret == null) {
@@ -113,28 +110,7 @@
ret.add(cset);
}
}
-
- /**
- * Add a {@link org.apache.ode.bpel.o.OScope.CorrelationSet} to an {@link Operation}'s list
- * of "unique-initiating" correlation sets. The unique-initiating correlation sets are those
- * sets that are used (along with the operation) to "initiate" incoming messages, provided
- * that there doesn't already exist a process instance with that correlation key.
- * We need to know which correlation sets are used with which operation in order to
- * pre-compute correlation keys at the time of message receipt.
- * @param operation WSDL {@link Operation}
- * @param cset unique-initiating correlation used in this operation
- */
- public void addUniqueCorrelationSetForOperation(Operation operation, OScope.CorrelationSet cset) {
- if (cset.unique) {
- Set<OScope.CorrelationSet> ret = _uniqueInitiatingCorrelationSets.get(operation.getName());
- if (ret == null) {
- ret = new HashSet<OScope.CorrelationSet>();
- _uniqueInitiatingCorrelationSets.put(operation.getName(), ret);
- }
- ret.add(cset);
- }
- }
-
+
/**
* Get all non-initiating correlation sets that are ever used to qualify a receive for a the given
* operation.
@@ -165,25 +141,6 @@
return Collections.unmodifiableSet(ret);
}
- /**
- * Get all unique initiating correlation sets that are ever used to qualify a receive for a the given
- * operation.
- * @param operation the operation
- * @return all unique-initiating correlation sets used in the given operation
- */
- @SuppressWarnings("unchecked")
- public Set<OScope.CorrelationSet> getUniqueCorrelationSetsForOperation(Operation operation) {
- // if we read an older version of this class, the unique set will be un-initialized!
- if (_uniqueInitiatingCorrelationSets == null) {
- return Collections.EMPTY_SET;
- }
- Set<OScope.CorrelationSet> ret = _uniqueInitiatingCorrelationSets.get(operation.getName());
- if (ret == null) {
- return Collections.EMPTY_SET;
- }
- return Collections.unmodifiableSet(ret);
- }
-
@SuppressWarnings("unchecked")
public Operation getMyRoleOperation(String name) {
for (Operation op : (List<Operation>)myRolePortType.getOperations())
Modified: ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java Tue Jan 6 14:27:48 2009
@@ -153,7 +153,6 @@
public String name;
public OScope declaringScope;
public final List<OProcess.OProperty>properties = new ArrayList<OProcess.OProperty>();
- public boolean unique;
/**
* Indicates that this correlation set has a join use case in the scope.
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java Tue Jan 6 14:27:48 2009
@@ -420,9 +420,6 @@
} catch (ContextException ce) {
__log.error(__msgs.msgScheduledJobFailed(we.getDetail()), ce);
throw new Scheduler.JobProcessorException(ce, checkRetry(jobInfo, ce));
- } catch (NonRetriableException nre) {
- __log.error(__msgs.msgScheduledJobFailed(we.getDetail()), nre);
- throw new Scheduler.JobProcessorException(nre, false);
} catch (RuntimeException rte) {
__log.error(__msgs.msgScheduledJobFailed(we.getDetail()), rte);
throw new Scheduler.JobProcessorException(rte, checkRetry(jobInfo, rte));
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelManagementFacadeImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelManagementFacadeImpl.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelManagementFacadeImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelManagementFacadeImpl.java Tue Jan 6 14:27:48 2009
@@ -65,7 +65,7 @@
return dbexec(_db.getProcessDb(QName.valueOf(pid)).new Callable<Long>() {
public Long run(BpelDAOConnection session) throws Exception {
- Iterator<ProcessInstanceDAO> i = getProcessDAO().findInstance(ckey, true).iterator();
+ Iterator<ProcessInstanceDAO> i = getProcessDAO().findInstance(ckey).iterator();
return (i.hasNext()) ? i.next().getInstanceId() : null;
}
});
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java Tue Jan 6 14:27:48 2009
@@ -44,15 +44,12 @@
import org.apache.ode.bpel.iapi.BpelEngineException;
import org.apache.ode.bpel.iapi.Endpoint;
import org.apache.ode.bpel.iapi.EndpointReference;
-import org.apache.ode.bpel.iapi.Message;
import org.apache.ode.bpel.iapi.MessageExchange;
import org.apache.ode.bpel.iapi.PartnerRoleChannel;
-import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
import org.apache.ode.bpel.iapi.ProcessConf;
import org.apache.ode.bpel.iapi.ProcessConf.CLEANUP_CATEGORY;
import org.apache.ode.bpel.intercept.InterceptorInvoker;
import org.apache.ode.bpel.intercept.MessageExchangeInterceptor;
-import org.apache.ode.bpel.o.OConstants;
import org.apache.ode.bpel.o.OElementVarType;
import org.apache.ode.bpel.o.OExpressionLanguage;
import org.apache.ode.bpel.o.OMessageVarType;
@@ -60,16 +57,12 @@
import org.apache.ode.bpel.o.OProcess;
import org.apache.ode.bpel.o.Serializer;
import org.apache.ode.bpel.runtime.ExpressionLanguageRuntimeRegistry;
-import org.apache.ode.bpel.runtime.InvalidProcessException;
import org.apache.ode.bpel.runtime.PROCESS;
import org.apache.ode.bpel.runtime.PropertyAliasEvaluationContext;
import org.apache.ode.bpel.runtime.channels.FaultData;
import org.apache.ode.jacob.soup.ReplacementMap;
-import org.apache.ode.utils.DOMUtils;
-import org.apache.ode.utils.Namespaces;
import org.apache.ode.utils.ObjectPrinter;
import org.apache.ode.utils.msg.MessageBundle;
-import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -182,7 +175,6 @@
* @param mex
*/
void invokeProcess(MyRoleMessageExchangeImpl mex) {
- OProcess oProcess = null;
boolean routed = false;
try {
@@ -209,7 +201,6 @@
List<PartnerLinkMyRoleImpl.RoutingInfo> routings = null;
for (PartnerLinkMyRoleImpl target : targets) {
routings = target.findRoute(mex);
- oProcess = target._process.getOProcess();
boolean createInstance = target.isCreateInstance(mex);
if (mex.getStatus() != MessageExchange.Status.FAILURE) {
@@ -246,43 +237,15 @@
}
markused();
- } catch (InvalidProcessException ipe) {
- QName faultQName = null;
- if (oProcess != null) {
- Message faultMessage = mex.createMessage(faultQName);
- Document document = DOMUtils.newDocument();
- Element faultElement = document.createElementNS(Namespaces.SOAP_ENV_NS, "Fault");
- Element faultDetail = document.createElementNS(Namespaces.ODE_EXTENSION_NS, "fault");
- faultElement.appendChild(faultDetail);
- switch (ipe.getCauseCode()) {
- case InvalidProcessException.DUPLICATE_CAUSE_CODE:
- faultQName = oProcess.constants.qnDuplicateInstance;
- faultDetail.setTextContent("Found a duplicate instance with the same message key");
- break;
- case InvalidProcessException.RETIRED_CAUSE_CODE:
- faultQName = oProcess.constants.qnRetiredProcess;
- faultDetail.setTextContent("The process you're trying to instantiate has been retired");
- break;
- case InvalidProcessException.DEFAULT_CAUSE_CODE:
- default:
- faultQName = oProcess.constants.qnUnknownFault;
- break;
- }
- faultMessage.setMessage(faultElement);
- mex.setStatus(MessageExchange.Status.FAULT);
- mex.setFault(faultQName, faultMessage);
- mex.responseReceived();
- }
} finally {
_hydrationLatch.release(1);
}
-
+
// For a one way, once the engine is done, the mex can be safely released.
// Sean: not really, if route is not found, we cannot delete the mex yet
if (mex.getPattern().equals(MessageExchange.MessageExchangePattern.REQUEST_ONLY) && routed) {
- mex.release();
+ mex.release();
}
-
}
/** Several myroles can use the same service in a given process */
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java Tue Jan 6 14:27:48 2009
@@ -29,7 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.common.ProcessState;
import org.apache.ode.bpel.dao.CorrelationSetDAO;
@@ -607,7 +607,6 @@
}
CorrelationKey ckeyVal = new CorrelationKey(cset.declaration.getId(), propValues);
- ckeyVal.setUnique(cset.declaration.unique);
writeCorrelation(cset, ckeyVal);
}
@@ -640,7 +639,7 @@
_bpelProcess._engine._contexts.scheduler.schedulePersistedJob(we.getDetail(), timeToFire);
}
- private void scheduleCorrelatorMatcher(String correlatorId, CorrelationKeys keySet) {
+ private void scheduleCorrelatorMatcher(String correlatorId, CorrelationKeySet keySet) {
WorkEvent we = new WorkEvent();
we.setIID(_dao.getInstanceId());
we.setType(WorkEvent.Type.MATCHER);
@@ -1322,7 +1321,7 @@
* Attempt to match message exchanges on a correlator.
*
*/
- public void matcherEvent(String correlatorId, CorrelationKeys ckeySet) {
+ public void matcherEvent(String correlatorId, CorrelationKeySet ckeySet) {
if (BpelProcess.__log.isDebugEnabled()) {
__log.debug("MatcherEvent handling: correlatorId=" + correlatorId + ", ckeySet=" + ckeySet);
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java Tue Jan 6 14:27:48 2009
@@ -19,7 +19,6 @@
package org.apache.ode.bpel.engine;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -31,7 +30,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.common.InvalidMessageException;
import org.apache.ode.bpel.common.OptionalCorrelationKey;
@@ -112,7 +111,7 @@
CorrelatorDAO correlator = _process.getProcessDAO().getCorrelator(correlatorId);
- CorrelationKeys processKeys, uniqueKeys;
+ CorrelationKeySet keySet;
// We need to compute the correlation keys (based on the operation
// we can infer which correlation keys to compute - this is merely a set
@@ -120,8 +119,7 @@
// that is ever referenced in an <receive>/<onMessage> on this
// partnerlink/operation.
try {
- processKeys = computeCorrelationKeys(mex);
- uniqueKeys = computeUniqueCorrelationKeys(mex);
+ keySet = computeCorrelationKeys(mex);
} catch (InvalidMessageException ime) {
// We'd like to do a graceful exit here, no sense in rolling back due to a
// a message format problem.
@@ -134,23 +132,23 @@
String partnerSessionId = mex.getProperty(MessageExchange.PROPERTY_SEP_PARTNERROLE_SESSIONID);
if (__log.isDebugEnabled()) {
__log.debug("INPUTMSG: " + correlatorId + ": MSG RCVD keys="
- + processKeys + " mySessionId=" + mySessionId
+ + keySet + " mySessionId=" + mySessionId
+ " partnerSessionId=" + partnerSessionId);
}
// Try to find a route for one of our keys.
- List<MessageRouteDAO> messageRoutes = correlator.findRoute(processKeys);
+ List<MessageRouteDAO> messageRoutes = correlator.findRoute(keySet);
if (messageRoutes != null && messageRoutes.size() > 0) {
for (MessageRouteDAO messageRoute : messageRoutes) {
if (__log.isDebugEnabled()) {
- __log.debug("INPUTMSG: " + correlatorId + ": ckeySet " + messageRoute.getCorrelationKeys() + " route is to " + messageRoute);
+ __log.debug("INPUTMSG: " + correlatorId + ": ckeySet " + messageRoute.getCorrelationKeySet() + " route is to " + messageRoute);
}
- routingInfos.add(new RoutingInfo(messageRoute, messageRoute.getCorrelationKeys(), correlator, processKeys, uniqueKeys));
+ routingInfos.add(new RoutingInfo(messageRoute, messageRoute.getCorrelationKeySet(), correlator, keySet));
}
}
if (routingInfos.size() == 0) {
- routingInfos.add(new RoutingInfo(null, null, correlator, processKeys, uniqueKeys));
+ routingInfos.add(new RoutingInfo(null, null, correlator, keySet));
}
return routingInfos;
@@ -158,18 +156,17 @@
class RoutingInfo {
MessageRouteDAO messageRoute;
+ CorrelationKeySet matchedKeySet;
CorrelatorDAO correlator;
- CorrelationKeys matchedKeys;
- CorrelationKeys wholeKeys;
- CorrelationKeys uniqueKeys;
+// CorrelationKey[] keys;
+ CorrelationKeySet wholeKeySet;
- public RoutingInfo(MessageRouteDAO messageRoute, CorrelationKeys matchedKeys,
- CorrelatorDAO correlator, CorrelationKeys wholeKeys, CorrelationKeys uniqueKeys) {
+ public RoutingInfo(MessageRouteDAO messageRoute, CorrelationKeySet matchedKeySet,
+ CorrelatorDAO correlator, CorrelationKeySet wholeKeySet) {
this.messageRoute = messageRoute;
- this.matchedKeys = matchedKeys;
+ this.matchedKeySet = matchedKeySet;
this.correlator = correlator;
- this.wholeKeys = wholeKeys;
- this.uniqueKeys = uniqueKeys;
+ this.wholeKeySet = wholeKeySet;
}
}
@@ -189,18 +186,7 @@
__log.debug("Not creating a new instance for mex " + mex + "; interceptor prevented!");
return;
}
-
- for (CorrelationKey uniqueKey : routing.uniqueKeys) {
- // double-check that the correlation set is indeed unique
- if (uniqueKey.isUnique()) {
- Collection<ProcessInstanceDAO> instances = processDAO.findInstance(uniqueKey, false);
- if (instances.size() != 0) {
- __log.debug("Not creating a new instance for mex " + mex + "; unique correlation constraint would be violated!");
- throw new InvalidProcessException("Unique process constraint violated", InvalidProcessException.DUPLICATE_CAUSE_CODE);
- }
- }
- }
-
+
ProcessInstanceDAO newInstance = processDAO.createInstance(routing.correlator);
BpelRuntimeContextImpl instance = _process
@@ -240,7 +226,7 @@
// send process instance event
CorrelationMatchEvent evt = new CorrelationMatchEvent(new QName(_process.getOProcess().targetNamespace,
_process.getOProcess().getName()), _process.getProcessDAO().getProcessId(),
- instanceDao.getInstanceId(), routing.matchedKeys);
+ instanceDao.getInstanceId(), routing.matchedKeySet);
evt.setPortType(mex.getPortType().getQName());
evt.setOperation(operation.getName());
evt.setMexId(mex.getMessageExchangeId());
@@ -269,7 +255,7 @@
// send event
CorrelationNoMatchEvent evt = new CorrelationNoMatchEvent(mex.getPortType().getQName(), mex
- .getOperation().getName(), mex.getMessageExchangeId(), routing.wholeKeys);
+ .getOperation().getName(), mex.getMessageExchangeId(), routing.wholeKeySet);
evt.setProcessId(_process.getProcessDAO().getProcessId());
evt.setProcessName(new QName(_process.getOProcess().targetNamespace, _process.getOProcess().getName()));
@@ -278,7 +264,7 @@
mex.setCorrelationStatus(MyRoleMessageExchange.CorrelationStatus.QUEUED);
// No match, means we add message exchange to the queue.
- routing.correlator.enqueueMessage(mex.getDAO(), routing.wholeKeys);
+ routing.correlator.enqueueMessage(mex.getDAO(), routing.wholeKeySet);
}
}
}
@@ -295,8 +281,8 @@
return _plinkDef.getMyRoleOperation(operationName);
}
- private CorrelationKeys computeCorrelationKeys(MyRoleMessageExchangeImpl mex) {
- CorrelationKeys keySet = new CorrelationKeys();
+ private CorrelationKeySet computeCorrelationKeys(MyRoleMessageExchangeImpl mex) {
+ CorrelationKeySet keySet = new CorrelationKeySet();
Operation operation = mex.getOperation();
Element msg = mex.getRequest().getMessage();
@@ -324,23 +310,6 @@
return keySet;
}
- private CorrelationKeys computeUniqueCorrelationKeys(MyRoleMessageExchangeImpl mex) {
- CorrelationKeys keySet = new CorrelationKeys();
-
- Operation operation = mex.getOperation();
- Element msg = mex.getRequest().getMessage();
- javax.wsdl.Message msgDescription = operation.getInput().getMessage();
-
- Set<OScope.CorrelationSet> csets = _plinkDef.getUniqueCorrelationSetsForOperation(operation);
- for (OScope.CorrelationSet cset : csets) {
- CorrelationKey key = computeCorrelationKey(cset,
- _process.getOProcess().messageTypes.get(msgDescription.getQName()), msg);
- keySet.add(key);
- }
-
- return keySet;
- }
-
@SuppressWarnings("unchecked")
private CorrelationKey computeCorrelationKey(OScope.CorrelationSet cset, OMessageVarType messagetype,
Element msg) {
@@ -377,8 +346,6 @@
key = new CorrelationKey(cset.getId(), values);
}
- key.setUnique(cset.unique);
-
return key;
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/WorkEvent.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/WorkEvent.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/WorkEvent.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/WorkEvent.java Tue Jan 6 14:27:48 2009
@@ -19,7 +19,7 @@
package org.apache.ode.bpel.engine;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import javax.xml.namespace.QName;
import java.util.HashMap;
@@ -93,11 +93,11 @@
_jobDetail.put("correlatorId", correlatorId);
}
- public CorrelationKeys getCorrelationKeySet() {
- return new CorrelationKeys((String) _jobDetail.get("ckeySet"));
+ public CorrelationKeySet getCorrelationKeySet() {
+ return new CorrelationKeySet((String) _jobDetail.get("ckeySet"));
}
- public void setCorrelationKeySet(CorrelationKeys ckeySet) {
+ public void setCorrelationKeySet(CorrelationKeySet ckeySet) {
_jobDetail.put("ckeySet", ckeySet == null ? null : ckeySet.toCanonicalString());
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java Tue Jan 6 14:27:48 2009
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.dao.CorrelatorDAO;
import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.dao.MessageRouteDAO;
@@ -49,13 +49,13 @@
_conn = conn;
}
- public MessageExchangeDAO dequeueMessage(CorrelationKeys instanceKeySet) {
+ public MessageExchangeDAO dequeueMessage(CorrelationKeySet instanceKeySet) {
if (__log.isDebugEnabled()) {
__log.debug("dequeueEarliest: MATCHING correlationKey=" + instanceKeySet);
}
for (Iterator<MsgQueueEntry> i = _messages.iterator(); i.hasNext();) {
MsgQueueEntry mqe = i.next();
- CorrelationKeys aKeySet = mqe.keySet;
+ CorrelationKeySet aKeySet = mqe.keySet;
if (aKeySet.isRoutableTo(instanceKeySet, false)) {
i.remove();
return mqe.message;
@@ -67,7 +67,7 @@
return null;
}
- public List<MessageRouteDAO> findRoute(CorrelationKeys keySet) {
+ public List<MessageRouteDAO> findRoute(CorrelationKeySet keySet) {
List<MessageRouteDAO> routes = new ArrayList<MessageRouteDAO>();
assert keySet != null;
@@ -96,7 +96,7 @@
((ProcessInstanceDaoImpl)target).removeRoutes(routeGroupId);
}
- public void enqueueMessage(MessageExchangeDAO mex, CorrelationKeys keySet) {
+ public void enqueueMessage(MessageExchangeDAO mex, CorrelationKeySet keySet) {
if (__log.isDebugEnabled()) {
__log.debug("enqueueProcessInvocation: data=" + mex + " keys=" + keySet);
}
@@ -105,7 +105,7 @@
_messages.add(mqe);
}
- public void addRoute(String routeId,ProcessInstanceDAO target, int idx, CorrelationKeys keySet, String routePolicy) {
+ public void addRoute(String routeId,ProcessInstanceDAO target, int idx, CorrelationKeySet keySet, String routePolicy) {
if (__log.isDebugEnabled()) {
__log.debug("addRoute: target=" + target + " correlationKeySet=" + keySet);
}
@@ -149,10 +149,10 @@
private class MsgQueueEntry {
public final MessageExchangeDAO message;
- public final CorrelationKeys keySet;
+ public final CorrelationKeySet keySet;
private MsgQueueEntry(MessageExchangeDAO mex,
- CorrelationKeys keySet) {
+ CorrelationKeySet keySet) {
this.message = mex;
this.keySet = keySet;
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageRouteDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageRouteDaoImpl.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageRouteDaoImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageRouteDaoImpl.java Tue Jan 6 14:27:48 2009
@@ -18,7 +18,7 @@
*/
package org.apache.ode.bpel.memdao;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.dao.MessageRouteDAO;
import org.apache.ode.bpel.dao.ProcessInstanceDAO;
@@ -29,11 +29,11 @@
class MessageRouteDaoImpl extends DaoBaseImpl implements MessageRouteDAO {
ProcessInstanceDaoImpl _instance;
String _groupId;
- CorrelationKeys _ckeySet;
+ CorrelationKeySet _ckeySet;
int _idx;
String _route;
- MessageRouteDaoImpl(ProcessInstanceDaoImpl owner, String groupId, CorrelationKeys ckeySet, int idx, String routePolicy) {
+ MessageRouteDaoImpl(ProcessInstanceDaoImpl owner, String groupId, CorrelationKeySet ckeySet, int idx, String routePolicy) {
_instance = owner;
_groupId = groupId;
_ckeySet = ckeySet;
@@ -57,7 +57,7 @@
return _route;
}
- public CorrelationKeys getCorrelationKeys() {
+ public CorrelationKeySet getCorrelationKeySet() {
return _ckeySet;
}
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java Tue Jan 6 14:27:48 2009
@@ -132,10 +132,6 @@
}
public Collection<ProcessInstanceDAO> findInstance(CorrelationKey key) {
- return findInstance(key, true);
- }
-
- public Collection<ProcessInstanceDAO> findInstance(CorrelationKey key, boolean wait) {
ArrayList<ProcessInstanceDAO> result = new ArrayList<ProcessInstanceDAO>();
for (ProcessInstanceDAO instance : _instances.values()) {
for (CorrelationSetDAO corrSet : instance.getCorrelationSets()) {
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelJacobRunnable.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelJacobRunnable.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelJacobRunnable.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelJacobRunnable.java Tue Jan 6 14:27:48 2009
@@ -98,7 +98,6 @@
}
CorrelationKey ckeyVal = new CorrelationKey(cset.declaration.getId(), propValues);
- ckeyVal.setUnique(cset.declaration.unique);
getBpelRuntimeContext().writeCorrelation(cset,ckeyVal);
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java Tue Jan 6 14:27:48 2009
@@ -24,7 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.o.OEventHandler;
import org.apache.ode.bpel.o.OScope;
@@ -114,7 +114,7 @@
Selector selector;
try {
PickResponseChannel pickResponseChannel = newChannel(PickResponseChannel.class);
- CorrelationKeys keySet = new CorrelationKeys();
+ CorrelationKeySet keySet = new CorrelationKeySet();
PartnerLinkInstance pLinkInstance = _scopeFrame.resolve(_oevent.partnerLink);
for( OScope.CorrelationSet cset : _oevent.joinCorrelations ) {
if(getBpelRuntimeContext().isCorrelationInitialized(_scopeFrame.resolve(cset))) {
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/InvalidProcessException.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/InvalidProcessException.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/InvalidProcessException.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/InvalidProcessException.java Tue Jan 6 14:27:48 2009
@@ -31,8 +31,6 @@
public final static int RETIRED_CAUSE_CODE = 1;
- public final static int DUPLICATE_CAUSE_CODE = 2;
-
private final int causeCode;
public InvalidProcessException(String msg, Throwable cause) {
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java Tue Jan 6 14:27:48 2009
@@ -29,7 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.evt.VariableModificationEvent;
import org.apache.ode.bpel.explang.EvaluationException;
@@ -90,7 +90,7 @@
}
PartnerLinkInstance pLinkInstance = _scopeFrame.resolve(onMessage.partnerLink);
- CorrelationKeys keySet = resolveCorrelationKey(pLinkInstance, matchCorrelations);
+ CorrelationKeySet keySet = resolveCorrelationKey(pLinkInstance, matchCorrelations);
selectors[idx] = new Selector(idx, pLinkInstance, onMessage.operation.getName(), onMessage.operation
.getOutput() == null, onMessage.messageExchangeId, keySet, onMessage.route);
@@ -139,8 +139,8 @@
* @return returns the resolved CorrelationKey
* @throws FaultException thrown when the correlation is not initialized and createInstance flag is not set
*/
- private CorrelationKeys resolveCorrelationKey(PartnerLinkInstance pLinkInstance, Set<OScope.CorrelationSet> matchCorrelations) throws FaultException {
- CorrelationKeys keySet = new CorrelationKeys(); // is empty for the case of the createInstance activity
+ private CorrelationKeySet resolveCorrelationKey(PartnerLinkInstance pLinkInstance, Set<OScope.CorrelationSet> matchCorrelations) throws FaultException {
+ CorrelationKeySet keySet = new CorrelationKeySet(); // is empty for the case of the createInstance activity
if (matchCorrelations.isEmpty() && !_opick.createInstanceFlag) {
// Adding a route for opaque correlation. In this case,
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/Selector.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/Selector.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/Selector.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/Selector.java Tue Jan 6 14:27:48 2009
@@ -19,7 +19,7 @@
package org.apache.ode.bpel.runtime;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.utils.ObjectPrinter;
import java.io.Serializable;
@@ -31,14 +31,14 @@
// here for the backward compatibility
@SuppressWarnings("unused")
private final CorrelationKey correlationKey = null;
- public final CorrelationKeys correlationKeySet;
+ public final CorrelationKeySet correlationKeySet;
public final String opName;
public final String messageExchangeId;
public final int idx;
public final boolean oneWay;
public final String route;
- Selector(int idx, PartnerLinkInstance plinkInstance, String opName, boolean oneWay, String mexId, CorrelationKeys keySet, String route) {
+ Selector(int idx, PartnerLinkInstance plinkInstance, String opName, boolean oneWay, String mexId, CorrelationKeySet keySet, String route) {
this.idx = idx;
this.plinkInstance = plinkInstance;
this.correlationKeySet = keySet;
Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java Tue Jan 6 14:27:48 2009
@@ -253,21 +253,8 @@
inv.request = DOMUtils.stringToDOM(request);
inv.expectedStatus = null;
if (responsePattern != null) {
- if ("ASYNC".equals(responsePattern)) {
- inv.expectedFinalStatus = MessageExchange.Status.ASYNC;
- inv.expectedResponsePattern = null;
- } else if ("FAULT".equals(responsePattern)) {
- inv.expectedFinalStatus = MessageExchange.Status.COMPLETED_FAULT;
- inv.expectedResponsePattern = null;
- } else if ("FAILURE".equals(responsePattern)) {
- inv.expectedFinalStatus = MessageExchange.Status.COMPLETED_FAILURE;
- inv.expectedResponsePattern = null;
- } else {
- inv.expectedResponsePattern = Pattern.compile(responsePattern, Pattern.DOTALL);
- inv.expectedFinalStatus = MessageExchange.Status.RESPONSE;
- }
- } else {
- inv.expectedFinalStatus = MessageExchange.Status.RESPONSE;
+ inv.expectedFinalStatus = MessageExchange.Status.RESPONSE;
+ inv.expectedResponsePattern = Pattern.compile(responsePattern, Pattern.DOTALL);
}
_invocations.add(inv);
@@ -366,7 +353,6 @@
store.undeploy(d.deployDir);
}
}
-
protected void doInvokes() throws Exception {
ArrayList<Thread> testThreads = new ArrayList<Thread>();
for (Invocation i : _invocations) {
@@ -384,14 +370,6 @@
}
- protected int getMaximumWaitInMillis() {
- return 60 * 1000;
- }
-
- protected int getMinimumWaitInMillis() {
- return -1;
- }
-
protected long getWaitBeforeInvokeTimeout() {
return WAIT_BEFORE_INVOKE_TIMEOUT;
}
@@ -543,8 +521,8 @@
/** Maximum number of ms to wait for a response. */
public long maximumWaitMs = 60 * 1000;
- /** If positive, minimum number of ms before a response should be available. */
- public long minimumWaitMs = -1;
+ /** If non-null, minimum number of ms before a response should be available. */
+ public Long minimumWaitMs = null;
long invokeTime;
@@ -567,8 +545,6 @@
InvokerThread(Invocation invocation) {
_invocation = invocation;
- _invocation.maximumWaitMs = getMaximumWaitInMillis();
- _invocation.minimumWaitMs = getMinimumWaitInMillis();
}
public void run() {
@@ -622,7 +598,7 @@
long ctime = System.currentTimeMillis();
long itime = ctime - _invocation.invokeTime;
- if (_invocation.minimumWaitMs != -1 && _invocation.minimumWaitMs >= itime)
+ if (_invocation.minimumWaitMs != null && _invocation.minimumWaitMs >= itime)
failure(_invocation, "Response received too soon.", _invocation.minimumWaitMs, itime);
if (_invocation.maximumWaitMs <= itime)
Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java Tue Jan 6 14:27:48 2009
@@ -128,7 +128,4 @@
go("/bpel/2.0/TestConcurrentSyncMex");
}
- @Test public void testCorrelationUnique() throws Throwable {
- go("/bpel/2.0/TestCorrelationUnique");
- }
}
Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java Tue Jan 6 14:27:48 2009
@@ -26,7 +26,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.dao.CorrelatorDAO;
import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.dao.MessageRouteDAO;
@@ -65,7 +65,7 @@
}
@SuppressWarnings("unchecked")
- public MessageExchangeDAO dequeueMessage(CorrelationKeys keySet) {
+ public MessageExchangeDAO dequeueMessage(CorrelationKeySet keySet) {
entering("CorrelatorDaoImpl.dequeueMessage");
MessageExchangeDAO mex = null;
@@ -73,7 +73,7 @@
String hdr = "dequeueMessage(" + keySet + "): ";
__log.debug(hdr);
- List<CorrelationKeys> subSets = keySet.findSubSets();
+ List<CorrelationKeySet> subSets = keySet.findSubSets();
Query qry = getSession().createFilter(_hobj.getMessageCorrelations(),
generateUnmatchedQuery(subSets));
for( int i = 0; i < subSets.size(); i++ ) {
@@ -100,7 +100,7 @@
}
@SuppressWarnings("unchecked")
- public List<MessageRouteDAO> findRoute(CorrelationKeys keySet) {
+ public List<MessageRouteDAO> findRoute(CorrelationKeySet keySet) {
List<MessageRouteDAO> routes = new ArrayList<MessageRouteDAO>();
entering("CorrelatorDaoImpl.findRoute");
@@ -114,7 +114,7 @@
// resulting cursor, or for the lifetime of the transaction. So really, an UPDATE of the row
// is a much safer alternative.
String processType = new QName(_hobj.getProcess().getTypeNamespace(), _hobj.getProcess().getTypeName()).toString();
- List<CorrelationKeys> subSets = keySet.findSubSets();
+ List<CorrelationKeySet> subSets = keySet.findSubSets();
Query lockQry = getSession().createQuery(generateSelectorQuery(LOCK_SELECTORS, subSets));
lockQry.setString("processType", processType);
for( int i = 0; i < subSets.size(); i++ ) {
@@ -161,7 +161,7 @@
return null;
}
- private String generateUnmatchedQuery(List<CorrelationKeys> subSets) {
+ private String generateUnmatchedQuery(List<CorrelationKeySet> subSets) {
StringBuffer filterQuery = new StringBuffer();
if( subSets.size() == 1 ) {
@@ -180,7 +180,7 @@
return filterQuery.toString();
}
- private String generateSelectorQuery(String header, List<CorrelationKeys> subSets) {
+ private String generateSelectorQuery(String header, List<CorrelationKeySet> subSets) {
StringBuffer filterQuery = new StringBuffer(header);
if( subSets.size() == 1 ) {
@@ -199,7 +199,7 @@
return filterQuery.toString();
}
- public void enqueueMessage(MessageExchangeDAO mex, CorrelationKeys correlationKeySet) {
+ public void enqueueMessage(MessageExchangeDAO mex, CorrelationKeySet correlationKeySet) {
entering("CorrelatorDaoImpl.enqueueMessage");
String hdr = "enqueueMessage(mex=" + ((MessageExchangeDaoImpl) mex)._hobj.getId() + " keySet="
+ correlationKeySet.toCanonicalString() + "): ";
@@ -207,7 +207,7 @@
if (__log.isDebugEnabled())
__log.debug(hdr);
- for( CorrelationKeys aSubSet : correlationKeySet.findSubSets() ) {
+ for( CorrelationKeySet aSubSet : correlationKeySet.findSubSets() ) {
HCorrelatorMessage mcor = new HCorrelatorMessage();
mcor.setCorrelator(_hobj);
mcor.setCreated(new Date());
@@ -220,7 +220,7 @@
}
}
- public void addRoute(String routeGroupId, ProcessInstanceDAO target, int idx, CorrelationKeys correlationKeySet, String routePolicy) {
+ public void addRoute(String routeGroupId, ProcessInstanceDAO target, int idx, CorrelationKeySet correlationKeySet, String routePolicy) {
entering("CorrelatorDaoImpl.addRoute");
String hdr = "addRoute(" + routeGroupId + ", iid=" + target.getInstanceId() + ", idx=" + idx + ", ckeySet="
+ correlationKeySet + "): ";
Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java Tue Jan 6 14:27:48 2009
@@ -18,7 +18,7 @@
*/
package org.apache.ode.daohib.bpel;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.dao.MessageRouteDAO;
import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.daohib.SessionManager;
@@ -75,7 +75,7 @@
return _selector.getRoute();
}
- public CorrelationKeys getCorrelationKeys() {
- return new CorrelationKeys(_selector.getCorrelationKey());
+ public CorrelationKeySet getCorrelationKeySet() {
+ return new CorrelationKeySet(_selector.getCorrelationKey());
}
}
Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java Tue Jan 6 14:27:48 2009
@@ -18,13 +18,6 @@
*/
package org.apache.ode.daohib.bpel;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.CorrelationKey;
@@ -38,6 +31,7 @@
import org.apache.ode.daohib.bpel.hobj.HCorrelationSet;
import org.apache.ode.daohib.bpel.hobj.HCorrelator;
import org.apache.ode.daohib.bpel.hobj.HCorrelatorMessage;
+import org.apache.ode.daohib.bpel.hobj.HCorrelatorMessageKey;
import org.apache.ode.daohib.bpel.hobj.HFaultData;
import org.apache.ode.daohib.bpel.hobj.HLargeData;
import org.apache.ode.daohib.bpel.hobj.HMessage;
@@ -51,13 +45,14 @@
import org.apache.ode.daohib.bpel.hobj.HXmlData;
import org.hibernate.Criteria;
import org.hibernate.Hibernate;
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
import org.hibernate.Query;
-import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.criterion.Expression;
import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
+
+import javax.xml.namespace.QName;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
/**
* Hibernate-based {@link ProcessDAO} implementation.
@@ -126,28 +121,17 @@
return new ProcessInstanceDaoImpl(_sm,instance);
}
- public Collection<ProcessInstanceDAO> findInstance(CorrelationKey key) {
- return findInstance(key, true);
- }
-
/**
* @see org.apache.ode.bpel.dao.ProcessDAO#findInstance(CorrelationKey)
*/
@SuppressWarnings("unchecked")
- public Collection<ProcessInstanceDAO> findInstance(CorrelationKey ckeyValue, boolean wait) {
- try {
- entering("ProcessDaoImpl.findInstance");
- Criteria correlationSet = getSession().createCriteria(HCorrelationSet.class);
- Criteria instance = correlationSet.createCriteria("scope").createCriteria("instance");
- instance.addOrder(Order.desc("created"));
- Criteria process = instance.createCriteria("process");
- process.add(Restrictions.eq("id", _process.getId()));
- correlationSet.add(Expression.eq("value", ckeyValue.toCanonicalString()));
- correlationSet.setLockMode(wait ? LockMode.UPGRADE : LockMode.UPGRADE_NOWAIT);
- return correlationSet.list();
- } catch (HibernateException he) {
- return Collections.EMPTY_LIST;
- }
+ public Collection<ProcessInstanceDAO> findInstance(CorrelationKey ckeyValue) {
+ entering("ProcessDaoImpl.findInstance");
+ Criteria criteria = getSession().createCriteria(HCorrelationSet.class);
+ criteria.add(Expression.eq("scope.instance.process.id",_process.getId()));
+ criteria.add(Expression.eq("value", ckeyValue.toCanonicalString()));
+ criteria.addOrder(Order.desc("scope.instance.created"));
+ return criteria.list();
}
/**
Modified: ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java Tue Jan 6 14:27:48 2009
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.dao.BpelDAOConnection;
import org.apache.ode.bpel.dao.CorrelationSetDAO;
import org.apache.ode.bpel.dao.CorrelatorDAO;
@@ -184,8 +184,8 @@
MessageExchangeDAO mex = createMessageExchange(process,pi,pl1);
- corr.addRoute("testRoute", pi, 1, new CorrelationKeys().add(key1), "one");
- corr.enqueueMessage(mex, new CorrelationKeys().add(corrkeys[0]).add(corrkeys[1]));
+ corr.addRoute("testRoute", pi, 1, new CorrelationKeySet().add(key1), "one");
+ corr.enqueueMessage(mex, new CorrelationKeySet().add(corrkeys[0]).add(corrkeys[1]));
return pi;
}
Modified: ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java Tue Jan 6 14:27:48 2009
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
import org.apache.ode.bpel.dao.BpelDAOConnection;
import org.apache.ode.bpel.dao.CorrelationSetDAO;
@@ -107,7 +107,7 @@
assertEquals(corr.getCorrelatorId(),CORRELATOR_ID1);
// Assert the MessageRouteDAO
- List<MessageRouteDAO> routes = corr.findRoute(new CorrelationKeys().add(key1));
+ List<MessageRouteDAO> routes = corr.findRoute(new CorrelationKeySet().add(key1));
MessageRouteDAO route = null;
if (routes != null && routes.size() > 0) {
route = routes.get(0);
@@ -203,7 +203,7 @@
assertNotNull(ic);
assertEquals(ic.getCorrelatorId(),CORRELATOR_ID1);
// The message is dequeued but not persisted
- MessageExchangeDAO me = ic.dequeueMessage(new CorrelationKeys().add(key1));
+ MessageExchangeDAO me = ic.dequeueMessage(new CorrelationKeySet().add(key1));
assertNotNull(me);
assertEquals(me.getCallee(),new QName(TEST_NS,"testCallee"));
assertEquals(me.getPropagateTransactionFlag(),false);
Modified: ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java Tue Jan 6 14:27:48 2009
@@ -19,7 +19,7 @@
package org.apache.ode.dao.jpa;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.dao.CorrelatorDAO;
import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.dao.MessageRouteDAO;
@@ -59,13 +59,13 @@
_process = process;
}
- public void addRoute(String routeGroupId, ProcessInstanceDAO target, int index, CorrelationKeys correlationKeySet, String routePolicy) {
+ public void addRoute(String routeGroupId, ProcessInstanceDAO target, int index, CorrelationKeySet correlationKeySet, String routePolicy) {
MessageRouteDAOImpl mr = new MessageRouteDAOImpl(correlationKeySet,
routeGroupId, index, (ProcessInstanceDAOImpl) target, this, routePolicy);
_routes.add(mr);
}
- public MessageExchangeDAO dequeueMessage(CorrelationKeys correlationKeySet) {
+ public MessageExchangeDAO dequeueMessage(CorrelationKeySet correlationKeySet) {
// TODO: this thing does not seem to be scalable: loading up based on a correlator???
for (Iterator<MessageExchangeDAOImpl> itr=_exchanges.iterator(); itr.hasNext();){
MessageExchangeDAOImpl mex = itr.next();
@@ -78,7 +78,7 @@
}
public void enqueueMessage(MessageExchangeDAO mex,
- CorrelationKeys correlationKeySet) {
+ CorrelationKeySet correlationKeySet) {
MessageExchangeDAOImpl mexImpl = (MessageExchangeDAOImpl) mex;
mexImpl.setCorrelationKeySet(correlationKeySet);
_exchanges.add(mexImpl);
@@ -87,8 +87,8 @@
}
@SuppressWarnings("unchecked")
- public List<MessageRouteDAO> findRoute(CorrelationKeys correlationKeySet) {
- List<CorrelationKeys> subSets = correlationKeySet.findSubSets();
+ public List<MessageRouteDAO> findRoute(CorrelationKeySet correlationKeySet) {
+ List<CorrelationKeySet> subSets = correlationKeySet.findSubSets();
Query qry = getEM().createQuery(generateSelectorQuery(ROUTE_BY_CKEY_HEADER, subSets));
qry.setParameter("ptype", _process.getType().toString());
qry.setParameter("corrkey", _correlatorKey);
@@ -114,7 +114,7 @@
}
}
- private String generateSelectorQuery(String header, List<CorrelationKeys> subSets) {
+ private String generateSelectorQuery(String header, List<CorrelationKeySet> subSets) {
StringBuffer filterQuery = new StringBuffer(header);
if( subSets.size() == 1 ) {
Modified: ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java Tue Jan 6 14:27:48 2009
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.dao.MessageDAO;
import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.dao.PartnerLinkDAO;
@@ -322,12 +322,12 @@
_pipedMessageExchangeId = pipedMessageExchangeId;
}
- void setCorrelationKeySet(CorrelationKeys correlationKeySet) {
+ void setCorrelationKeySet(CorrelationKeySet correlationKeySet) {
_correlationKeys = correlationKeySet.toCanonicalString();
}
- CorrelationKeys getCorrelationKeySet() {
- return new CorrelationKeys(_correlationKeys);
+ CorrelationKeySet getCorrelationKeySet() {
+ return new CorrelationKeySet(_correlationKeys);
}
public void release(boolean doClean) {
Modified: ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java?rev=732154&r1=732153&r2=732154&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java Tue Jan 6 14:27:48 2009
@@ -20,7 +20,7 @@
package org.apache.ode.dao.jpa;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.common.CorrelationKeys;
+import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.dao.MessageRouteDAO;
import org.apache.ode.bpel.dao.ProcessInstanceDAO;
@@ -70,7 +70,7 @@
private CorrelatorDAOImpl _correlator;
public MessageRouteDAOImpl() {}
- public MessageRouteDAOImpl(CorrelationKeys keySet, String groupId, int index,
+ public MessageRouteDAOImpl(CorrelationKeySet keySet, String groupId, int index,
ProcessInstanceDAOImpl processInst, CorrelatorDAOImpl correlator, String routePolicy) {
_correlationKey = keySet.toCanonicalString();
_groupId = groupId;
@@ -104,7 +104,7 @@
return _routePolicy;
}
- public CorrelationKeys getCorrelationKeys() {
- return new CorrelationKeys(_correlationKey);
+ public CorrelationKeySet getCorrelationKeySet() {
+ return new CorrelationKeySet(_correlationKey);
}
}