Author: seanahn
Date: Mon May 18 23:09:26 2009
New Revision: 776129
URL: http://svn.apache.org/viewvc?rev=776129&view=rev
Log:
ODE-511, Hibernate DAO + OnEvent + Correlation error
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/BpelActivityTest.java
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/ODEConfigDirAware.java
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/BpelActivityTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/BpelActivityTest.java?rev=776129&r1=776128&r2=776129&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/BpelActivityTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/BpelActivityTest.java
Mon May 18 23:09:26 2009
@@ -21,11 +21,10 @@
import static org.testng.Assert.fail;
-import org.apache.log4j.Logger;
import org.testng.annotations.Test;
-public class BpelActivityTest extends Axis2TestBase {
-// @Test(dataProvider="configs")
+public class BpelActivityTest extends Axis2TestBase implements
ODEConfigDirAware {
+ @Test(dataProvider="configs")
public void testThrowOnEvent() throws Exception {
final String bundleName = "TestThrowOnEvent";
// deploy the required service
@@ -39,36 +38,36 @@
Thread.sleep(2000);
String response =
server.sendRequestFile("http://localhost:8888/ode/processes/OnEventCorrelation/";,
bundleName, "testRequest.soap");
- Logger.getLogger(BpelActivityTest.class).debug("!!! : " +
response);
} catch( Exception e ) {
fail(e.getMessage());
}
}
}.start();
-// new Thread() {
-// public void run() {
-// try {
-// Thread.sleep(6000);
-// String response =
server.sendRequestFile("http://localhost:8888/ode/processes/OnEventCorrelation/";,
-// bundleName, "testRequest.soap");
-// Logger.getLogger(BpelActivityTest.class).debug("!!!SEAN :
" + response);
-// } catch( Exception e ) {
-// fail(e.getMessage());
-// }
-// }
-// }.start();
+ new Thread() {
+ public void run() {
+ try {
+ Thread.sleep(4000);
+
server.sendRequestFile("http://localhost:8888/ode/processes/OnEventCorrelation/";,
+ bundleName, "testRequest.soap");
+ } catch( Exception e ) {
+ fail(e.getMessage());
+ } finally {
+ server.undeployProcess(bundleName);
+ }
+ }
+ }.start();
try {
- String response =
server.sendRequestFile("http://localhost:8888/ode/processes/OnEventCorrelation/";,
- bundleName, "testRequest.soap");
- Logger.getLogger(BpelActivityTest.class).debug("!!! : " +
response);
-
-// assertTrue(response.contains("helloResponse") &&
response.contains("Something went wrong. Fortunately, it was meant to be."));
- } finally {
-// server.undeployProcess(bundleName);
+
server.sendRequestFile("http://localhost:8888/ode/processes/OnEventCorrelation/";,
+ bundleName, "testRequest.soap");
+ Thread.sleep(6000);
+ } catch( Exception e ) {
+ fail(e.getMessage());
}
-
- Thread.sleep(6000);
}
+
+ public String getODEConfigDir() {
+ return HIB_DERBY_CONF_DIR;
+ }
}
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/ODEConfigDirAware.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/ODEConfigDirAware.java?rev=776129&r1=776128&r2=776129&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/ODEConfigDirAware.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/ODEConfigDirAware.java
Mon May 18 23:09:26 2009
@@ -20,5 +20,8 @@
package org.apache.ode.axis2;
public interface ODEConfigDirAware {
+ final String HIB_DERBY_CONF_DIR =
ODEConfigDirAware.class.getClassLoader().getResource("webapp").getFile() +
"/WEB-INF/conf.hib-derby";
+ final String JPA_DERBY_CONF_DIR =
ODEConfigDirAware.class.getClassLoader().getResource("webapp").getFile() +
"/WEB-INF/conf.jpa-derby";
+
String getODEConfigDir();
}
\ No newline at end of file
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java?rev=776129&r1=776128&r2=776129&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java
Mon May 18 23:09:26 2009
@@ -26,7 +26,7 @@
public class CleanFailureHibTest extends CleanFailureTest {
@Override
public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() +
"/WEB-INF/conf.hib-derby";
+ return HIB_DERBY_CONF_DIR;
}
@Override
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java?rev=776129&r1=776128&r2=776129&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java
Mon May 18 23:09:26 2009
@@ -43,7 +43,7 @@
}
public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() +
"/WEB-INF/conf.jpa-derby";
+ return JPA_DERBY_CONF_DIR;
}
protected ProcessInstanceDAO getInstance() {
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java?rev=776129&r1=776128&r2=776129&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java
Mon May 18 23:09:26 2009
@@ -25,7 +25,7 @@
public class CleanFaultHibTest extends CleanFaultTest {
@Override
public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() +
"/WEB-INF/conf.hib-derby";
+ return HIB_DERBY_CONF_DIR;
}
@Override
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java?rev=776129&r1=776128&r2=776129&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java
Mon May 18 23:09:26 2009
@@ -90,7 +90,7 @@
}
public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() +
"/WEB-INF/conf.jpa-derby";
+ return JPA_DERBY_CONF_DIR;
}
@Override
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java?rev=776129&r1=776128&r2=776129&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java
Mon May 18 23:09:26 2009
@@ -25,7 +25,7 @@
public class CleanSuccessHibTest extends CleanSuccessTest {
@Override
public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() +
"/WEB-INF/conf.hib-derby";
+ return HIB_DERBY_CONF_DIR;
}
@Override
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java?rev=776129&r1=776128&r2=776129&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java
Mon May 18 23:09:26 2009
@@ -86,7 +86,7 @@
}
public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() +
"/WEB-INF/conf.jpa-derby";
+ return JPA_DERBY_CONF_DIR;
}
protected ProcessInstanceDAO getInstance() {
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=776129&r1=776128&r2=776129&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
Mon May 18 23:09:26 2009
@@ -208,6 +208,9 @@
if (faultData != null && _fault == null) {
_fault = faultData;
terminateActive();
+ // ODE-511; needs to clean up the route
+ if (_pickResponseChannel != null)
+
getBpelRuntimeContext().cancel(_pickResponseChannel);
_psc.completed(_fault, _comps);
} else
instance(WAITING.this);
