You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mi...@apache.org on 2009/02/17 23:06:26 UTC
svn commit: r745271 [5/19] - in /ode/branches/APACHE_ODE_1.X: ./
axis2-war/src/main/webapp/ axis2-war/src/main/webapp/WEB-INF/
axis2-war/src/main/webapp/WEB-INF/classes/
axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/
axis2-war/src/main/webapp/WEB-IN...
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinHibTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinHibTest.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinHibTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinHibTest.java Tue Feb 17 22:06:18 2009
@@ -1,8 +1,8 @@
package org.apache.ode.axis2.correlation;
public class CorrelationJoinHibTest extends CorrelationJoinTest {
- @Override
- public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.hib-derby";
- }
+ @Override
+ public String getODEConfigDir() {
+ return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.hib-derby";
+ }
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinLazyHibTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinLazyHibTest.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinLazyHibTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinLazyHibTest.java Tue Feb 17 22:06:18 2009
@@ -1,8 +1,8 @@
package org.apache.ode.axis2.correlation;
public class CorrelationJoinLazyHibTest extends CorrelationJoinLazyTest {
- @Override
- public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.hib-derby";
- }
+ @Override
+ public String getODEConfigDir() {
+ return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.hib-derby";
+ }
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinLazyTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinLazyTest.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinLazyTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinLazyTest.java Tue Feb 17 22:06:18 2009
@@ -8,14 +8,14 @@
import static org.testng.Assert.*;
public class CorrelationJoinLazyTest extends Axis2TestBase implements ODEConfigDirAware {
- /**
- * Tests a message being saved by no instance waiting for it. The saved message is picked up
- * when the third message arrives, and is consumed.
- *
- * @throws Exception
- */
+ /**
+ * Tests a message being saved by no instance waiting for it. The saved message is picked up
+ * when the third message arrives, and is consumed.
+ *
+ * @throws Exception
+ */
@Test(dataProvider="configs")
- public void testCorrelationJoin() throws Exception {
+ public void testCorrelationJoin() throws Exception {
final String bundleName = "TestCorrelationJoinLazy";
// deploy the required service
@@ -24,27 +24,27 @@
server.deployProcess(bundleName);
new Thread() {
- public void run() {
- try {
- Thread.sleep(3000);
- server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ public void run() {
+ try {
+ Thread.sleep(3000);
+ server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest2.soap");
- } catch( Exception e ) {
- fail(e.getMessage());
- }
- }
+ } catch( Exception e ) {
+ fail(e.getMessage());
+ }
+ }
}.start();
new Thread() {
- public void run() {
- try {
- Thread.sleep(6000);
- server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ public void run() {
+ try {
+ Thread.sleep(6000);
+ server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest3.soap");
- } catch( Exception e ) {
- fail(e.getMessage());
- }
- }
+ } catch( Exception e ) {
+ fail(e.getMessage());
+ }
+ }
}.start();
try {
@@ -53,13 +53,13 @@
System.out.println("=>\n" + response);
assertTrue(response.contains(">1;3;2;<"));
} catch (Exception e) {
- fail(e.getMessage());
+ fail(e.getMessage());
} finally {
server.undeployProcess(bundleName);
}
}
public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.jpa-derby";
+ return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.jpa-derby";
}
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinTest.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinTest.java Tue Feb 17 22:06:18 2009
@@ -8,13 +8,13 @@
import static org.testng.Assert.*;
public class CorrelationJoinTest extends Axis2TestBase implements ODEConfigDirAware {
- /**
- * Tests rendezvous
- *
- * @throws Exception
- */
+ /**
+ * Tests rendezvous
+ *
+ * @throws Exception
+ */
@Test(dataProvider="configs")
- public void testCorrelationJoin() throws Exception {
+ public void testCorrelationJoin() throws Exception {
final String bundleName = "TestCorrelationJoin";
// deploy the required service
@@ -23,27 +23,27 @@
server.deployProcess(bundleName);
new Thread() {
- public void run() {
- try {
- Thread.sleep(3000);
- server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ public void run() {
+ try {
+ Thread.sleep(3000);
+ server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest2.soap");
- } catch( Exception e ) {
- fail(e.getMessage());
- }
- }
+ } catch( Exception e ) {
+ fail(e.getMessage());
+ }
+ }
}.start();
new Thread() {
- public void run() {
- try {
- Thread.sleep(6000);
- server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ public void run() {
+ try {
+ Thread.sleep(6000);
+ server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest3.soap");
- } catch( Exception e ) {
- fail(e.getMessage());
- }
- }
+ } catch( Exception e ) {
+ fail(e.getMessage());
+ }
+ }
}.start();
try {
@@ -52,13 +52,13 @@
System.out.println("=>\n" + response);
assertTrue(response.contains(">1;2;3;<"));
} catch (Exception e) {
- fail(e.getMessage());
+ fail(e.getMessage());
} finally {
server.undeployProcess(bundleName);
}
}
public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.jpa-derby";
+ return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.jpa-derby";
}
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationMultiHibTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationMultiHibTest.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationMultiHibTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationMultiHibTest.java Tue Feb 17 22:06:18 2009
@@ -1,8 +1,8 @@
package org.apache.ode.axis2.correlation;
public class CorrelationMultiHibTest extends CorrelationMultiTest {
- @Override
- public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.hib-derby";
- }
+ @Override
+ public String getODEConfigDir() {
+ return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.hib-derby";
+ }
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationMultiTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationMultiTest.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationMultiTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationMultiTest.java Tue Feb 17 22:06:18 2009
@@ -9,7 +9,7 @@
public class CorrelationMultiTest extends Axis2TestBase implements ODEConfigDirAware {
@Test(dataProvider="configs")
- public void testCorrelationMulti() throws Exception {
+ public void testCorrelationMulti() throws Exception {
final String bundleName = "TestCorrelationMulti";
// deploy the required service
@@ -18,15 +18,15 @@
server.deployProcess(bundleName);
new Thread() {
- public void run() {
- try {
- Thread.sleep(3000);
- server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ public void run() {
+ try {
+ Thread.sleep(3000);
+ server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest2.soap");
- } catch( Exception e ) {
- fail(e.getMessage());
- }
- }
+ } catch( Exception e ) {
+ fail(e.getMessage());
+ }
+ }
}.start();
try {
@@ -34,13 +34,13 @@
bundleName, "testRequest.soap");
assertTrue(response.contains(">1;2;<"));
} catch (Exception e) {
- fail(e.getMessage());
+ fail(e.getMessage());
} finally {
server.undeployProcess(bundleName);
}
}
- public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.jpa-derby";
+ public String getODEConfigDir() {
+ return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.jpa-derby";
}
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java Tue Feb 17 22:06:18 2009
@@ -50,13 +50,13 @@
latch.await();
}
- @AfterMethod
+ @AfterMethod
protected void tearDown() throws Exception {
jettyWrapper.stop();
super.tearDown();
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testHttpBinding() throws Exception {
String bundleName = "TestHttpBinding";
// deploy the required service
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=745271&r1=745270&r2=745271&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 Tue Feb 17 22:06:18 2009
@@ -5,26 +5,26 @@
import org.hibernate.Query;
public class CleanFailureHibTest extends CleanFailureTest {
- @Override
- public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.hib-derby";
- }
+ @Override
+ public String getODEConfigDir() {
+ return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.hib-derby";
+ }
- @Override
- protected ProcessInstanceDAO getInstance() {
+ @Override
+ protected ProcessInstanceDAO getInstance() {
return HibDaoConnectionFactoryImpl.getInstance();
- }
+ }
- @Override
- protected ProcessDAO getProcess() {
+ @Override
+ protected ProcessDAO getProcess() {
return HibDaoConnectionFactoryImpl.getProcess();
- }
+ }
- @Override
- protected int getLargeDataCount(int echoCount) throws Exception {
+ @Override
+ protected int getLargeDataCount(int echoCount) throws Exception {
initTM();
- Query query = HibDaoConnectionFactoryImpl.getSession().createQuery("select count(id) from HLargeData as l");
-
- return ((Long)query.uniqueResult()).intValue();
- }
+ Query query = HibDaoConnectionFactoryImpl.getSession().createQuery("select count(id) from HLargeData as l");
+
+ return ((Long)query.uniqueResult()).intValue();
+ }
}
\ No newline at end of file
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=745271&r1=745270&r2=745271&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 Tue Feb 17 22:06:18 2009
@@ -6,7 +6,7 @@
import org.testng.annotations.Test;
public class CleanFailureTest extends CleanTestBase {
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanAll() throws Exception {
String bundleName = "TestCleanFailure";
// deploy the required service
@@ -14,29 +14,29 @@
if (server.isDeployed(bundleName)) server.undeployProcess(bundleName);
server.deployProcess(bundleName);
try {
- initialLargeDataCount = getLargeDataCount(0);
+ initialLargeDataCount = getLargeDataCount(0);
server.sendRequestFile("http://localhost:8888/processes/helloWorld", bundleName, "testRequest.soap");
} finally {
- ProcessDAO process = getProcess();
+ ProcessDAO process = getProcess();
server.undeployProcess(bundleName);
assertProcessCleanup(process);
}
}
- public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.jpa-derby";
- }
-
- protected ProcessInstanceDAO getInstance() {
+ public String getODEConfigDir() {
+ return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.jpa-derby";
+ }
+
+ protected ProcessInstanceDAO getInstance() {
return JpaDaoConnectionFactoryImpl.getInstance();
- }
+ }
- protected ProcessDAO getProcess() {
+ protected ProcessDAO getProcess() {
return JpaDaoConnectionFactoryImpl.getProcess();
- }
+ }
- @Override
- protected int getLargeDataCount(int echoCount) throws Exception {
- return echoCount;
- }
+ @Override
+ protected int getLargeDataCount(int echoCount) throws Exception {
+ return echoCount;
+ }
}
\ No newline at end of file
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=745271&r1=745270&r2=745271&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 Tue Feb 17 22:06:18 2009
@@ -4,21 +4,21 @@
import org.hibernate.Query;
public class CleanFaultHibTest extends CleanFaultTest {
- @Override
- public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.hib-derby";
- }
-
- @Override
- protected ProcessInstanceDAO getInstance() {
+ @Override
+ public String getODEConfigDir() {
+ return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.hib-derby";
+ }
+
+ @Override
+ protected ProcessInstanceDAO getInstance() {
return HibDaoConnectionFactoryImpl.getInstance();
- }
+ }
- @Override
- protected int getLargeDataCount(int echoCount) throws Exception {
+ @Override
+ protected int getLargeDataCount(int echoCount) throws Exception {
initTM();
- Query query = HibDaoConnectionFactoryImpl.getSession().createQuery("select count(id) from HLargeData as l");
-
- return ((Long)query.uniqueResult()).intValue();
- }
+ Query query = HibDaoConnectionFactoryImpl.getSession().createQuery("select count(id) from HLargeData as l");
+
+ return ((Long)query.uniqueResult()).intValue();
+ }
}
\ No newline at end of file
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=745271&r1=745270&r2=745271&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 Tue Feb 17 22:06:18 2009
@@ -9,45 +9,45 @@
import org.testng.annotations.Test;
public class CleanFaultTest extends CleanTestBase {
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanNone() throws Exception {
- go("TestCleanFault_None", 1, 0, 0, 1, 2, 0, 4, 2, 3, 2, 38, 47);
+ go("TestCleanFault_None", 1, 0, 0, 1, 2, 0, 4, 2, 3, 2, 38, 47);
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanInstance() throws Exception {
- try {
- go("TestCleanSuccess_Instance", 0, 0, 0, 0, 3, 0, 6, 2, 3, 6, 59, 70);
- fail("Shoud throw a runtime exception: you cannot use the instance category without the variables and correlations categories.");
- } catch(ContextException re) {}
+ try {
+ go("TestCleanSuccess_Instance", 0, 0, 0, 0, 3, 0, 6, 2, 3, 6, 59, 70);
+ fail("Shoud throw a runtime exception: you cannot use the instance category without the variables and correlations categories.");
+ } catch(ContextException re) {}
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanVariables() throws Exception {
go("TestCleanFault_Variables", 1, 0, 0, 1, 2, 0, 4, 0, 0, 0, 38, 45);
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanMessages() throws Exception {
go("TestCleanFault_Messages", 1, 0, 0, 1, 0, 0, 0, 2, 3, 2, 38, 41);
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanCorrelations() throws Exception {
go("TestCleanFault_Correlations", 1, 0, 0, 1, 2, 0, 4, 2, 3, 2, 38, 47);
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanEvents() throws Exception {
go("TestCleanFault_Events", 1, 0, 0, 1, 2, 0, 4, 2, 3, 2, 0, 9);
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanMessageCorrEvents() throws Exception {
go("TestCleanFault_MessageCorrEvents", 1, 0, 0, 1, 0, 0, 0, 2, 3, 2, 0, 3);
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanAll() throws Exception {
go("TestCleanFault_All", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
}
@@ -59,8 +59,8 @@
server.deployProcess(bundleName);
ProcessDAO process = null;
try {
- initialLargeDataCount = getLargeDataCount(0);
-
+ initialLargeDataCount = getLargeDataCount(0);
+
server.sendRequestFile("http://localhost:8888/processes/helloWorld", bundleName, "testRequest.soap");
assertInstanceCleanup(instances, activityRecoveries, correlationSets, faults, exchanges, routes, messsages, partnerLinks, scopes, variables, events, largeData);
process = assertInstanceCleanup(instances, activityRecoveries, correlationSets, faults, exchanges, routes, messsages, partnerLinks, scopes, variables, events, largeData);
@@ -70,17 +70,17 @@
}
}
- public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.jpa-derby";
- }
+ public String getODEConfigDir() {
+ return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.jpa-derby";
+ }
- @Override
- protected ProcessInstanceDAO getInstance() {
+ @Override
+ protected ProcessInstanceDAO getInstance() {
return JpaDaoConnectionFactoryImpl.getInstance();
- }
+ }
- @Override
- protected int getLargeDataCount(int echoCount) throws Exception {
- return echoCount;
- }
+ @Override
+ protected int getLargeDataCount(int echoCount) throws Exception {
+ return echoCount;
+ }
}
\ No newline at end of file
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=745271&r1=745270&r2=745271&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 Tue Feb 17 22:06:18 2009
@@ -4,21 +4,21 @@
import org.hibernate.Query;
public class CleanSuccessHibTest extends CleanSuccessTest {
- @Override
- public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.hib-derby";
- }
+ @Override
+ public String getODEConfigDir() {
+ return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.hib-derby";
+ }
- @Override
- protected ProcessInstanceDAO getInstance() {
+ @Override
+ protected ProcessInstanceDAO getInstance() {
return HibDaoConnectionFactoryImpl.getInstance();
- }
+ }
- @Override
- protected int getLargeDataCount(int echoCount) throws Exception {
+ @Override
+ protected int getLargeDataCount(int echoCount) throws Exception {
initTM();
- Query query = HibDaoConnectionFactoryImpl.getSession().createQuery("select count(id) from HLargeData as l");
-
- return ((Long)query.uniqueResult()).intValue();
- }
+ Query query = HibDaoConnectionFactoryImpl.getSession().createQuery("select count(id) from HLargeData as l");
+
+ return ((Long)query.uniqueResult()).intValue();
+ }
}
\ No newline at end of file
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=745271&r1=745270&r2=745271&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 Tue Feb 17 22:06:18 2009
@@ -8,45 +8,45 @@
import static org.testng.AssertJUnit.fail;
public class CleanSuccessTest extends CleanTestBase {
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanNone() throws Exception {
- go("TestCleanSuccess_None", 1, 0, 0, 0, 3, 0, 6, 2, 3, 6, 59, 76);
+ go("TestCleanSuccess_None", 1, 0, 0, 0, 3, 0, 6, 2, 3, 6, 59, 76);
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanInstance() throws Exception {
- try {
- go("TestCleanSuccess_Instance", 0, 0, 0, 0, 3, 0, 6, 2, 3, 6, 59, 70);
- fail("Shoud throw a runtime exception: you cannot use the instance category without the variables and correlations categories.");
- } catch(ContextException re) {}
+ try {
+ go("TestCleanSuccess_Instance", 0, 0, 0, 0, 3, 0, 6, 2, 3, 6, 59, 70);
+ fail("Shoud throw a runtime exception: you cannot use the instance category without the variables and correlations categories.");
+ } catch(ContextException re) {}
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanVariables() throws Exception {
go("TestCleanSuccess_Variables", 1, 0, 0, 0, 3, 0, 6, 0, 0, 0, 59, 70);
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanMessages() throws Exception {
go("TestCleanSuccess_Messages", 1, 0, 0, 0, 0, 0, 0, 2, 3, 6, 59, 65);
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanCorrelations() throws Exception {
go("TestCleanSuccess_Correlations", 1, 0, 0, 0, 3, 0, 6, 2, 3, 6, 59, 76);
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanEvents() throws Exception {
go("TestCleanSuccess_Events", 1, 0, 0, 0, 3, 0, 6, 2, 3, 6, 0, 17);
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanMessageCorrEvents() throws Exception {
go("TestCleanSuccess_MessageCorrEvents", 1, 0, 0, 0, 0, 0, 0, 2, 3, 6, 0, 6);
}
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testCleanAll() throws Exception {
go("TestCleanSuccess_All", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
}
@@ -56,8 +56,8 @@
server.deployProcess(bundleName);
ProcessDAO process = null;
try {
- initialLargeDataCount = getLargeDataCount(0);
-
+ initialLargeDataCount = getLargeDataCount(0);
+
server.sendRequestFile("http://localhost:8888/processes/FirstProcess/FirstProcess/FirstProcess/Client", bundleName, "testRequest.soap");
process = assertInstanceCleanup(instances, activityRecoveries, correlationSets, faults, exchanges, routes, messsages, partnerLinks, scopes, variables, events, largeData);
} finally {
@@ -66,16 +66,16 @@
}
}
- public String getODEConfigDir() {
- return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.jpa-derby";
- }
-
- protected ProcessInstanceDAO getInstance() {
+ public String getODEConfigDir() {
+ return getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.jpa-derby";
+ }
+
+ protected ProcessInstanceDAO getInstance() {
return JpaDaoConnectionFactoryImpl.getInstance();
- }
-
- @Override
- protected int getLargeDataCount(int echoCount) throws Exception {
- return echoCount;
- }
+ }
+
+ @Override
+ protected int getLargeDataCount(int echoCount) throws Exception {
+ return echoCount;
+ }
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java Tue Feb 17 22:06:18 2009
@@ -21,8 +21,8 @@
public abstract class CleanTestBase extends Axis2TestBase implements ODEConfigDirAware {
protected ProfilingBpelDAOConnection daoConn;
protected TransactionManager txm;
- protected int initialLargeDataCount = 0;
-
+ protected int initialLargeDataCount = 0;
+
@AfterMethod
protected void tearDown() throws Exception {
stopTM();
@@ -30,50 +30,50 @@
}
protected void initTM() throws Exception {
- if( txm != null ) {
- try {
- txm.commit();
- } catch( Exception e ) {
- //ignore
- }
- }
+ if( txm != null ) {
+ try {
+ txm.commit();
+ } catch( Exception e ) {
+ //ignore
+ }
+ }
EmbeddedGeronimoFactory factory = new EmbeddedGeronimoFactory();
txm = factory.getTransactionManager();
Database db = getDatabase();
db.setTransactionManager(txm);
- db.start();
+ db.start();
txm.begin();
daoConn = (ProfilingBpelDAOConnection)db.createDaoCF().getConnection();
}
protected void stopTM() throws Exception {
- if( txm != null ) {
- try {
- txm.commit();
- } catch( Exception e ) {
- //ignore
- }
- txm = null;
- }
+ if( txm != null ) {
+ try {
+ txm.commit();
+ } catch( Exception e ) {
+ //ignore
+ }
+ txm = null;
+ }
}
protected Database getDatabase() throws Exception {
- String odeConfigDir = getODEConfigDir();
- if( config == null || DO_NOT_OVERRIDE_CONFIG.equals(config) || "<jpa>".equals(config) || "<hib>".equals(config) ) {
- System.out.println("Profiling config, default: " + odeConfigDir);
- } else {
- System.out.println("Profiling config: " + config + ".");
- odeConfigDir = config;
- }
- File configFile = new File(odeConfigDir);
- ODEConfigProperties odeProps = new ODEConfigProperties(configFile);
- odeProps.load();
- Database db = new Database(odeProps);
- String webappPath = getClass().getClassLoader().getResource("webapp").getFile();
- db.setWorkRoot(new File(webappPath, "/WEB-INF"));
-
- return db;
+ String odeConfigDir = getODEConfigDir();
+ if( config == null || DO_NOT_OVERRIDE_CONFIG.equals(config) || "<jpa>".equals(config) || "<hib>".equals(config) ) {
+ System.out.println("Profiling config, default: " + odeConfigDir);
+ } else {
+ System.out.println("Profiling config: " + config + ".");
+ odeConfigDir = config;
+ }
+ File configFile = new File(odeConfigDir);
+ ODEConfigProperties odeProps = new ODEConfigProperties(configFile);
+ odeProps.load();
+ Database db = new Database(odeProps);
+ String webappPath = getClass().getClassLoader().getResource("webapp").getFile();
+ db.setWorkRoot(new File(webappPath, "/WEB-INF"));
+
+ return db;
}
protected TransactionManager getTransactionManager() {
@@ -84,8 +84,8 @@
initTM();
ProcessInstanceProfileDAO profile = daoConn.createProcessInstanceProfile(getInstance());
- assertEquals("Number of instances", instances, profile.findInstancesByProcess().size());
- assertEquals("Number of activity recoveries", activityRecoveries, profile.findActivityRecoveriesByInstance().size());
+ assertEquals("Number of instances", instances, profile.findInstancesByProcess().size());
+ assertEquals("Number of activity recoveries", activityRecoveries, profile.findActivityRecoveriesByInstance().size());
assertEquals("Number of correlation sets", correlationSets, profile.findCorrelationSetsByInstance().size());
assertEquals("Number of faults", faults, profile.findFaultsByInstance().size());
assertEquals("Number of message exchanges", exchanges, profile.findMessageExchangesByInstance().size());
@@ -94,10 +94,10 @@
assertEquals("Number of partner links", partnerLinks, profile.findPartnerLinksByInstance().size());
assertEquals("Number of scopes", scopes, profile.findScopesByInstance().size());
assertEquals("Number of variables", variables, profile.findXmlDataByInstance().size());
- assertEquals("Number of events", events, profile.countEventsByInstance());
- assertEquals("Number of large data", largeData, getLargeDataCount(largeData) - initialLargeDataCount);
+ assertEquals("Number of events", events, profile.countEventsByInstance());
+ assertEquals("Number of large data", largeData, getLargeDataCount(largeData) - initialLargeDataCount);
- return profile.getProcess();
+ return profile.getProcess();
}
protected void assertProcessCleanup(ProcessDAO process) throws Exception {
@@ -106,7 +106,7 @@
ProcessProfileDAO profile = daoConn.createProcessProfile(process);
assertTrue("Process should have been deleted.", !profile.doesProcessExist());
assertEquals("Number of instances", 0, profile.findInstancesByProcess().size());
- assertEquals("Number of activity recoveries", 0, profile.findActivityRecoveriesByProcess().size());
+ assertEquals("Number of activity recoveries", 0, profile.findActivityRecoveriesByProcess().size());
assertEquals("Number of correlation sets", 0, profile.findCorrelationSetsByProcess().size());
assertEquals("Number of correlators", 0, profile.findCorrelatorsByProcess().size());
assertEquals("Number of faults", 0, profile.findFaultsByProcess().size());
@@ -116,12 +116,12 @@
assertEquals("Number of partner links", 0, profile.findPartnerLinksByProcess().size());
assertEquals("Number of scopes", 0, profile.findScopesByProcess().size());
assertEquals("Number of variables", 0, profile.findXmlDataByProcess().size());
- assertEquals("Number of events", 0, profile.countEventsByProcess());
- assertEquals("Number of large data", 0, getLargeDataCount(0) - initialLargeDataCount);
+ assertEquals("Number of events", 0, profile.countEventsByProcess());
+ assertEquals("Number of large data", 0, getLargeDataCount(0) - initialLargeDataCount);
}
}
- protected abstract ProcessInstanceDAO getInstance();
-
- protected abstract int getLargeDataCount(int echoCount) throws Exception;
+ protected abstract ProcessInstanceDAO getInstance();
+
+ protected abstract int getLargeDataCount(int echoCount) throws Exception;
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/HibDaoConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/HibDaoConnectionFactoryImpl.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/HibDaoConnectionFactoryImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/HibDaoConnectionFactoryImpl.java Tue Feb 17 22:06:18 2009
@@ -30,56 +30,56 @@
private static SessionManager _staticSessionManager;
private static ProcessInstanceDaoImpl instance;
private static ProcessDaoImpl process;
-
- @Override
+
+ @Override
protected SessionManager createSessionManager(Properties properties, DataSource ds, TransactionManager tm) {
- _staticSessionManager = new SessionManager(properties, ds, tm) {
- @Override
- public Configuration getDefaultConfiguration() throws MappingException {
- Configuration conf = super.getDefaultConfiguration();
- conf.setListener("post-insert", HibDaoConnectionFactoryImpl.this);
- return conf;
- }
- };
-
- return _staticSessionManager;
+ _staticSessionManager = new SessionManager(properties, ds, tm) {
+ @Override
+ public Configuration getDefaultConfiguration() throws MappingException {
+ Configuration conf = super.getDefaultConfiguration();
+ conf.setListener("post-insert", HibDaoConnectionFactoryImpl.this);
+ return conf;
+ }
+ };
+
+ return _staticSessionManager;
}
public BpelDAOConnection getConnection() {
return new ProfilingBpelDAOConnectionImpl(_sessionManager);
}
-
+
public static Session getSession() {
- return _staticSessionManager.getSession();
- }
-
- public static ProcessInstanceDAO getInstance() {
- return instance;
- }
-
- public static ProcessDaoImpl getProcess() {
- return process;
- }
+ return _staticSessionManager.getSession();
+ }
+
+ public static ProcessInstanceDAO getInstance() {
+ return instance;
+ }
+
+ public static ProcessDaoImpl getProcess() {
+ return process;
+ }
- public void onPostInsert(PostInsertEvent e) {
- if( HProcessInstance.class.equals( e.getEntity().getClass() ) ) {
- instance = new ProcessInstanceDaoImpl(_sessionManager, (HProcessInstance)e.getEntity());
- } else if( HProcess.class.equals( e.getEntity().getClass() ) ) {
- process = new ProcessDaoImpl(_sessionManager, (HProcess)e.getEntity());
- }
- }
+ public void onPostInsert(PostInsertEvent e) {
+ if( HProcessInstance.class.equals( e.getEntity().getClass() ) ) {
+ instance = new ProcessInstanceDaoImpl(_sessionManager, (HProcessInstance)e.getEntity());
+ } else if( HProcess.class.equals( e.getEntity().getClass() ) ) {
+ process = new ProcessDaoImpl(_sessionManager, (HProcess)e.getEntity());
+ }
+ }
- public static class ProfilingBpelDAOConnectionImpl extends BpelDAOConnectionImpl implements ProfilingBpelDAOConnection {
- ProfilingBpelDAOConnectionImpl(SessionManager sm) {
- super(sm);
- }
-
- public ProcessProfileDAO createProcessProfile(ProcessDAO process) {
- return new ProcessProfileDaoImpl(_sm, (ProcessDaoImpl)process);
- }
+ public static class ProfilingBpelDAOConnectionImpl extends BpelDAOConnectionImpl implements ProfilingBpelDAOConnection {
+ ProfilingBpelDAOConnectionImpl(SessionManager sm) {
+ super(sm);
+ }
+
+ public ProcessProfileDAO createProcessProfile(ProcessDAO process) {
+ return new ProcessProfileDaoImpl(_sm, (ProcessDaoImpl)process);
+ }
- public ProcessInstanceProfileDAO createProcessInstanceProfile(ProcessInstanceDAO instance) {
- return new ProcessInstanceProfileDaoImpl(_sm, (ProcessInstanceDaoImpl)instance);
- }
- }
+ public ProcessInstanceProfileDAO createProcessInstanceProfile(ProcessInstanceDAO instance) {
+ return new ProcessInstanceProfileDaoImpl(_sm, (ProcessInstanceDaoImpl)instance);
+ }
+ }
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/JpaDaoConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/JpaDaoConnectionFactoryImpl.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/JpaDaoConnectionFactoryImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/JpaDaoConnectionFactoryImpl.java Tue Feb 17 22:06:18 2009
@@ -19,52 +19,52 @@
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
public class JpaDaoConnectionFactoryImpl extends BPELDAOConnectionFactoryImpl implements PersistListener {
- private static ProcessInstanceDAO instance;
- private static ProcessDAO process;
-
- public static ProcessInstanceDAO getInstance() {
- return instance;
- }
-
- public static ProcessDAO getProcess() {
- return process;
- }
-
- @Override
- public void init(Properties properties) {
- super.init(properties);
- if( _emf instanceof OpenJPAEntityManagerFactorySPI ) {
- ((OpenJPAEntityManagerFactorySPI)_emf).addLifecycleListener(this, ProcessInstanceDAOImpl.class, ProcessDAOImpl.class);
- }
- }
-
- @Override
+ private static ProcessInstanceDAO instance;
+ private static ProcessDAO process;
+
+ public static ProcessInstanceDAO getInstance() {
+ return instance;
+ }
+
+ public static ProcessDAO getProcess() {
+ return process;
+ }
+
+ @Override
+ public void init(Properties properties) {
+ super.init(properties);
+ if( _emf instanceof OpenJPAEntityManagerFactorySPI ) {
+ ((OpenJPAEntityManagerFactorySPI)_emf).addLifecycleListener(this, ProcessInstanceDAOImpl.class, ProcessDAOImpl.class);
+ }
+ }
+
+ @Override
protected BPELDAOConnectionImpl createBPELDAOConnection(EntityManager em) {
- return new ProfilingBPELDAOConnectionImpl(em);
+ return new ProfilingBPELDAOConnectionImpl(em);
}
public void afterPersist(LifecycleEvent event) {
- if( event.getSource() instanceof ProcessInstanceDAOImpl ) {
- instance = (ProcessInstanceDAOImpl)event.getSource();
- } else {
- process = (ProcessDAOImpl)event.getSource();
- }
- }
-
- public void beforePersist(LifecycleEvent event) {
- }
-
- public static class ProfilingBPELDAOConnectionImpl extends BPELDAOConnectionImpl implements ProfilingBpelDAOConnection {
- public ProfilingBPELDAOConnectionImpl(EntityManager em) {
- super(em);
- }
-
- public ProcessProfileDAO createProcessProfile(ProcessDAO process) {
- return new ProcessProfileDAOImpl(_em, (ProcessDAOImpl)process);
- }
-
- public ProcessInstanceProfileDAO createProcessInstanceProfile(ProcessInstanceDAO instance) {
- return new ProcessInstanceProfileDAOImpl(_em, (ProcessInstanceDAOImpl)instance);
- }
- }
+ if( event.getSource() instanceof ProcessInstanceDAOImpl ) {
+ instance = (ProcessInstanceDAOImpl)event.getSource();
+ } else {
+ process = (ProcessDAOImpl)event.getSource();
+ }
+ }
+
+ public void beforePersist(LifecycleEvent event) {
+ }
+
+ public static class ProfilingBPELDAOConnectionImpl extends BPELDAOConnectionImpl implements ProfilingBpelDAOConnection {
+ public ProfilingBPELDAOConnectionImpl(EntityManager em) {
+ super(em);
+ }
+
+ public ProcessProfileDAO createProcessProfile(ProcessDAO process) {
+ return new ProcessProfileDAOImpl(_em, (ProcessDAOImpl)process);
+ }
+
+ public ProcessInstanceProfileDAO createProcessInstanceProfile(ProcessInstanceDAO instance) {
+ return new ProcessInstanceProfileDAOImpl(_em, (ProcessInstanceDAOImpl)instance);
+ }
+ }
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProfilingBpelDAOConnection.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProfilingBpelDAOConnection.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProfilingBpelDAOConnection.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProfilingBpelDAOConnection.java Tue Feb 17 22:06:18 2009
@@ -7,7 +7,7 @@
import org.apache.ode.bpel.dao.ProcessProfileDAO;
public interface ProfilingBpelDAOConnection extends BpelDAOConnection {
- ProcessProfileDAO createProcessProfile(ProcessDAO instance);
-
- ProcessInstanceProfileDAO createProcessInstanceProfile(ProcessInstanceDAO instance);
+ ProcessProfileDAO createProcessProfile(ProcessDAO instance);
+
+ ProcessInstanceProfileDAO createProcessInstanceProfile(ProcessInstanceDAO instance);
}
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java Tue Feb 17 22:06:18 2009
@@ -57,7 +57,7 @@
OMElement result = sendToPM(listRoot);
// look for DynPartnerMain-xxx
- listRoot = _client.buildMessage("listProcesses", new String[] {"filter", "orderKeys"},
+ listRoot = _client.buildMessage("listProcesses", new String[] {"filter", "orderKeys"},
new String[] {"name="+_deployed.get(0).getLocalPart(), ""});
result = sendToPM(listRoot);
result = result.getFirstElement();
@@ -178,7 +178,7 @@
byte[] buffer = new byte[4096];
int len;
while((len = is.read(buffer)) >= 0) {
- outputStream.write(buffer, 0, len);
+ outputStream.write(buffer, 0, len);
}
String base64Enc = Base64.encode(outputStream.toByteArray());
OMText zipContent = _factory.createOMText(base64Enc, "application/zip", true);
@@ -194,13 +194,13 @@
String pakage = null;
Iterator iter = result.getChildElements();
while (iter.hasNext()) {
- OMElement e = (OMElement) iter.next();
- if (e.getLocalName().equals("name")) {
+ OMElement e = (OMElement) iter.next();
+ if (e.getLocalName().equals("name")) {
pakage = e.getText();
- }
- if (e.getLocalName().equals("id")) {
- _deployed.add(e.getTextAsQName());
- }
+ }
+ if (e.getLocalName().equals("id")) {
+ _deployed.add(e.getTextAsQName());
+ }
}
return pakage;
}
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTest.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTest.java Tue Feb 17 22:06:18 2009
@@ -11,7 +11,7 @@
*/
public class RetireTest extends Axis2TestBase {
- @Test(dataProvider="configs")
+ @Test(dataProvider="configs")
public void testRetiredInstance() throws Exception {
String bundleName = "TestInstanceRetire";
System.out.println("=> " + server.getODEServer().getProcessStore().getPackages());
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessInstanceProfileDAO.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessInstanceProfileDAO.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessInstanceProfileDAO.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessInstanceProfileDAO.java Tue Feb 17 22:06:18 2009
@@ -22,25 +22,25 @@
import java.util.List;
public interface ProcessInstanceProfileDAO extends ProcessProfileDAO {
- ProcessDAO getProcess();
-
- List<ActivityRecoveryDAO> findActivityRecoveriesByInstance();
+ ProcessDAO getProcess();
+
+ List<ActivityRecoveryDAO> findActivityRecoveriesByInstance();
- List<CorrelationSetDAO> findCorrelationSetsByInstance();
+ List<CorrelationSetDAO> findCorrelationSetsByInstance();
- List<FaultDAO> findFaultsByInstance();
+ List<FaultDAO> findFaultsByInstance();
- List<MessageDAO> findMessagesByInstance();
+ List<MessageDAO> findMessagesByInstance();
- List<MessageExchangeDAO> findMessageExchangesByInstance();
+ List<MessageExchangeDAO> findMessageExchangesByInstance();
- List<MessageRouteDAO> findMessageRoutesByInstance();
+ List<MessageRouteDAO> findMessageRoutesByInstance();
- List<PartnerLinkDAO> findPartnerLinksByInstance();
+ List<PartnerLinkDAO> findPartnerLinksByInstance();
- List<ScopeDAO> findScopesByInstance();
+ List<ScopeDAO> findScopesByInstance();
- List<XmlDataDAO> findXmlDataByInstance();
-
- int countEventsByInstance();
+ List<XmlDataDAO> findXmlDataByInstance();
+
+ int countEventsByInstance();
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessProfileDAO.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessProfileDAO.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessProfileDAO.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessProfileDAO.java Tue Feb 17 22:06:18 2009
@@ -22,29 +22,29 @@
import java.util.List;
public interface ProcessProfileDAO {
- boolean doesProcessExist();
-
- List<ProcessInstanceDAO> findInstancesByProcess();
+ boolean doesProcessExist();
+
+ List<ProcessInstanceDAO> findInstancesByProcess();
- List<ActivityRecoveryDAO> findActivityRecoveriesByProcess();
+ List<ActivityRecoveryDAO> findActivityRecoveriesByProcess();
- List<CorrelationSetDAO> findCorrelationSetsByProcess();
+ List<CorrelationSetDAO> findCorrelationSetsByProcess();
- List<CorrelatorDAO> findCorrelatorsByProcess();
+ List<CorrelatorDAO> findCorrelatorsByProcess();
- List<FaultDAO> findFaultsByProcess();
+ List<FaultDAO> findFaultsByProcess();
- List<MessageDAO> findMessagesByProcess();
+ List<MessageDAO> findMessagesByProcess();
- List<MessageExchangeDAO> findMessageExchangesByProcess();
+ List<MessageExchangeDAO> findMessageExchangesByProcess();
- List<MessageRouteDAO> findMessageRoutesByProcess();
+ List<MessageRouteDAO> findMessageRoutesByProcess();
- List<PartnerLinkDAO> findPartnerLinksByProcess();
+ List<PartnerLinkDAO> findPartnerLinksByProcess();
- List<ScopeDAO> findScopesByProcess();
+ List<ScopeDAO> findScopesByProcess();
- List<XmlDataDAO> findXmlDataByProcess();
+ List<XmlDataDAO> findXmlDataByProcess();
- int countEventsByProcess();
+ int countEventsByProcess();
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java Tue Feb 17 22:06:18 2009
@@ -42,10 +42,10 @@
* OpenJPA based {@link ProcessInstanceProfileDAO} implementation
*/
public class ProcessInstanceProfileDAOImpl extends ProcessProfileDAOImpl implements ProcessInstanceProfileDAO {
- @SuppressWarnings("unused")
- private static final Log __log = LogFactory.getLog(ProcessInstanceProfileDAOImpl.class);
-
- private ProcessInstanceDAOImpl instance;
+ @SuppressWarnings("unused")
+ private static final Log __log = LogFactory.getLog(ProcessInstanceProfileDAOImpl.class);
+
+ private ProcessInstanceDAOImpl instance;
public ProcessInstanceProfileDAOImpl(EntityManager em, ProcessInstanceDAOImpl instance) {
super(em, (ProcessDAOImpl)instance.getProcess());
@@ -53,57 +53,57 @@
}
public ProcessDAO getProcess() {
- return process;
+ return process;
}
- public List<MessageExchangeDAO> findMessageExchangesByInstance() {
- return findByInstance("select x from MessageExchangeDAOImpl as x where x._processInst = :instance");
- }
-
- public List<MessageRouteDAO> findMessageRoutesByInstance() {
- return findByInstance("select r from MessageRouteDAOImpl as r where r._processInst = :instance");
- }
-
- public List<MessageDAO> findMessagesByInstance() {
- return findByInstance("select m from MessageDAOImpl as m where m._messageExchange._processInst = :instance");
- }
-
- public List<PartnerLinkDAO> findPartnerLinksByInstance() {
- return findByInstance("select p from PartnerLinkDAOImpl as p where p._scope._processInstance = :instance");
- }
-
- public List<ScopeDAO> findScopesByInstance() {
- return findByInstance("select s from ScopeDAOImpl as s where s._processInstance = :instance");
- }
-
- public List<XmlDataDAO> findXmlDataByInstance() {
- return findByInstance("select x from XmlDataDAOImpl as x where x._scope._processInstance = :instance");
- }
+ public List<MessageExchangeDAO> findMessageExchangesByInstance() {
+ return findByInstance("select x from MessageExchangeDAOImpl as x where x._processInst = :instance");
+ }
+
+ public List<MessageRouteDAO> findMessageRoutesByInstance() {
+ return findByInstance("select r from MessageRouteDAOImpl as r where r._processInst = :instance");
+ }
+
+ public List<MessageDAO> findMessagesByInstance() {
+ return findByInstance("select m from MessageDAOImpl as m where m._messageExchange._processInst = :instance");
+ }
+
+ public List<PartnerLinkDAO> findPartnerLinksByInstance() {
+ return findByInstance("select p from PartnerLinkDAOImpl as p where p._scope._processInstance = :instance");
+ }
+
+ public List<ScopeDAO> findScopesByInstance() {
+ return findByInstance("select s from ScopeDAOImpl as s where s._processInstance = :instance");
+ }
+
+ public List<XmlDataDAO> findXmlDataByInstance() {
+ return findByInstance("select x from XmlDataDAOImpl as x where x._scope._processInstance = :instance");
+ }
public List<ActivityRecoveryDAO> findActivityRecoveriesByInstance() {
- return findByInstance("select a from ActivityRecoveryDAOImpl as a where a._instance = :instance");
+ return findByInstance("select a from ActivityRecoveryDAOImpl as a where a._instance = :instance");
}
public List<CorrelationSetDAO> findCorrelationSetsByInstance() {
- return findByInstance("select s from CorrelationSetDAOImpl as s where s._scope._processInstance = :instance");
+ return findByInstance("select s from CorrelationSetDAOImpl as s where s._scope._processInstance = :instance");
}
public List<FaultDAO> findFaultsByInstance() {
- return findByInstance("select f from FaultDAOImpl as f where f._id in (select i._fault from ProcessInstanceDAOImpl as i where i = :instance and i._fault is not null)");
+ return findByInstance("select f from FaultDAOImpl as f where f._id in (select i._fault from ProcessInstanceDAOImpl as i where i = :instance and i._fault is not null)");
}
public int countEventsByInstance() {
- Query query = em.createQuery("select count(e._id) from EventDAOImpl as e where e._instance = :instance");
- query.setParameter("instance", instance);
-
- return ((Long)query.getSingleResult()).intValue();
+ Query query = em.createQuery("select count(e._id) from EventDAOImpl as e where e._instance = :instance");
+ query.setParameter("instance", instance);
+
+ return ((Long)query.getSingleResult()).intValue();
}
@SuppressWarnings("unchecked")
protected <D> List<D> findByInstance(String queryString) {
- Query query = em.createQuery(queryString);
- query.setParameter("instance", instance);
-
- return query.getResultList();
- }
+ Query query = em.createQuery(queryString);
+ query.setParameter("instance", instance);
+
+ return query.getResultList();
+ }
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java Tue Feb 17 22:06:18 2009
@@ -43,11 +43,11 @@
* OpenJPA based {@link ProcessProfileDAO} implementation
*/
public class ProcessProfileDAOImpl extends OpenJPADAO implements ProcessProfileDAO {
- @SuppressWarnings("unused")
- private static final Log __log = LogFactory.getLog(ProcessProfileDAOImpl.class);
-
- protected EntityManager em;
- protected ProcessDAOImpl process;
+ @SuppressWarnings("unused")
+ private static final Log __log = LogFactory.getLog(ProcessProfileDAOImpl.class);
+
+ protected EntityManager em;
+ protected ProcessDAOImpl process;
public ProcessProfileDAOImpl(EntityManager em, ProcessDAOImpl process) {
this.process = process;
@@ -55,68 +55,68 @@
}
public boolean doesProcessExist() {
- Query query = em.createQuery("select count(p._id) from ProcessDAOImpl as p where p._guid = :guid");
- query.setParameter("guid", process.getGuid());
-
- return ((Long)query.getSingleResult()) > 0;
- }
+ Query query = em.createQuery("select count(p._id) from ProcessDAOImpl as p where p._guid = :guid");
+ query.setParameter("guid", process.getGuid());
+
+ return ((Long)query.getSingleResult()) > 0;
+ }
+
+ public List<ProcessInstanceDAO> findInstancesByProcess() {
+ return findByProcess("select i from ProcessInstanceDAOImpl as i where i._process = :process");
+ }
+
+ public List<MessageExchangeDAO> findMessageExchangesByProcess() {
+ return findByProcess("select x from MessageExchangeDAOImpl as x where x._processInst._process = :process");
+ }
+
+ public List<MessageRouteDAO> findMessageRoutesByProcess() {
+ return findByProcess("select r from MessageRouteDAOImpl as r where r._processInst._process = :process");
+ }
+
+ public List<MessageDAO> findMessagesByProcess() {
+ return findByProcess("select m from MessageDAOImpl as m where m._messageExchange._process = :process");
+ }
+
+ public List<PartnerLinkDAO> findPartnerLinksByProcess() {
+ return findByProcess("select p from PartnerLinkDAOImpl as p where p._scope._processInstance._process = :process");
+ }
+
+ public List<ScopeDAO> findScopesByProcess() {
+ return findByProcess("select s from ScopeDAOImpl as s where s._processInstance._process = :process");
+ }
+
+ public List<XmlDataDAO> findXmlDataByProcess() {
+ return findByProcess("select x from XmlDataDAOImpl as x where x._scope._processInstance._process = :process");
+ }
- public List<ProcessInstanceDAO> findInstancesByProcess() {
- return findByProcess("select i from ProcessInstanceDAOImpl as i where i._process = :process");
- }
-
- public List<MessageExchangeDAO> findMessageExchangesByProcess() {
- return findByProcess("select x from MessageExchangeDAOImpl as x where x._processInst._process = :process");
- }
-
- public List<MessageRouteDAO> findMessageRoutesByProcess() {
- return findByProcess("select r from MessageRouteDAOImpl as r where r._processInst._process = :process");
- }
-
- public List<MessageDAO> findMessagesByProcess() {
- return findByProcess("select m from MessageDAOImpl as m where m._messageExchange._process = :process");
- }
-
- public List<PartnerLinkDAO> findPartnerLinksByProcess() {
- return findByProcess("select p from PartnerLinkDAOImpl as p where p._scope._processInstance._process = :process");
- }
-
- public List<ScopeDAO> findScopesByProcess() {
- return findByProcess("select s from ScopeDAOImpl as s where s._processInstance._process = :process");
- }
-
- public List<XmlDataDAO> findXmlDataByProcess() {
- return findByProcess("select x from XmlDataDAOImpl as x where x._scope._processInstance._process = :process");
- }
-
public List<ActivityRecoveryDAO> findActivityRecoveriesByProcess() {
- return findByProcess("select a from ActivityRecoveryDAOImpl as a where a._instance._process = :process");
+ return findByProcess("select a from ActivityRecoveryDAOImpl as a where a._instance._process = :process");
}
public List<CorrelationSetDAO> findCorrelationSetsByProcess() {
- return findByProcess("select s from CorrelationSetDAOImpl as s where s._scope._processInstance._process = :process");
+ return findByProcess("select s from CorrelationSetDAOImpl as s where s._scope._processInstance._process = :process");
}
public List<CorrelatorDAO> findCorrelatorsByProcess() {
- return findByProcess("select c from CorrelatorDAOImpl as c where c._process = :process");
+ return findByProcess("select c from CorrelatorDAOImpl as c where c._process = :process");
}
public List<FaultDAO> findFaultsByProcess() {
- return findByProcess("select f from FaultDAOImpl as f where f._id in(select i._fault from ProcessInstanceDAOImpl as i where i._process = :process and i._fault is not null)");
+ return findByProcess("select f from FaultDAOImpl as f where f._id in(select i._fault from ProcessInstanceDAOImpl as i where i._process = :process and i._fault is not null)");
}
public int countEventsByProcess() {
- Query query = em.createQuery("select count(e._id) from EventDAOImpl as e where e._instance._process = :process");
- query.setParameter("process", process);
-
- return ((Long)query.getSingleResult()).intValue();
+ Query query = em.createQuery("select count(e._id) from EventDAOImpl as e where e._instance._process = :process");
+ query.setParameter("process", process);
+
+ return ((Long)query.getSingleResult()).intValue();
}
@SuppressWarnings("unchecked")
- protected <D> List<D> findByProcess(String queryString) {
- Query query = em.createQuery(queryString);
- query.setParameter("process", process);
-
- return query.getResultList();
- }
+ protected <D> List<D> findByProcess(String queryString) {
+ Query query = em.createQuery(queryString);
+ query.setParameter("process", process);
+
+ return query.getResultList();
+ }
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java Tue Feb 17 22:06:18 2009
@@ -53,10 +53,10 @@
* Hibernate based {@link ProcessInstanceProfileDao} implementation
*/
public class ProcessInstanceProfileDaoImpl extends ProcessProfileDaoImpl implements ProcessInstanceProfileDAO {
- @SuppressWarnings("unused")
- private static final Log __log = LogFactory.getLog(ProcessInstanceProfileDaoImpl.class);
-
- private ProcessInstanceDaoImpl instance;
+ @SuppressWarnings("unused")
+ private static final Log __log = LogFactory.getLog(ProcessInstanceProfileDaoImpl.class);
+
+ private ProcessInstanceDaoImpl instance;
public ProcessInstanceProfileDaoImpl(SessionManager sm, ProcessInstanceDaoImpl instance) {
super(sm, (ProcessDaoImpl)instance.getProcess());
@@ -65,71 +65,71 @@
}
public SessionManager getSessionManager() {
- return _sm;
+ return _sm;
}
public ProcessDAO getProcess() {
- return process;
+ return process;
}
- public List<MessageExchangeDAO> findMessageExchangesByInstance() {
- return findByInstance("from HMessageExchange as x where x.instance = :instance)", MessageExchangeDaoImpl.class, HMessageExchange.class);
- }
-
- public List<MessageRouteDAO> findMessageRoutesByInstance() {
- return findByInstance("from HCorrelatorSelector as s where s.instance = :instance", MessageRouteDaoImpl.class, HCorrelatorSelector.class);
- }
-
- public List<MessageDAO> findMessagesByInstance() {
- return findByInstance("from HMessage as m where m.messageExchange.instance = :instance)", MessageDaoImpl.class, HMessage.class);
- }
-
- public List<PartnerLinkDAO> findPartnerLinksByInstance() {
- return findByInstance("from HPartnerLink as p where p.scope.instance = :instance)", PartnerLinkDAOImpl.class, HPartnerLink.class);
- }
-
- public List<ScopeDAO> findScopesByInstance() {
- return findByInstance("from HScope as s where s.instance = :instance)", ScopeDaoImpl.class, HScope.class);
- }
-
- public List<XmlDataDAO> findXmlDataByInstance() {
- return findByInstance("from HXmlData as x where x.instance = :instance", XmlDataDaoImpl.class, HXmlData.class);
- }
+ public List<MessageExchangeDAO> findMessageExchangesByInstance() {
+ return findByInstance("from HMessageExchange as x where x.instance = :instance)", MessageExchangeDaoImpl.class, HMessageExchange.class);
+ }
+
+ public List<MessageRouteDAO> findMessageRoutesByInstance() {
+ return findByInstance("from HCorrelatorSelector as s where s.instance = :instance", MessageRouteDaoImpl.class, HCorrelatorSelector.class);
+ }
+
+ public List<MessageDAO> findMessagesByInstance() {
+ return findByInstance("from HMessage as m where m.messageExchange.instance = :instance)", MessageDaoImpl.class, HMessage.class);
+ }
+
+ public List<PartnerLinkDAO> findPartnerLinksByInstance() {
+ return findByInstance("from HPartnerLink as p where p.scope.instance = :instance)", PartnerLinkDAOImpl.class, HPartnerLink.class);
+ }
+
+ public List<ScopeDAO> findScopesByInstance() {
+ return findByInstance("from HScope as s where s.instance = :instance)", ScopeDaoImpl.class, HScope.class);
+ }
+
+ public List<XmlDataDAO> findXmlDataByInstance() {
+ return findByInstance("from HXmlData as x where x.instance = :instance", XmlDataDaoImpl.class, HXmlData.class);
+ }
public List<ActivityRecoveryDAO> findActivityRecoveriesByInstance() {
- return findByInstance("from HActivityRecovery as a where a.instance = :instance", ActivityRecoveryDaoImpl.class, HActivityRecovery.class);
+ return findByInstance("from HActivityRecovery as a where a.instance = :instance", ActivityRecoveryDaoImpl.class, HActivityRecovery.class);
}
public List<CorrelationSetDAO> findCorrelationSetsByInstance() {
- return findByInstance("from HCorrelationSet as s where s.instance = :instance", CorrelationSetDaoImpl.class, HCorrelationSet.class);
+ return findByInstance("from HCorrelationSet as s where s.instance = :instance", CorrelationSetDaoImpl.class, HCorrelationSet.class);
}
public List<FaultDAO> findFaultsByInstance() {
- return findByInstance("from HFaultData as f where f in (select i.fault from HProcessInstance as i where i = :instance and i.fault is not null)", FaultDAOImpl.class, HFaultData.class);
+ return findByInstance("from HFaultData as f where f in (select i.fault from HProcessInstance as i where i = :instance and i.fault is not null)", FaultDAOImpl.class, HFaultData.class);
}
public int countEventsByInstance() {
- Query query = getSession().createQuery("select count(id) from HBpelEvent as e where e.instance = :instance");
- query.setParameter("instance", instance._hobj);
-
- return ((Long)query.uniqueResult()).intValue();
+ Query query = getSession().createQuery("select count(id) from HBpelEvent as e where e.instance = :instance");
+ query.setParameter("instance", instance._hobj);
+
+ return ((Long)query.uniqueResult()).intValue();
}
@SuppressWarnings("unchecked")
protected <D, H> List<D> findByInstance(String queryString, Class daoClass, Class hibClass) {
- List<D> results = new ArrayList<D>();
+ List<D> results = new ArrayList<D>();
- try {
- Query query = getSession().createQuery(queryString);
- query.setParameter("instance", instance._hobj);
- for( H hibObj : (Collection<H>)query.list()) {
- Constructor<D> c = daoClass.getConstructor(SessionManager.class, hibClass);
- results.add( c.newInstance(_sm, hibObj) );
- }
- } catch( Exception e ) {
- throw new RuntimeException(e);
- }
+ try {
+ Query query = getSession().createQuery(queryString);
+ query.setParameter("instance", instance._hobj);
+ for( H hibObj : (Collection<H>)query.list()) {
+ Constructor<D> c = daoClass.getConstructor(SessionManager.class, hibClass);
+ results.add( c.newInstance(_sm, hibObj) );
+ }
+ } catch( Exception e ) {
+ throw new RuntimeException(e);
+ }
- return results;
- }
+ return results;
+ }
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java Tue Feb 17 22:06:18 2009
@@ -57,10 +57,10 @@
* Hibernate based {@link ProcessProfileDAO} implementation
*/
public class ProcessProfileDaoImpl extends HibernateDao implements ProcessProfileDAO {
- @SuppressWarnings("unused")
- private static final Log __log = LogFactory.getLog(ProcessProfileDaoImpl.class);
-
- protected ProcessDaoImpl process;
+ @SuppressWarnings("unused")
+ private static final Log __log = LogFactory.getLog(ProcessProfileDaoImpl.class);
+
+ protected ProcessDaoImpl process;
public ProcessProfileDaoImpl(SessionManager sm, ProcessDaoImpl process) {
super(sm, process._hobj);
@@ -69,88 +69,88 @@
}
public SessionManager getSessionManager() {
- return _sm;
+ return _sm;
}
@SuppressWarnings("unchecked")
public boolean doesProcessExist() {
- boolean exists = false;
-
- Query query = getSession().createQuery("select count(id) from HProcess as p where p.guid = :guid");
- query.setParameter("guid", ((HProcess)process._hobj).getGuid());
- for( Long cnt : (List<Long>)query.list()) {
- exists = cnt.intValue() > 0;
- }
-
- return exists;
- }
-
- public List<ProcessInstanceDAO> findInstancesByProcess() {
- return findByProcess("from HProcessInstance as i where i.process = :process)", ProcessInstanceDaoImpl.class, HProcessInstance.class);
- }
-
- public List<MessageExchangeDAO> findMessageExchangesByProcess() {
- return findByProcess("from HMessageExchange as x where x.instance.process = :process)", MessageExchangeDaoImpl.class, HMessageExchange.class);
- }
-
- public List<MessageRouteDAO> findMessageRoutesByProcess() {
- return findByProcess("from HCorrelatorSelector as s where s.instance.process = :process)", MessageRouteDaoImpl.class, HCorrelatorSelector.class);
- }
-
- public List<MessageDAO> findMessagesByProcess() {
- return findByProcess("from HMessage as m where m.messageExchange.process = :process)", MessageDaoImpl.class, HMessage.class);
- }
-
- public List<PartnerLinkDAO> findPartnerLinksByProcess() {
- return findByProcess("from HPartnerLink as p where p.process = :process)", PartnerLinkDAOImpl.class, HPartnerLink.class);
- }
-
- public List<ScopeDAO> findScopesByProcess() {
- return findByProcess("from HScope as s where s.instance.process = :process", ScopeDaoImpl.class, HScope.class);
- }
-
- public List<XmlDataDAO> findXmlDataByProcess() {
- return findByProcess("from HXmlData as x where x.instance.process = :process", XmlDataDaoImpl.class, HXmlData.class);
- }
-
+ boolean exists = false;
+
+ Query query = getSession().createQuery("select count(id) from HProcess as p where p.guid = :guid");
+ query.setParameter("guid", ((HProcess)process._hobj).getGuid());
+ for( Long cnt : (List<Long>)query.list()) {
+ exists = cnt.intValue() > 0;
+ }
+
+ return exists;
+ }
+
+ public List<ProcessInstanceDAO> findInstancesByProcess() {
+ return findByProcess("from HProcessInstance as i where i.process = :process)", ProcessInstanceDaoImpl.class, HProcessInstance.class);
+ }
+
+ public List<MessageExchangeDAO> findMessageExchangesByProcess() {
+ return findByProcess("from HMessageExchange as x where x.instance.process = :process)", MessageExchangeDaoImpl.class, HMessageExchange.class);
+ }
+
+ public List<MessageRouteDAO> findMessageRoutesByProcess() {
+ return findByProcess("from HCorrelatorSelector as s where s.instance.process = :process)", MessageRouteDaoImpl.class, HCorrelatorSelector.class);
+ }
+
+ public List<MessageDAO> findMessagesByProcess() {
+ return findByProcess("from HMessage as m where m.messageExchange.process = :process)", MessageDaoImpl.class, HMessage.class);
+ }
+
+ public List<PartnerLinkDAO> findPartnerLinksByProcess() {
+ return findByProcess("from HPartnerLink as p where p.process = :process)", PartnerLinkDAOImpl.class, HPartnerLink.class);
+ }
+
+ public List<ScopeDAO> findScopesByProcess() {
+ return findByProcess("from HScope as s where s.instance.process = :process", ScopeDaoImpl.class, HScope.class);
+ }
+
+ public List<XmlDataDAO> findXmlDataByProcess() {
+ return findByProcess("from HXmlData as x where x.instance.process = :process", XmlDataDaoImpl.class, HXmlData.class);
+ }
+
public List<ActivityRecoveryDAO> findActivityRecoveriesByProcess() {
- return findByProcess("from HActivityRecovery as a where a.instance.process = :process", ActivityRecoveryDaoImpl.class, HActivityRecovery.class);
+ return findByProcess("from HActivityRecovery as a where a.instance.process = :process", ActivityRecoveryDaoImpl.class, HActivityRecovery.class);
}
public List<CorrelationSetDAO> findCorrelationSetsByProcess() {
- return findByProcess("from HCorrelationSet as s where s.process = :process", CorrelationSetDaoImpl.class, HCorrelationSet.class);
+ return findByProcess("from HCorrelationSet as s where s.process = :process", CorrelationSetDaoImpl.class, HCorrelationSet.class);
}
public List<CorrelatorDAO> findCorrelatorsByProcess() {
- return findByProcess("from HCorrelator as c where c.process = :process", CorrelatorDaoImpl.class, HCorrelator.class);
+ return findByProcess("from HCorrelator as c where c.process = :process", CorrelatorDaoImpl.class, HCorrelator.class);
}
public List<FaultDAO> findFaultsByProcess() {
- return findByProcess("from HFaultData as f where f in (select i.fault from HProcessInstance as i where i.process = :process and i.fault is not null)", FaultDAOImpl.class, HFaultData.class);
+ return findByProcess("from HFaultData as f where f in (select i.fault from HProcessInstance as i where i.process = :process and i.fault is not null)", FaultDAOImpl.class, HFaultData.class);
}
public int countEventsByProcess() {
- Query query = getSession().createQuery("select count(id) from HBpelEvent as e where e.instance.process = :process");
- query.setParameter("process", process._hobj);
+ Query query = getSession().createQuery("select count(id) from HBpelEvent as e where e.instance.process = :process");
+ query.setParameter("process", process._hobj);
- return ((Long)query.uniqueResult()).intValue();
+ return ((Long)query.uniqueResult()).intValue();
}
@SuppressWarnings("unchecked")
- protected <D, H> List<D> findByProcess(String queryString, Class daoClass, Class hibClass) {
- List<D> results = new ArrayList<D>();
+ protected <D, H> List<D> findByProcess(String queryString, Class daoClass, Class hibClass) {
+ List<D> results = new ArrayList<D>();
- try {
- Query query = getSession().createQuery(queryString);
- query.setParameter("process", process._hobj);
- for( H hibObj : (Collection<H>)query.list()) {
- Constructor<D> c = daoClass.getConstructor(SessionManager.class, hibClass);
- results.add( c.newInstance(_sm, hibObj) );
- }
- } catch( Exception e ) {
- throw new RuntimeException(e);
- }
+ try {
+ Query query = getSession().createQuery(queryString);
+ query.setParameter("process", process._hobj);
+ for( H hibObj : (Collection<H>)query.list()) {
+ Constructor<D> c = daoClass.getConstructor(SessionManager.class, hibClass);
+ results.add( c.newInstance(_sm, hibObj) );
+ }
+ } catch( Exception e ) {
+ throw new RuntimeException(e);
+ }
- return results;
- }
+ return results;
+ }
}
\ No newline at end of file
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestAttributeNamespaces/HelloWorld2.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestAttributeNamespaces/HelloWorld2.bpel?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestAttributeNamespaces/HelloWorld2.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestAttributeNamespaces/HelloWorld2.bpel Tue Feb 17 22:06:18 2009
@@ -7,8 +7,8 @@
xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:test="http://ode/bpel/unit-test.wsdl"
xmlns:tns="http://ode/bpel/unit-test" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- xmlns:myns="myns">
+ xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:myns="myns">
<bpws:import importType="http://schemas.xmlsoap.org/wsdl/"
location="HelloWorld2.wsdl" namespace="http://ode/bpel/unit-test.wsdl"/>
<bpws:partnerLinks>
@@ -26,25 +26,25 @@
<bpws:assign name="assign1" validate="yes">
<bpws:copy>
<bpws:from variable="inVar" part="parameters">
- <bpws:query>myns:in</bpws:query>
- </bpws:from>
+ <bpws:query>myns:in</bpws:query>
+ </bpws:from>
<bpws:to variable="tmpVar"/>
</bpws:copy>
- <bpws:copy>
- <bpws:from>
- <bpws:literal>
- <myns:helloResponse>
- <myns:out xmlns:foo="xsn:foo" myattr="foo:bar"/>
- </myns:helloResponse>
- </bpws:literal>
- </bpws:from>
- <bpws:to variable="outVar" part="parameters"/>
- </bpws:copy>
+ <bpws:copy>
+ <bpws:from>
+ <bpws:literal>
+ <myns:helloResponse>
+ <myns:out xmlns:foo="xsn:foo" myattr="foo:bar"/>
+ </myns:helloResponse>
+ </bpws:literal>
+ </bpws:from>
+ <bpws:to variable="outVar" part="parameters"/>
+ </bpws:copy>
<bpws:copy>
<bpws:from>$tmpVar</bpws:from>
<bpws:to variable="outVar" part="parameters">
- <bpws:query>myns:out</bpws:query>
- </bpws:to>
+ <bpws:query>myns:out</bpws:query>
+ </bpws:to>
</bpws:copy>
</bpws:assign>
<bpws:reply name="end" operation="hello"