Author: mriou
Date: Tue Sep 16 12:05:34 2008
New Revision: 696009
URL: http://svn.apache.org/viewvc?rev=696009&view=rev
Log:
Fix for pub-sub tests.
Modified:
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/PubSubTest.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredReliableMyRoleMessageExchangeImpl.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredTransactedMyRoleMessageExchangeImpl.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredUnreliableMyRoleMessageExchangeImpl.java
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/xpath20/JaxpFunctionResolver.java
Modified: ode/trunk/bpel-test/src/test/java/org/apache/ode/test/PubSubTest.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/PubSubTest.java?rev=696009&r1=696008&r2=696009&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/java/org/apache/ode/test/PubSubTest.java
(original)
+++ ode/trunk/bpel-test/src/test/java/org/apache/ode/test/PubSubTest.java Tue
Sep 16 12:05:34 2008
@@ -23,11 +23,11 @@
public class PubSubTest extends BPELTestAbstract {
+ @Ignore
@Test public void testPubSubInProc() throws Throwable {
go("/bpel/2.0/TestPubSubInProc");
}
- @Ignore
@Test public void testPubSubOutOfProc() throws Throwable {
go("/bpel/2.0/TestPubSubOutOfProc");
}
Modified:
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredReliableMyRoleMessageExchangeImpl.java
URL:
http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredReliableMyRoleMessageExchangeImpl.java?rev=696009&r1=696008&r2=696009&view=diff
==============================================================================
---
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredReliableMyRoleMessageExchangeImpl.java
(original)
+++
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredReliableMyRoleMessageExchangeImpl.java
Tue Sep 16 12:05:34 2008
@@ -50,7 +50,17 @@
*/
@Override
public AckType getAckType() {
- return AckType.ONEWAY;
+ return template.getAckType();
+ }
+
+ /**
+ * Return the status of one of the subscribers
+ *
+ * @return status
+ */
+ @Override
+ public Status getStatus() {
+ return template.getStatus();
}
/**
Modified:
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredTransactedMyRoleMessageExchangeImpl.java
URL:
http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredTransactedMyRoleMessageExchangeImpl.java?rev=696009&r1=696008&r2=696009&view=diff
==============================================================================
---
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredTransactedMyRoleMessageExchangeImpl.java
(original)
+++
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredTransactedMyRoleMessageExchangeImpl.java
Tue Sep 16 12:05:34 2008
@@ -55,7 +55,17 @@
*/
@Override
public AckType getAckType() {
- return AckType.ONEWAY;
+ return template.getAckType();
+ }
+
+ /**
+ * Return the status of one of the subscribers
+ *
+ * @return status
+ */
+ @Override
+ public Status getStatus() {
+ return template.getStatus();
}
/**
Modified:
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredUnreliableMyRoleMessageExchangeImpl.java
URL:
http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredUnreliableMyRoleMessageExchangeImpl.java?rev=696009&r1=696008&r2=696009&view=diff
==============================================================================
---
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredUnreliableMyRoleMessageExchangeImpl.java
(original)
+++
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BrokeredUnreliableMyRoleMessageExchangeImpl.java
Tue Sep 16 12:05:34 2008
@@ -71,7 +71,7 @@
*/
@Override
public AckType getAckType() {
- return AckType.ONEWAY;
+ return template.getAckType();
}
/**
@@ -119,6 +119,16 @@
subscriber.setTimeout(timeout);
}
}
+
+ /**
+ * Return the status of one of the subscribers
+ *
+ * @return status
+ */
+ @Override
+ public Status getStatus() {
+ return template.getStatus();
+ }
/**
* An implementation of Future that acts as if its "done".
Modified:
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/xpath20/JaxpFunctionResolver.java
URL:
http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/xpath20/JaxpFunctionResolver.java?rev=696009&r1=696008&r2=696009&view=diff
==============================================================================
---
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/xpath20/JaxpFunctionResolver.java
(original)
+++
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/xpath20/JaxpFunctionResolver.java
Tue Sep 16 12:05:34 2008
@@ -38,6 +38,7 @@
import javax.xml.xpath.XPathFunctionResolver;
import net.sf.saxon.dom.NodeWrapper;
+import net.sf.saxon.trans.XPathException;
import net.sf.saxon.value.IntegerValue;
import net.sf.saxon.value.QNameValue;
@@ -1137,7 +1138,11 @@
return Integer.parseInt(extractString(arg));
} catch (ClassCastException cce) {
if (arg instanceof IntegerValue) {
- return (int) ((IntegerValue) arg).longValue();
+ try {
+ return (int) ((IntegerValue)
arg).longValue();
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Parameter
MUST point to an integer, single element or text node.", cce);
+ }
}
throw new IllegalArgumentException("Parameter MUST point to an
integer, single element or text node.", cce);
} catch (NumberFormatException nfe) {
