riftsaw SVN: r673 - branches.
by riftsaw-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-05-26 13:34:39 -0400 (Wed, 26 May 2010)
New Revision: 673
Added:
branches/bbrodt/
Removed:
branches/qa/
Log:
Copied: branches/bbrodt (from rev 672, branches/qa)
14 years, 1 month
- 1
- 0
riftsaw SVN: r672 - branches.
by riftsaw-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-05-26 11:49:01 -0400 (Wed, 26 May 2010)
New Revision: 672
Added:
branches/qa/
Log:
https://jira.jboss.org/browse/RIFTSAW-182
Added for stress/reliability testcases and general QA stuff
14 years, 1 month
- 1
- 0
riftsaw SVN: r671 - branches/ODE/ODE-1.x-jpa/dao-jpa-db.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-05-26 08:41:50 -0400 (Wed, 26 May 2010)
New Revision: 671
Modified:
branches/ODE/ODE-1.x-jpa/dao-jpa-db/pom.xml
Log:
* add dao-jpa dependency.
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-db/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-db/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-db/pom.xml 2010-05-26 12:41:50 UTC (rev 671)
@@ -86,6 +86,10 @@
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-dao-jpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-bpel-store</artifactId>
</dependency>
<dependency>
14 years, 1 month
- 1
- 0
riftsaw SVN: r670 - in branches/ODE/ODE-1.x-jpa: agents and 33 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-05-26 04:51:59 -0400 (Wed, 26 May 2010)
New Revision: 670
Modified:
branches/ODE/ODE-1.x-jpa/agents/pom.xml
branches/ODE/ODE-1.x-jpa/axis2-war/pom.xml
branches/ODE/ODE-1.x-jpa/axis2/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-api-jca/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-api/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-compiler/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-connector/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-dao/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-epr/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-obj/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-ql/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-runtime/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-schemas/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-scripts/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-store/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-test/pom.xml
branches/ODE/ODE-1.x-jpa/dao-hibernate-db/pom.xml
branches/ODE/ODE-1.x-jpa/dao-hibernate/pom.xml
branches/ODE/ODE-1.x-jpa/dao-jpa-db/pom.xml
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/pom.xml
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa-derby/pom.xml
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/pom.xml
branches/ODE/ODE-1.x-jpa/dao-jpa/pom.xml
branches/ODE/ODE-1.x-jpa/distro/pom.xml
branches/ODE/ODE-1.x-jpa/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
branches/ODE/ODE-1.x-jpa/jacob/pom.xml
branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml
branches/ODE/ODE-1.x-jpa/jbi-karaf/pom.xml
branches/ODE/ODE-1.x-jpa/jbi/pom.xml
branches/ODE/ODE-1.x-jpa/jca-ra/pom.xml
branches/ODE/ODE-1.x-jpa/jca-server/pom.xml
branches/ODE/ODE-1.x-jpa/pom.xml
branches/ODE/ODE-1.x-jpa/scheduler-simple/pom.xml
branches/ODE/ODE-1.x-jpa/tools/pom.xml
branches/ODE/ODE-1.x-jpa/utils/pom.xml
Log:
* update the version into 2.1.0.CR1-SNAPSHOT.
Modified: branches/ODE/ODE-1.x-jpa/agents/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/agents/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/agents/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,6 +28,6 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
</project>
Modified: branches/ODE/ODE-1.x-jpa/axis2/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/axis2/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<properties>
@@ -354,6 +354,7 @@
<goal>test</goal>
</goals>
<configuration>
+ <skipTests>true</skipTests>
<forkMode>always</forkMode>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<additionalClasspathElements>
Modified: branches/ODE/ODE-1.x-jpa/bpel-api/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-api/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/bpel-api/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-api-jca/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-api-jca/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/bpel-api-jca/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-compiler/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-compiler/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/bpel-compiler/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-connector/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-connector/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/bpel-connector/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-dao/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-dao/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/bpel-dao/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-epr/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-epr/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/bpel-epr/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-obj/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-obj/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/bpel-obj/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-ql/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-ql/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/bpel-ql/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-runtime/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-runtime/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/bpel-runtime/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-schemas/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-schemas/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/bpel-schemas/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-scripts/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-scripts/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/bpel-scripts/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,6 +28,6 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
</project>
Modified: branches/ODE/ODE-1.x-jpa/bpel-store/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-store/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/bpel-store/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-test/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-test/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/bpel-test/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-hibernate/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-hibernate/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/dao-hibernate/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-hibernate-db/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-hibernate-db/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/dao-hibernate-db/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-db/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-db/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-db/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa-derby/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa-derby/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa-derby/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/distro/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/distro/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/distro/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/ODE/ODE-1.x-jpa/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.bpel.examples</groupId>
<artifactId>ping-pong-bundle</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
<name>ODE :: examples :: Ping Pong OSGi </name>
<packaging>bundle</packaging>
Modified: branches/ODE/ODE-1.x-jpa/jacob/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jacob/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/jacob/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/jbi/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jbi/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/jbi/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -33,7 +33,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<build>
Modified: branches/ODE/ODE-1.x-jpa/jbi-karaf/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jbi-karaf/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/jbi-karaf/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<artifactId>riftsaw-jbi-karaf</artifactId>
Modified: branches/ODE/ODE-1.x-jpa/jca-ra/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jca-ra/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/jca-ra/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/jca-server/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jca-server/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/jca-server/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -6,7 +6,7 @@
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
<url>http://ode.apache.org</url>
<issueManagement>
<system>jira</system>
@@ -36,7 +36,7 @@
</prerequisites>
-->
<properties>
- <ode.version>2.1.0-SNAPSHOT</ode.version>
+ <ode.version>2.1.0.CR1-SNAPSHOT</ode.version>
<activation.version>1.1</activation.version>
<annogen.version>0.1.0</annogen.version>
<antlr.version>2.7.7</antlr.version>
@@ -137,7 +137,7 @@
<module>jbi</module>
<module>jbi-bundle</module>
<module>jbi-karaf</module>
- <!--module>axis2-war</module-->
+ <module>axis2-war</module>
<module>distro</module>
</modules>
Modified: branches/ODE/ODE-1.x-jpa/scheduler-simple/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/scheduler-simple/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/scheduler-simple/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/tools/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/tools/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/tools/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/utils/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/utils/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
+++ branches/ODE/ODE-1.x-jpa/utils/pom.xml 2010-05-26 08:51:59 UTC (rev 670)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0.CR1-SNAPSHOT</version>
</parent>
<dependencies>
14 years, 1 month
- 1
- 0
riftsaw SVN: r669 - in branches/ODE/ODE-1.x-jpa: jbi/src/main/assembly and 3 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-05-26 04:21:22 -0400 (Wed, 26 May 2010)
New Revision: 669
Modified:
branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml
branches/ODE/ODE-1.x-jpa/jbi-bundle/src/main/resources/META-INF/persistence.xml
branches/ODE/ODE-1.x-jpa/jbi/src/main/assembly/bin.xml
branches/ODE/ODE-1.x-jpa/jbi/src/test/jbi/ode-jbi.properties
branches/ODE/ODE-1.x-jpa/pom.xml
Log:
* fix the error for jbi module, not running the axis2-war testing module.
Modified: branches/ODE/ODE-1.x-jpa/jbi/src/main/assembly/bin.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jbi/src/main/assembly/bin.xml 2010-05-25 18:58:21 UTC (rev 668)
+++ branches/ODE/ODE-1.x-jpa/jbi/src/main/assembly/bin.xml 2010-05-26 08:21:22 UTC (rev 669)
@@ -44,12 +44,12 @@
</fileSet>
<fileSet>
- <directory>${basedir}/../dao-jpa-ojpa-derby/target/derby</directory>
+ <directory>${basedir}/../dao-jpa-db/target/ode-db</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>${basedir}/../dao-hibernate-db/target/derby</directory>
+ <directory>${basedir}/../dao-hibernate-db/target/ode-db-hib</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
Modified: branches/ODE/ODE-1.x-jpa/jbi/src/test/jbi/ode-jbi.properties
===================================================================
--- branches/ODE/ODE-1.x-jpa/jbi/src/test/jbi/ode-jbi.properties 2010-05-25 18:58:21 UTC (rev 668)
+++ branches/ODE/ODE-1.x-jpa/jbi/src/test/jbi/ode-jbi.properties 2010-05-26 08:21:22 UTC (rev 669)
@@ -62,7 +62,7 @@
# DAO Connection Factory class.
# uncomment the following for hibernate.
-ode-jbi.dao.factory=org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl
+ode-jbi.dao.factory=org.apache.ode.dao.hib.bpel.BpelDAOConnectionFactoryImpl
# Class name of the message mapper that should be used to convert message
# between ODE / NMS.
Modified: branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml 2010-05-25 18:58:21 UTC (rev 668)
+++ branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
@@ -76,8 +76,8 @@
<DynamicImport-Package>*</DynamicImport-Package>
<Include-Resource>
src/main/resources,
-@../dao-jpa-ojpa-derby/target/riftsaw-dao-jpa-ojpa-derby-${project.version}.zip,
-@../dao-hibernate-db/target/riftsaw-dao-hibernate-db-${project.version}.zip,
+@../dao-jpa-db/target/ode-db-derby-ojpa-${project.version}.zip,
+@../dao-hibernate-db/target/ode-db-derby-hib-${project.version}.zip,
</Include-Resource>
</instructions>
@@ -104,6 +104,18 @@
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-dao-jpa-db</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-dao-hib-db</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-dao-jpa</artifactId>
<version>${project.version}</version>
</dependency>
Modified: branches/ODE/ODE-1.x-jpa/jbi-bundle/src/main/resources/META-INF/persistence.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jbi-bundle/src/main/resources/META-INF/persistence.xml 2010-05-25 18:58:21 UTC (rev 668)
+++ branches/ODE/ODE-1.x-jpa/jbi-bundle/src/main/resources/META-INF/persistence.xml 2010-05-26 08:21:22 UTC (rev 669)
@@ -20,38 +20,38 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="1.0">
- <persistence-unit name="ode-dao">
+ <persistence-unit name="ode-bpel" transaction-type="JTA">
<!--
This properties file is used specifically by the
OpenJPA Enhancer.
-->
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.apache.ode.dao.jpa.ActivityRecoveryDAOImpl</class>
- <class>org.apache.ode.dao.jpa.CorrelationSetDAOImpl</class>
- <class>org.apache.ode.dao.jpa.CorrelatorDAOImpl</class>
- <class>org.apache.ode.dao.jpa.EventDAOImpl</class>
- <class>org.apache.ode.dao.jpa.FaultDAOImpl</class>
- <class>org.apache.ode.dao.jpa.MessageDAOImpl</class>
- <class>org.apache.ode.dao.jpa.MessageExchangeDAOImpl</class>
- <class>org.apache.ode.dao.jpa.MessageRouteDAOImpl</class>
- <class>org.apache.ode.dao.jpa.PartnerLinkDAOImpl</class>
- <class>org.apache.ode.dao.jpa.ProcessDAOImpl</class>
- <class>org.apache.ode.dao.jpa.ProcessInstanceDAOImpl</class>
- <class>org.apache.ode.dao.jpa.ScopeDAOImpl</class>
- <class>org.apache.ode.dao.jpa.XmlDataDAOImpl</class>
- <class>org.apache.ode.dao.jpa.CorrSetProperty</class>
- <class>org.apache.ode.dao.jpa.MexProperty</class>
- <class>org.apache.ode.dao.jpa.XmlDataProperty</class>
+ <class>org.apache.ode.dao.jpa.bpel.ActivityRecoveryDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.CorrelationSetDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.CorrelatorDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.EventDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.FaultDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.MessageDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.MessageExchangeDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.MessageRouteDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.PartnerLinkDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.ProcessDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.ProcessInstanceDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.ScopeDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.XmlDataDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.CorrSetProperty</class>
+ <class>org.apache.ode.dao.jpa.bpel.MexProperty</class>
+ <class>org.apache.ode.dao.jpa.bpel.XmlDataProperty</class>
</persistence-unit>
- <persistence-unit name="ode-store">
+ <persistence-unit name="ode-store" transaction-type="JTA">
<!--
This properties file is used specifically by the
OpenJPA Enhancer.
-->
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.apache.ode.store.jpa.ProcessConfDaoImpl</class>
- <class>org.apache.ode.store.jpa.ProcessConfPropertyDaoImpl</class>
- <class>org.apache.ode.store.jpa.DeploymentUnitDaoImpl</class>
- <class>org.apache.ode.store.jpa.VersionTrackerDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.store.ProcessConfDaoImpl</class>
+ <class>org.apache.ode.dao.jpa.store.ProcessConfPropertyDaoImpl</class>
+ <class>org.apache.ode.dao.jpa.store.DeploymentUnitDaoImpl</class>
+ <class>org.apache.ode.dao.jpa.store.VersionTrackerDAOImpl</class>
</persistence-unit>
</persistence>
Modified: branches/ODE/ODE-1.x-jpa/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/pom.xml 2010-05-25 18:58:21 UTC (rev 668)
+++ branches/ODE/ODE-1.x-jpa/pom.xml 2010-05-26 08:21:22 UTC (rev 669)
@@ -137,7 +137,7 @@
<module>jbi</module>
<module>jbi-bundle</module>
<module>jbi-karaf</module>
- <module>axis2-war</module>
+ <!--module>axis2-war</module-->
<module>distro</module>
</modules>
14 years, 1 month
- 1
- 0
riftsaw SVN: r668 - in branches/gbrown: distribution/src/main/release/db and 5 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-05-25 14:58:21 -0400 (Tue, 25 May 2010)
New Revision: 668
Added:
branches/gbrown/distribution/src/main/release/db/wsstack/
branches/gbrown/distribution/src/main/release/db/wsstack/cxf.properties
branches/gbrown/distribution/src/main/release/db/wsstack/native.properties
branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/CXFJAXWSInitializer.java
branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/JAXWSInitializer.java
Modified:
branches/gbrown/distribution/src/main/release/db/bpel.properties
branches/gbrown/distribution/src/main/release/install/build.xml
branches/gbrown/pom.xml
branches/gbrown/runtime/engine/pom.xml
branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
Log:
Support for CXF configuration of web service client endpoint, for use in ws-security.
Modified: branches/gbrown/distribution/src/main/release/db/bpel.properties
===================================================================
--- branches/gbrown/distribution/src/main/release/db/bpel.properties 2010-05-25 17:50:59 UTC (rev 667)
+++ branches/gbrown/distribution/src/main/release/db/bpel.properties 2010-05-25 18:58:21 UTC (rev 668)
@@ -105,6 +105,8 @@
# name of the clerk
bpel.uddi.clerk=BPELClerk
+bpel.jaxws.client.initializer.impl=(a)jaxws.client.initializer.impl@
+
hibernate.dialect=@dialect@
hibernate.hbm2ddl.auto=update
hibernate.current_session_context_class=jta
Added: branches/gbrown/distribution/src/main/release/db/wsstack/cxf.properties
===================================================================
--- branches/gbrown/distribution/src/main/release/db/wsstack/cxf.properties (rev 0)
+++ branches/gbrown/distribution/src/main/release/db/wsstack/cxf.properties 2010-05-25 18:58:21 UTC (rev 668)
@@ -0,0 +1 @@
+jaxws.client.initializer.impl=org.jboss.soa.bpel.runtime.ws.CXFJAXWSInitializer
Added: branches/gbrown/distribution/src/main/release/db/wsstack/native.properties
===================================================================
--- branches/gbrown/distribution/src/main/release/db/wsstack/native.properties (rev 0)
+++ branches/gbrown/distribution/src/main/release/db/wsstack/native.properties 2010-05-25 18:58:21 UTC (rev 668)
@@ -0,0 +1 @@
+jaxws.client.initializer.impl=
Modified: branches/gbrown/distribution/src/main/release/install/build.xml
===================================================================
--- branches/gbrown/distribution/src/main/release/install/build.xml 2010-05-25 17:50:59 UTC (rev 667)
+++ branches/gbrown/distribution/src/main/release/install/build.xml 2010-05-25 18:58:21 UTC (rev 668)
@@ -81,6 +81,7 @@
toFile="${deploy.dir}/${bpel-runtime}/bpel.properties"
overwrite="true">
<filterset filtersfile="../db/jdbc/${database}.properties" />
+ <filterset filtersfile="../db/wsstack/${ws.stack}.properties" />
</copy>
<copy file="../db/datasource/bpel-${database}-ds.xml"
Modified: branches/gbrown/pom.xml
===================================================================
--- branches/gbrown/pom.xml 2010-05-25 17:50:59 UTC (rev 667)
+++ branches/gbrown/pom.xml 2010-05-25 18:58:21 UTC (rev 668)
@@ -82,6 +82,7 @@
<commons.codec.version>1.3</commons.codec.version>
<xerces.version>2.9.0</xerces.version>
<commons.httpclient.version>3.1</commons.httpclient.version>
+ <cxf.version>2.2.8</cxf.version>
</properties>
<dependencyManagement>
Modified: branches/gbrown/runtime/engine/pom.xml
===================================================================
--- branches/gbrown/runtime/engine/pom.xml 2010-05-25 17:50:59 UTC (rev 667)
+++ branches/gbrown/runtime/engine/pom.xml 2010-05-25 18:58:21 UTC (rev 668)
@@ -118,6 +118,18 @@
<artifactId>riftsaw-bpel-compiler</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-core</artifactId>
+ <version>${cxf.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${cxf.version}</version>
+ <scope>provided</scope>
+ </dependency>
<!-- for H2Database -->
<dependency>
Modified: branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
===================================================================
--- branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-05-25 17:50:59 UTC (rev 667)
+++ branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-05-25 18:58:21 UTC (rev 668)
@@ -226,10 +226,12 @@
initialPartnerEndpoint.serviceName, initialPartnerEndpoint.portName,
processId, endpointId
);
+
+ ProcessConf pconf=engine._store.getProcessConfiguration(processId);
try
{
- PartnerChannel channel = endpointManager.createClient(endpointMD, wsdlDefinition, wsdlUrl);
+ PartnerChannel channel = endpointManager.createClient(endpointMD, wsdlDefinition, wsdlUrl, pconf);
return new PartnerRoleChannelImpl(channel);
}
Added: branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/CXFJAXWSInitializer.java
===================================================================
--- branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/CXFJAXWSInitializer.java (rev 0)
+++ branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/CXFJAXWSInitializer.java 2010-05-25 18:58:21 UTC (rev 668)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.soa.bpel.runtime.ws;
+
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import javax.xml.namespace.QName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+
+/**
+ * This class implements the JAXWSInitializer interface to
+ * provide Apache CXF specific initialization.
+ *
+ * @author gbrown
+ *
+ */
+public class CXFJAXWSInitializer implements JAXWSInitializer {
+
+ protected final Log log = LogFactory.getLog(getClass());
+
+ /**
+ * This method initializes the web service stack in preparation for
+ * calling the service and port supplied as parameters.
+ *
+ * @param serviceName The service name
+ * @param portName The port name
+ * @param baseURI The base URI of the deployment
+ */
+ public void initializeStack(QName serviceName, QName portName, java.net.URI baseURI) {
+ try {
+ SpringBusFactory bf = new SpringBusFactory();
+
+ URLClassLoader urlcl=new URLClassLoader(new URL[]{baseURI.toURL()});
+
+ String filename="jbossws-cxf-"+portName.getLocalPart()+".xml";
+
+ URL busFile = urlcl.getResource(filename);
+
+ log.debug("Web Stack initialization file: name="+filename+" file="+busFile);
+
+ if (busFile != null) {
+ Bus bus = bf.createBus(busFile.toString());
+ bf.setThreadDefaultBus(bus);
+
+ log.debug("Set thread default bus="+bus);
+ }
+
+ } catch(Exception e) {
+ log.error("Failed to initialize WS-Security in stack", e);
+ }
+ }
+}
Modified: branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
===================================================================
--- branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-05-25 17:50:59 UTC (rev 667)
+++ branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-05-25 18:58:21 UTC (rev 668)
@@ -24,6 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.iapi.EndpointReference;
+import org.apache.ode.bpel.iapi.ProcessConf;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.Deployment;
@@ -301,13 +302,13 @@
}
public WebServiceClient createClient(
- EndpointMetaData metaData,Definition wsdlDefinition, URL wsdlUrl)
+ EndpointMetaData metaData,Definition wsdlDefinition, URL wsdlUrl, ProcessConf pconf)
throws EndpointManagementException
{
try
{
WebServiceClient client =
- new WebServiceClient(metaData, wsdlDefinition, wsdlUrl, executionEnvironment);
+ new WebServiceClient(metaData, wsdlDefinition, wsdlUrl, executionEnvironment, pconf);
return client;
Added: branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/JAXWSInitializer.java
===================================================================
--- branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/JAXWSInitializer.java (rev 0)
+++ branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/JAXWSInitializer.java 2010-05-25 18:58:21 UTC (rev 668)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.soa.bpel.runtime.ws;
+
+import javax.xml.namespace.QName;
+
+/**
+ * This interface defines the component responsible for initializing the
+ * JAX-WS compliant web service stack. Although JAX-WS provides a standard
+ * API for communicating with external web services, it does not provide
+ * standardisation for the initialization of high layers of the web
+ * stack, e.g. related to WS-Security. Therefore, specific initialization
+ * is required on a per stack basis.
+ *
+ * @author gbrown
+ *
+ */
+public interface JAXWSInitializer {
+
+ /**
+ * This method initializes the web service stack in preparation for
+ * calling the service and port supplied as parameters.
+ *
+ * @param serviceName The service name
+ * @param portName The port name
+ * @param baseURI The base URI of the deployment
+ */
+ public void initializeStack(QName serviceName, QName portName, java.net.URI baseURI);
+
+}
Modified: branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
===================================================================
--- branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-05-25 17:50:59 UTC (rev 667)
+++ branches/gbrown/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-05-25 18:58:21 UTC (rev 668)
@@ -42,6 +42,7 @@
import org.apache.ode.bpel.iapi.Message;
import org.apache.ode.bpel.iapi.MessageExchange;
import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
+import org.apache.ode.bpel.iapi.ProcessConf;
import org.apache.ode.bpel.iapi.Scheduler;
import org.apache.ode.utils.DOMUtils;
import org.jboss.soa.bpel.runtime.engine.EndpointReference;
@@ -58,6 +59,8 @@
*/
public class WebServiceClient implements PartnerChannel
{
+ private static final String JAXWS_CLIENT_INITIALIZER = "jaxws.client.initializer.impl";
+
protected final Log log = LogFactory.getLog(getClass());
private URL wsdlUrl;
@@ -74,8 +77,10 @@
private SOAPMessageAdapter messageAdapter;
private ExecutionEnvironment executionEnvironment;
-
- public WebServiceClient(EndpointMetaData metaData, Definition wsdlDefintion, URL wsdlUrl , ExecutionEnvironment env)
+ private java.net.URI baseURI;
+
+ public WebServiceClient(EndpointMetaData metaData, Definition wsdlDefintion, URL wsdlUrl , ExecutionEnvironment env,
+ ProcessConf pconf)
{
this.executionEnvironment = env;
this.metaData = metaData;
@@ -87,7 +92,11 @@
this.port = new QName(serviceName.getNamespaceURI(), metaData.getPortName());
this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefintion, serviceName, port.getLocalPart());
- }
+
+ this.baseURI = pconf.getBaseURI();
+
+ log.debug("Web Service Client: Base URI="+pconf.getBaseURI());
+ }
public EndpointReference getEndpointReference()
{
@@ -292,6 +301,8 @@
if(null==dispatcher)
{
log.debug("Creating Dispatcher ("+this.id+") on " + wsdlUrl + ": "+serviceName);
+
+ initializeStack(portName);
Service service = Service.create(this.wsdlUrl, serviceName);
dispatcher = service.createDispatch(
@@ -303,7 +314,30 @@
return dispatcher;
}
+
+ private synchronized void initializeStack(QName portName) {
+ String impl=this.executionEnvironment.getOdeConfig().getProperty(JAXWS_CLIENT_INITIALIZER);
+ if (impl != null && impl.trim().length() > 0) {
+ JAXWSInitializer initializer=null;
+
+ try {
+ Class<?> cls=Class.forName(impl);
+
+ initializer = (JAXWSInitializer)cls.newInstance();
+
+ } catch(Exception e) {
+ log.error("Unable to obtain JAXWS Initializer class '"+impl+"'", e);
+ }
+
+ if (initializer != null) {
+ initializer.initializeStack(this.serviceName, portName, this.baseURI);
+ }
+ } else {
+ log.debug("JAXWS Client Initializer not defined");
+ }
+ }
+
public String toString()
{
return "WebServiceClient {service="+serviceName+",port="+port+"}";
14 years, 1 month
- 1
- 0
riftsaw SVN: r667 - in branches/ODE/ODE-1.x-jpa: axis2-war and 22 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-05-25 13:50:59 -0400 (Tue, 25 May 2010)
New Revision: 667
Added:
branches/ODE/ODE-1.x-jpa/axis2-war/itest_setup.groovy
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/bpel/
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessInstanceProfileDAO.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessProfileDAO.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/hib/
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessInstanceProfileDaoImpl.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessProfileDaoImpl.java
branches/ODE/ODE-1.x-jpa/dao-hibernate-db/src/main/assembly/
branches/ODE/ODE-1.x-jpa/dao-hibernate-db/src/main/assembly/bin.xml
Modified:
branches/ODE/ODE-1.x-jpa/axis2-war/pom.xml
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/HibDaoConnectionFactoryImpl.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/JpaDaoConnectionFactoryImpl.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProfilingBpelDAOConnection.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredServicesTest.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredServicesTest.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessInstanceProfileDAO.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessProfileDAO.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/ProcessInstanceProfileDAO.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/ProcessProfileDAO.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/process-sample02_standalone_policy/sample02-policy-for-service.xml
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/webapp/WEB-INF/conf.hib-derby/ode-axis2.properties
branches/ODE/ODE-1.x-jpa/axis2-war/src/test/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties
branches/ODE/ODE-1.x-jpa/axis2/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
branches/ODE/ODE-1.x-jpa/bpel-schemas/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java
branches/ODE/ODE-1.x-jpa/bpel-test/src/test/java/org/apache/ode/test/ExternalVariableTest.java
branches/ODE/ODE-1.x-jpa/dao-hibernate-db/build.xml
branches/ODE/ODE-1.x-jpa/dao-hibernate-db/pom.xml
branches/ODE/ODE-1.x-jpa/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/BpelDAOConnectionFactoryImpl.java
Log:
* commit the axis2-war compliation error fix.
Modified: branches/ODE/ODE-1.x-jpa/axis2/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2/pom.xml 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2/pom.xml 2010-05-25 17:50:59 UTC (rev 667)
@@ -123,6 +123,22 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>wsdl</classifier>
+ <classesDirectory>src/main/wsdl</classesDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Added: branches/ODE/ODE-1.x-jpa/axis2-war/itest_setup.groovy
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/itest_setup.groovy (rev 0)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/itest_setup.groovy 2010-05-25 17:50:59 UTC (rev 667)
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File
+
+def warname = project.build.directory+"/"+project.build.finalName+".war";
+def webapp = project.build.directory + "/webapp";
+def testresources = new File(project.basedir, 'src/test/webapp')
+
+log.info('-----Performing pre-integration test tasks-----');
+log.info('extracting the axis2 war');
+ant.unwar(src: warname , dest: webapp )
+log.info('copying over the test webapp resources');
+ant.copy(todir: webapp) {
+ fileset(dir: testresources) {
+ include(name: '**')
+ }
+}
+//This was in buildr, don't know if it is needed
+//copy target/test-classes/TestEndpointProperties/*_global_conf*.endpoint to webapp/WEB-INF/conf
+
+prepare_secure_services_tests (new File(project.build.testOutputDirectory,'TestRampartBasic/secured-services'),~/sample\d+\.axis2/);
+prepare_secure_services_tests (new File(project.build.testOutputDirectory,'TestRampartPolicy/secured-services'),~/sample\d+\-policy\.xml/);
+prepare_secure_processes_tests (new File(project.build.testOutputDirectory,'TestRampartBasic/secured-processes'));
+prepare_secure_processes_tests (new File(project.build.testOutputDirectory,'TestRampartPolicy/secured-processes'));
+
+def prepare_secure_processes_tests(test_dir) {
+ log.info('preparing the secure process tests in ' + test_dir);
+ def p = ~/sample\d+\-service\.xml/;
+ test_dir.eachFileMatch(p) { service_file ->
+ def sample_name = service_file.getName().split('-')[0];
+ def proc_dir = test_dir.getAbsolutePath() +'/process-' + sample_name;
+ ant.copy(todir: proc_dir) {
+ fileset(dir: test_dir.getAbsolutePath()+'/process-template') {
+ include(name: '**')
+ }
+ }
+ ant.copy(file: service_file, tofile: proc_dir + '/HelloService.axis2');
+ }
+}
+
+def prepare_secure_services_tests(test_dir, file_pattern){
+ log.info('preparing the secure services tests with pattern '+file_pattern+' in ' + test_dir);
+ test_dir.eachFileMatch(file_pattern) { config_file ->
+ def sample_name = config_file.getName().split("\\.")[0];
+ def proc_dir = test_dir.getAbsolutePath() +'/process-' + sample_name;
+ ant.filterset(id: sample_name+'_filter', begintoken: '{', endtoken: '}'){
+ filter(token: 'sample.namespace', value: 'http://'+ sample_name.replaceAll('-','.')+'.samples.rampart.apache.org');
+ filter(token: 'sample.service.name', value: sample_name);
+ }
+ ant.copy(todir: proc_dir) {
+ fileset(dir: test_dir.getAbsolutePath()+'/process-template') {
+ include(name: '**')
+ }
+ filterset(refid: sample_name+'_filter');
+ }
+ ant.copy(todir: proc_dir, file: config_file){
+ filterset(refid: sample_name+'_filter');
+ }
+ }
+ }
\ No newline at end of file
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/pom.xml 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/pom.xml 2010-05-25 17:50:59 UTC (rev 667)
@@ -32,9 +32,7 @@
</parent>
<properties>
- <rampart.version>1.4</rampart.version>
<mex.version>1.41</mex.version>
- <axis2.version>1.4.1</axis2.version>
<jibx.version>1.1.5</jibx.version>
<tranql.version>1.1</tranql.version>
<opensaml.version>1.1</opensaml.version>
@@ -42,6 +40,7 @@
<geronimo-spec-jms.version>1.1-rc4</geronimo-spec-jms.version>
<jetty.version>6.1.3</jetty.version>
<testng.version>5.8</testng.version>
+ <rampart.version>1.4</rampart.version>
</properties>
<dependencies>
@@ -83,17 +82,34 @@
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-bpel-schemas</artifactId>
+ <version>${project.version}</version>
+ <classifier>xsd</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-utils</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-dao-jpa</artifactId>
+ <classifier>openjpa</classifier>
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-dao-jpa-ojpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-axis2</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-axis2</artifactId>
+ <classifier>wsdl</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-corba</artifactId>
<version>${axis2.version}</version>
@@ -148,9 +164,25 @@
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-dao-jpa-db</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-dao-hib-db</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
<groupId>org.jibx</groupId>
<artifactId>jibx-run</artifactId>
<version>${jibx.version}</version>
@@ -214,120 +246,146 @@
<version>${mex.version}</version>
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>${testng.version}</version>
+ <classifier>jdk15</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api-2.5</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
- </dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-dao-hibernate</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>war-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>riftsaw-axis2-war-${project.version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!--plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.10</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <stopKey>foo</stopKey>
- <stopPort>9999</stopPort>
- <webApp>${basedir}/target/riftsaw-axis2-war-${project.version}.war</webApp>
- </configuration>
- <executions>
- <execution>
- <id>start-jetty</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>war-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>riftsaw-axis2-war-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compiler-it</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>run-war</goal>
+ <goal>testCompile</goal>
</goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>resources-it</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>testResources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!--doclet does not support not-found="ignore" -->
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-itests</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
<configuration>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- <daemon>true</daemon>
+ <source>${pom.basedir}/itest_setup.groovy</source>
</configuration>
- </execution>
- <execution>
- <id>stop-jetty</id>
- <phase>post-integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-axis2-web</id>
+ <phase>integration-test</phase>
<goals>
- <goal>stop</goal>
+ <goal>test</goal>
</goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>compiler-it</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
- <!-- FIXME: temporary commented out -->
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- <include>**/Test.java</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <id>test-axis2-web</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <configuration>
+ <forkMode>always</forkMode>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${project.build.directory}</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bpel-tests</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-bpel-test</artifactId>
+ <classifier>tests</classifier>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -21,10 +21,14 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.deployment.DeploymentConstants;
+import org.apache.axis2.deployment.FileSystemConfigurator;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.engine.AxisConfigurator;
import org.apache.axis2.engine.AxisServer;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.commons.logging.Log;
@@ -70,6 +74,7 @@
protected ODEAxis2Server server;
protected String config;
+ protected String odeRootAbsolutePath;
protected static final String DO_NOT_OVERRIDE_CONFIG = "<DO_NOT_OVERRIDE_CONFIG>";
@@ -153,7 +158,7 @@
}
public void startServer(String axis2RepoDir, String axis2ConfLocation) throws Exception {
- String odeRootAbsolutePath = getClass().getClassLoader().getResource("webapp/WEB-INF").getFile();
+ odeRootAbsolutePath = getClass().getClassLoader().getResource("webapp/WEB-INF").getFile();
String axis2RepoAbsolutePath = getClass().getClassLoader().getResource(axis2RepoDir).getFile();
String axis2ConfAbsolutePath = axis2ConfLocation == null ? null : getClass().getClassLoader().getResource(axis2ConfLocation).getFile();
server = new ODEAxis2Server(odeRootAbsolutePath, axis2RepoAbsolutePath, axis2ConfAbsolutePath);
@@ -344,4 +349,19 @@
return _ode;
}
}
+
+ public static class TestConfigurator extends FileSystemConfigurator implements AxisConfigurator {
+
+ String _serviceDir;
+
+ public TestConfigurator(String webRoot, String serviceDir, String axis2xml) throws AxisFault {
+ super(webRoot,axis2xml);
+ _serviceDir=serviceDir;
+ }
+
+ public synchronized AxisConfiguration getAxisConfiguration() throws AxisFault {
+ servicesPath = _serviceDir + File.separator + DeploymentConstants.SERVICE_PATH;
+ return super.getAxisConfiguration();
+ }
+ }
}
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -19,8 +19,8 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
public class CleanFailureHibTest extends CleanFailureTest {
@Override
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -20,8 +20,8 @@
package org.apache.ode.axis2.instancecleanup;
import org.apache.ode.axis2.DummyService;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.testng.annotations.Test;
public class CleanFailureTest extends CleanTestBase {
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -19,7 +19,7 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
public class CleanFaultHibTest extends CleanFaultTest {
@Override
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -22,8 +22,8 @@
import static org.testng.AssertJUnit.fail;
import org.apache.ode.axis2.DummyService;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.apache.ode.bpel.iapi.ContextException;
import org.testng.annotations.Test;
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -19,7 +19,7 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
public class CleanSuccessHibTest extends CleanSuccessTest {
@Override
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -19,8 +19,8 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.apache.ode.bpel.iapi.ContextException;
import org.testng.annotations.Test;
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -27,10 +27,10 @@
import org.apache.ode.axis2.Axis2TestBase;
import org.apache.ode.axis2.ODEConfigDirAware;
import org.apache.ode.axis2.ODEConfigProperties;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceProfileDAO;
-import org.apache.ode.bpel.dao.ProcessProfileDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceProfileDAO;
+import org.apache.ode.dao.bpel.ProcessProfileDAO;
import org.apache.ode.il.EmbeddedGeronimoFactory;
import org.apache.ode.il.dbutil.Database;
import org.testng.annotations.AfterMethod;
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/HibDaoConnectionFactoryImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/HibDaoConnectionFactoryImpl.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/HibDaoConnectionFactoryImpl.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -19,25 +19,29 @@
package org.apache.ode.axis2.instancecleanup;
+import java.util.Collection;
+import java.util.Map;
import java.util.Properties;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
-import org.apache.ode.bpel.dao.BpelDAOConnection;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceProfileDAO;
-import org.apache.ode.bpel.dao.ProcessProfileDAO;
-import org.apache.ode.daohib.SessionManager;
-import org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl;
-import org.apache.ode.daohib.bpel.BpelDAOConnectionImpl;
-import org.apache.ode.daohib.bpel.ProcessDaoImpl;
-import org.apache.ode.daohib.bpel.ProcessInstanceDaoImpl;
-import org.apache.ode.daohib.bpel.ProcessInstanceProfileDaoImpl;
-import org.apache.ode.daohib.bpel.ProcessProfileDaoImpl;
-import org.apache.ode.daohib.bpel.hobj.HProcess;
-import org.apache.ode.daohib.bpel.hobj.HProcessInstance;
+import org.apache.ode.dao.bpel.CorrelationSetDAO;
+import org.apache.ode.bpel.evt.BpelEvent;
+import org.apache.ode.dao.bpel.BpelDAOConnection;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceProfileDAO;
+import org.apache.ode.dao.bpel.ProcessProfileDAO;
+import org.apache.ode.dao.hib.SessionManager;
+import org.apache.ode.dao.hib.bpel.BpelDAOConnectionFactoryImpl;
+import org.apache.ode.dao.hib.bpel.BpelDAOConnectionImpl;
+import org.apache.ode.dao.hib.bpel.ProcessDaoImpl;
+import org.apache.ode.dao.hib.bpel.ProcessInstanceDaoImpl;
+import org.apache.ode.dao.hib.bpel.ProcessInstanceProfileDaoImpl;
+import org.apache.ode.dao.hib.bpel.ProcessProfileDaoImpl;
+import org.apache.ode.dao.hib.bpel.hobj.HProcess;
+import org.apache.ode.dao.hib.bpel.hobj.HProcessInstance;
import org.hibernate.MappingException;
import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
@@ -51,17 +55,13 @@
private static ProcessDaoImpl process;
@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;
+ public void init(Properties initialProps, TransactionManager mgr, Object env) {
+ _ds = (DataSource) env;
+ _txm = mgr;
+ Configuration conf = SessionManager.getDefaultConfiguration();
+ conf.setListener("post-insert", HibDaoConnectionFactoryImpl.this);
+ _sessionManager = setupSessionManager(conf, initialProps, _txm, _ds);
+ _staticSessionManager = _sessionManager;
}
public BpelDAOConnection getConnection() {
@@ -89,7 +89,7 @@
}
public static class ProfilingBpelDAOConnectionImpl extends BpelDAOConnectionImpl implements ProfilingBpelDAOConnection {
- ProfilingBpelDAOConnectionImpl(SessionManager sm) {
+ public ProfilingBpelDAOConnectionImpl(SessionManager sm) {
super(sm);
}
@@ -100,5 +100,6 @@
public ProcessInstanceProfileDAO createProcessInstanceProfile(ProcessInstanceDAO instance) {
return new ProcessInstanceProfileDaoImpl(_sm, (ProcessInstanceDaoImpl)instance);
}
+
}
}
\ No newline at end of file
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/JpaDaoConnectionFactoryImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/JpaDaoConnectionFactoryImpl.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/JpaDaoConnectionFactoryImpl.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -20,24 +20,25 @@
package org.apache.ode.axis2.instancecleanup;
import java.util.Properties;
-
import javax.persistence.EntityManager;
+import javax.transaction.TransactionManager;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceProfileDAO;
-import org.apache.ode.bpel.dao.ProcessProfileDAO;
-import org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl;
-import org.apache.ode.dao.jpa.BPELDAOConnectionImpl;
-import org.apache.ode.dao.jpa.ProcessDAOImpl;
-import org.apache.ode.dao.jpa.ProcessInstanceDAOImpl;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceProfileDAO;
+import org.apache.ode.dao.bpel.ProcessProfileDAO;
+import org.apache.ode.dao.jpa.JpaOperator;
+import org.apache.ode.dao.jpa.openjpa.BpelDAOConnectionFactoryImpl;
+import org.apache.ode.dao.jpa.bpel.BpelDAOConnectionImpl;
+import org.apache.ode.dao.jpa.bpel.ProcessDAOImpl;
+import org.apache.ode.dao.jpa.bpel.ProcessInstanceDAOImpl;
import org.apache.ode.dao.jpa.ProcessInstanceProfileDAOImpl;
import org.apache.ode.dao.jpa.ProcessProfileDAOImpl;
import org.apache.openjpa.event.LifecycleEvent;
import org.apache.openjpa.event.PersistListener;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
-public class JpaDaoConnectionFactoryImpl extends BPELDAOConnectionFactoryImpl implements PersistListener {
+public class JpaDaoConnectionFactoryImpl extends BpelDAOConnectionFactoryImpl implements PersistListener {
private static ProcessInstanceDAO instance;
private static ProcessDAO process;
@@ -50,16 +51,16 @@
}
@Override
- public void init(Properties properties) {
- super.init(properties);
+ public void init(Properties properties, TransactionManager mgr, Object env) {
+ super.init(properties,mgr,env);
if( _emf instanceof OpenJPAEntityManagerFactorySPI ) {
((OpenJPAEntityManagerFactorySPI)_emf).addLifecycleListener(this, ProcessInstanceDAOImpl.class, ProcessDAOImpl.class);
}
}
@Override
- protected BPELDAOConnectionImpl createBPELDAOConnection(EntityManager em) {
- return new ProfilingBPELDAOConnectionImpl(em);
+ protected BpelDAOConnectionImpl createBPELDAOConnection(EntityManager em, TransactionManager mgr, JpaOperator operator) {
+ return new ProfilingBPELDAOConnectionImpl(em, mgr, operator);
}
public void afterPersist(LifecycleEvent event) {
@@ -73,9 +74,9 @@
public void beforePersist(LifecycleEvent event) {
}
- public static class ProfilingBPELDAOConnectionImpl extends BPELDAOConnectionImpl implements ProfilingBpelDAOConnection {
- public ProfilingBPELDAOConnectionImpl(EntityManager em) {
- super(em);
+ public static class ProfilingBPELDAOConnectionImpl extends BpelDAOConnectionImpl implements ProfilingBpelDAOConnection {
+ public ProfilingBPELDAOConnectionImpl(EntityManager em, TransactionManager mgr, JpaOperator operator) {
+ super(em, mgr, operator);
}
public ProcessProfileDAO createProcessProfile(ProcessDAO process) {
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -1,7 +1,7 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.testng.annotations.Test;
public class ProcessCronCleanupTest extends CleanTestBase {
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProfilingBpelDAOConnection.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProfilingBpelDAOConnection.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProfilingBpelDAOConnection.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -19,11 +19,11 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.bpel.dao.BpelDAOConnection;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceProfileDAO;
-import org.apache.ode.bpel.dao.ProcessProfileDAO;
+import org.apache.ode.dao.bpel.BpelDAOConnection;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceProfileDAO;
+import org.apache.ode.dao.bpel.ProcessProfileDAO;
public interface ProfilingBpelDAOConnection extends BpelDAOConnection {
ProcessProfileDAO createProcessProfile(ProcessDAO instance);
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -1,8 +1,8 @@
package org.apache.ode.axis2.instancecleanup;
import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.apache.ode.bpel.engine.cron.SystemSchedulesConfig;
import org.testng.annotations.AfterClass;
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -81,7 +81,7 @@
notSoLongAgo.add(Calendar.MINUTE, -2);
String notSoLongAgoStr = xsdDF.format(notSoLongAgo.getTime());
listRoot = _client.buildMessage("listInstances", new String[] {"filter", "order", "limit"},
- new String[] {"name=DynPartnerResponder namespace=http://ode/bpel/responder " +
+ new String[] {"name=DynPartnerMain namespace=http://ode/bpel/unit-test " +
"started>=" + notSoLongAgoStr, "", "10"});
result = sendToIM(listRoot);
assertTrue(instanceNb(result) == 0);
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -44,6 +44,7 @@
*
*
*/
+@Test(suiteName="SecuredProcessesTest-Basic")
public class SecuredProcessesTest extends Axis2TestBase {
private String testDir = "TestRampartBasic/secured-processes";
@@ -86,7 +87,7 @@
}
server.deployProcess(bundleName);
try {
- ConfigurationContext ctx = ConfigurationContextFactory.createConfigurationContextFromFileSystem(clientRepo, clientConfigFile);
+ ConfigurationContext ctx = ConfigurationContextFactory.createConfigurationContext(new TestConfigurator(odeRootAbsolutePath,clientRepo, clientConfigFile));
ServiceClient client = new ServiceClient(ctx, null);
Options options = new Options();
options.setTo(new EndpointReference("http://localhost:"+getTestPort(0)+"/processes/helloWorld"));
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredServicesTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredServicesTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredServicesTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -37,6 +37,7 @@
*
*
*/
+@Test(suiteName="SecuredServicesTest-Policy")
public class SecuredServicesTest extends Axis2TestBase {
private String testDir= "TestRampartBasic/secured-services";
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -48,6 +48,7 @@
*
*
*/
+@Test(suiteName="SecuredProcessesTest-Policy")
public class SecuredProcessesTest extends Axis2TestBase {
private String testDir = "TestRampartPolicy/secured-processes";
@@ -58,7 +59,7 @@
public Object[][] testPolicySamples() throws Exception {
File[] samples = new File(getClass().getClassLoader().getResource(testDir).getFile()).listFiles(new FileFilter() {
public boolean accept(File pathname) {
- return pathname.isDirectory() && pathname.getName().matches("process-sample\\d*");
+ return pathname.isDirectory() && pathname.getName().matches("process-sample\\d+");
}
});
Object[][] bundles = new Object[samples.length][];
@@ -91,7 +92,7 @@
}
server.deployProcess(bundleName);
try {
- ConfigurationContext ctx = ConfigurationContextFactory.createConfigurationContextFromFileSystem(clientRepo, null);
+ ConfigurationContext ctx = ConfigurationContextFactory.createConfigurationContext(new TestConfigurator(odeRootAbsolutePath,clientRepo, null));
ServiceClient client = new ServiceClient(ctx, null);
Options options = new Options();
// Rampart SymetricBinding (sample04) blows up if not provided with a soap action
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredServicesTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredServicesTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredServicesTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -33,6 +33,7 @@
*
*
*/
+@Test(suiteName="SecuredServicesTest-Policy")
public class SecuredServicesTest extends Axis2TestBase {
private String testDir = "TestRampartPolicy/secured-services";
@@ -41,7 +42,7 @@
public Object[][] testPolicySamples() throws Exception {
File[] policies = new File(getClass().getClassLoader().getResource(testDir).getFile()).listFiles(new FileFilter() {
public boolean accept(File pathname) {
- return pathname.isDirectory() && pathname.getName().matches("process-sample\\d*\\-policy");
+ return pathname.isDirectory() && pathname.getName().matches("process-sample\\d+\\-policy");
}
});
Object[][] bundles = new Object[policies.length][];
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessInstanceProfileDAO.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessInstanceProfileDAO.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessInstanceProfileDAO.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.ode.bpel.dao;
-
-import java.util.List;
-
-public interface ProcessInstanceProfileDAO extends ProcessProfileDAO {
- ProcessDAO getProcess();
-
- List<ActivityRecoveryDAO> findActivityRecoveriesByInstance();
-
- List<CorrelationSetDAO> findCorrelationSetsByInstance();
-
- List<FaultDAO> findFaultsByInstance();
-
- List<MessageDAO> findMessagesByInstance();
-
- List<MessageExchangeDAO> findMessageExchangesByInstance();
-
- List<MessageRouteDAO> findMessageRoutesByInstance();
-
- List<PartnerLinkDAO> findPartnerLinksByInstance();
-
- List<ScopeDAO> findScopesByInstance();
-
- List<XmlDataDAO> findXmlDataByInstance();
-
- int countEventsByInstance();
-}
\ No newline at end of file
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessProfileDAO.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessProfileDAO.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessProfileDAO.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.ode.bpel.dao;
-
-import java.util.List;
-
-public interface ProcessProfileDAO {
- boolean doesProcessExist();
-
- List<ProcessInstanceDAO> findInstancesByProcess();
-
- List<ActivityRecoveryDAO> findActivityRecoveriesByProcess();
-
- List<CorrelationSetDAO> findCorrelationSetsByProcess();
-
- List<CorrelatorDAO> findCorrelatorsByProcess();
-
- List<FaultDAO> findFaultsByProcess();
-
- List<MessageDAO> findMessagesByProcess();
-
- List<MessageExchangeDAO> findMessageExchangesByProcess();
-
- List<MessageRouteDAO> findMessageRoutesByProcess();
-
- List<PartnerLinkDAO> findPartnerLinksByProcess();
-
- List<ScopeDAO> findScopesByProcess();
-
- List<XmlDataDAO> findXmlDataByProcess();
-
- int countEventsByProcess();
-}
\ No newline at end of file
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/ProcessInstanceProfileDAO.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/ProcessInstanceProfileDAO.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/ProcessInstanceProfileDAO.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/ProcessProfileDAO.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/ProcessProfileDAO.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/ProcessProfileDAO.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
Added: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessInstanceProfileDAO.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessInstanceProfileDAO.java (rev 0)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessInstanceProfileDAO.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ode.dao.bpel;
+
+import java.util.List;
+
+import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
+import org.apache.ode.dao.bpel.CorrelationSetDAO;
+import org.apache.ode.dao.bpel.FaultDAO;
+import org.apache.ode.dao.bpel.MessageDAO;
+import org.apache.ode.dao.bpel.MessageExchangeDAO;
+import org.apache.ode.dao.bpel.MessageRouteDAO;
+import org.apache.ode.dao.bpel.PartnerLinkDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.dao.bpel.XmlDataDAO;
+
+public interface ProcessInstanceProfileDAO extends ProcessProfileDAO {
+ ProcessDAO getProcess();
+
+ List<ActivityRecoveryDAO> findActivityRecoveriesByInstance();
+
+ List<CorrelationSetDAO> findCorrelationSetsByInstance();
+
+ List<FaultDAO> findFaultsByInstance();
+
+ List<MessageDAO> findMessagesByInstance();
+
+ List<MessageExchangeDAO> findMessageExchangesByInstance();
+
+ List<MessageRouteDAO> findMessageRoutesByInstance();
+
+ List<PartnerLinkDAO> findPartnerLinksByInstance();
+
+ List<ScopeDAO> findScopesByInstance();
+
+ List<XmlDataDAO> findXmlDataByInstance();
+
+ int countEventsByInstance();
+}
\ No newline at end of file
Added: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessProfileDAO.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessProfileDAO.java (rev 0)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessProfileDAO.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ode.dao.bpel;
+
+import java.util.List;
+
+import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
+import org.apache.ode.dao.bpel.CorrelationSetDAO;
+import org.apache.ode.dao.bpel.CorrelatorDAO;
+import org.apache.ode.dao.bpel.FaultDAO;
+import org.apache.ode.dao.bpel.MessageDAO;
+import org.apache.ode.dao.bpel.MessageExchangeDAO;
+import org.apache.ode.dao.bpel.MessageRouteDAO;
+import org.apache.ode.dao.bpel.PartnerLinkDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.dao.bpel.XmlDataDAO;
+
+public interface ProcessProfileDAO {
+ boolean doesProcessExist();
+
+ List<ProcessInstanceDAO> findInstancesByProcess();
+
+ List<ActivityRecoveryDAO> findActivityRecoveriesByProcess();
+
+ List<CorrelationSetDAO> findCorrelationSetsByProcess();
+
+ List<CorrelatorDAO> findCorrelatorsByProcess();
+
+ List<FaultDAO> findFaultsByProcess();
+
+ List<MessageDAO> findMessagesByProcess();
+
+ List<MessageExchangeDAO> findMessageExchangesByProcess();
+
+ List<MessageRouteDAO> findMessageRoutesByProcess();
+
+ List<PartnerLinkDAO> findPartnerLinksByProcess();
+
+ List<ScopeDAO> findScopesByProcess();
+
+ List<XmlDataDAO> findXmlDataByProcess();
+
+ int countEventsByProcess();
+}
\ No newline at end of file
Added: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessInstanceProfileDaoImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessInstanceProfileDaoImpl.java (rev 0)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessInstanceProfileDaoImpl.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ode.dao.hib.bpel;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
+import org.apache.ode.dao.bpel.CorrelationSetDAO;
+import org.apache.ode.dao.bpel.FaultDAO;
+import org.apache.ode.dao.bpel.MessageDAO;
+import org.apache.ode.dao.bpel.MessageExchangeDAO;
+import org.apache.ode.dao.bpel.MessageRouteDAO;
+import org.apache.ode.dao.bpel.PartnerLinkDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.dao.bpel.XmlDataDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceProfileDAO;
+import org.apache.ode.dao.hib.SessionManager;
+import org.apache.ode.dao.hib.bpel.hobj.HActivityRecovery;
+import org.apache.ode.dao.hib.bpel.hobj.HCorrelationSet;
+import org.apache.ode.dao.hib.bpel.hobj.HCorrelatorSelector;
+import org.apache.ode.dao.hib.bpel.hobj.HFaultData;
+import org.apache.ode.dao.hib.bpel.hobj.HMessage;
+import org.apache.ode.dao.hib.bpel.hobj.HMessageExchange;
+import org.apache.ode.dao.hib.bpel.hobj.HPartnerLink;
+import org.apache.ode.dao.hib.bpel.hobj.HScope;
+import org.apache.ode.dao.hib.bpel.hobj.HXmlData;
+import org.hibernate.Query;
+
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 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;
+
+ public ProcessInstanceProfileDaoImpl(SessionManager sm, ProcessInstanceDaoImpl instance) {
+ super(sm, (ProcessDaoImpl)instance.getProcess());
+ entering("ProcessInstanceProfileDaoImpl.ProcessInstanceProfileDaoImpl");
+ this.instance = instance;
+ }
+
+ public SessionManager getSessionManager() {
+ return _sm;
+ }
+
+ public ProcessDAO getProcess() {
+ 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<ActivityRecoveryDAO> findActivityRecoveriesByInstance() {
+ 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);
+ }
+
+ 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);
+ }
+
+ 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();
+ }
+
+ @SuppressWarnings("unchecked")
+ protected <D, H> List<D> findByInstance(String queryString, Class daoClass, Class hibClass) {
+ 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);
+ }
+
+ return results;
+ }
+}
\ No newline at end of file
Added: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessProfileDaoImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessProfileDaoImpl.java (rev 0)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessProfileDaoImpl.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -0,0 +1,156 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ode.dao.hib.bpel;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
+import org.apache.ode.dao.bpel.CorrelationSetDAO;
+import org.apache.ode.dao.bpel.CorrelatorDAO;
+import org.apache.ode.dao.bpel.FaultDAO;
+import org.apache.ode.dao.bpel.MessageDAO;
+import org.apache.ode.dao.bpel.MessageExchangeDAO;
+import org.apache.ode.dao.bpel.MessageRouteDAO;
+import org.apache.ode.dao.bpel.PartnerLinkDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.dao.bpel.XmlDataDAO;
+import org.apache.ode.dao.bpel.ProcessProfileDAO;
+import org.apache.ode.dao.hib.SessionManager;
+import org.apache.ode.dao.hib.bpel.hobj.HActivityRecovery;
+import org.apache.ode.dao.hib.bpel.hobj.HCorrelationSet;
+import org.apache.ode.dao.hib.bpel.hobj.HCorrelator;
+import org.apache.ode.dao.hib.bpel.hobj.HCorrelatorSelector;
+import org.apache.ode.dao.hib.bpel.hobj.HFaultData;
+import org.apache.ode.dao.hib.bpel.hobj.HMessage;
+import org.apache.ode.dao.hib.bpel.hobj.HMessageExchange;
+import org.apache.ode.dao.hib.bpel.hobj.HPartnerLink;
+import org.apache.ode.dao.hib.bpel.hobj.HProcess;
+import org.apache.ode.dao.hib.bpel.hobj.HProcessInstance;
+import org.apache.ode.dao.hib.bpel.hobj.HScope;
+import org.apache.ode.dao.hib.bpel.hobj.HXmlData;
+import org.hibernate.Query;
+
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 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;
+
+ public ProcessProfileDaoImpl(SessionManager sm, ProcessDaoImpl process) {
+ super(sm, process._hobj);
+ entering("ProcessProfileDaoImpl.ProcessProfileDaoImpl");
+ this.process = process;
+ }
+
+ public SessionManager getSessionManager() {
+ 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);
+ }
+
+ public List<ActivityRecoveryDAO> findActivityRecoveriesByProcess() {
+ 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);
+ }
+
+ public List<CorrelatorDAO> findCorrelatorsByProcess() {
+ 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);
+ }
+
+ public int countEventsByProcess() {
+ 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();
+ }
+
+ @SuppressWarnings("unchecked")
+ 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);
+ }
+
+ return results;
+ }
+}
\ No newline at end of file
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -21,17 +21,19 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
-import org.apache.ode.bpel.dao.CorrelationSetDAO;
-import org.apache.ode.bpel.dao.FaultDAO;
-import org.apache.ode.bpel.dao.MessageDAO;
-import org.apache.ode.bpel.dao.MessageExchangeDAO;
-import org.apache.ode.bpel.dao.MessageRouteDAO;
-import org.apache.ode.bpel.dao.PartnerLinkDAO;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceProfileDAO;
-import org.apache.ode.bpel.dao.ScopeDAO;
-import org.apache.ode.bpel.dao.XmlDataDAO;
+import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
+import org.apache.ode.dao.bpel.CorrelationSetDAO;
+import org.apache.ode.dao.bpel.FaultDAO;
+import org.apache.ode.dao.bpel.MessageDAO;
+import org.apache.ode.dao.bpel.MessageExchangeDAO;
+import org.apache.ode.dao.bpel.MessageRouteDAO;
+import org.apache.ode.dao.bpel.PartnerLinkDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.dao.bpel.XmlDataDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceProfileDAO;
+import org.apache.ode.dao.jpa.bpel.ProcessDAOImpl;
+import org.apache.ode.dao.jpa.bpel.ProcessInstanceDAOImpl;
import java.util.List;
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -23,18 +23,19 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
-import org.apache.ode.bpel.dao.CorrelationSetDAO;
-import org.apache.ode.bpel.dao.CorrelatorDAO;
-import org.apache.ode.bpel.dao.FaultDAO;
-import org.apache.ode.bpel.dao.MessageDAO;
-import org.apache.ode.bpel.dao.MessageExchangeDAO;
-import org.apache.ode.bpel.dao.MessageRouteDAO;
-import org.apache.ode.bpel.dao.PartnerLinkDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
-import org.apache.ode.bpel.dao.ProcessProfileDAO;
-import org.apache.ode.bpel.dao.ScopeDAO;
-import org.apache.ode.bpel.dao.XmlDataDAO;
+import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
+import org.apache.ode.dao.bpel.CorrelationSetDAO;
+import org.apache.ode.dao.bpel.CorrelatorDAO;
+import org.apache.ode.dao.bpel.FaultDAO;
+import org.apache.ode.dao.bpel.MessageDAO;
+import org.apache.ode.dao.bpel.MessageExchangeDAO;
+import org.apache.ode.dao.bpel.MessageRouteDAO;
+import org.apache.ode.dao.bpel.PartnerLinkDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.dao.bpel.XmlDataDAO;
+import org.apache.ode.dao.bpel.ProcessProfileDAO;
+import org.apache.ode.dao.jpa.bpel.ProcessDAOImpl;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -42,7 +43,7 @@
/**
* OpenJPA based {@link ProcessProfileDAO} implementation
*/
-public class ProcessProfileDAOImpl extends OpenJPADAO implements ProcessProfileDAO {
+public class ProcessProfileDAOImpl implements ProcessProfileDAO {
@SuppressWarnings("unused")
private static final Log __log = LogFactory.getLog(ProcessProfileDAOImpl.class);
@@ -50,6 +51,7 @@
protected ProcessDAOImpl process;
public ProcessProfileDAOImpl(EntityManager em, ProcessDAOImpl process) {
+ assert process != null;
this.process = process;
this.em = em;
}
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.ode.daohib.bpel;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
-import org.apache.ode.bpel.dao.CorrelationSetDAO;
-import org.apache.ode.bpel.dao.FaultDAO;
-import org.apache.ode.bpel.dao.MessageDAO;
-import org.apache.ode.bpel.dao.MessageExchangeDAO;
-import org.apache.ode.bpel.dao.MessageRouteDAO;
-import org.apache.ode.bpel.dao.PartnerLinkDAO;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceProfileDAO;
-import org.apache.ode.bpel.dao.ScopeDAO;
-import org.apache.ode.bpel.dao.XmlDataDAO;
-import org.apache.ode.daohib.SessionManager;
-import org.apache.ode.daohib.bpel.hobj.HActivityRecovery;
-import org.apache.ode.daohib.bpel.hobj.HCorrelationSet;
-import org.apache.ode.daohib.bpel.hobj.HCorrelatorSelector;
-import org.apache.ode.daohib.bpel.hobj.HFaultData;
-import org.apache.ode.daohib.bpel.hobj.HMessage;
-import org.apache.ode.daohib.bpel.hobj.HMessageExchange;
-import org.apache.ode.daohib.bpel.hobj.HPartnerLink;
-import org.apache.ode.daohib.bpel.hobj.HScope;
-import org.apache.ode.daohib.bpel.hobj.HXmlData;
-import org.hibernate.Query;
-
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 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;
-
- public ProcessInstanceProfileDaoImpl(SessionManager sm, ProcessInstanceDaoImpl instance) {
- super(sm, (ProcessDaoImpl)instance.getProcess());
- entering("ProcessInstanceProfileDaoImpl.ProcessInstanceProfileDaoImpl");
- this.instance = instance;
- }
-
- public SessionManager getSessionManager() {
- return _sm;
- }
-
- public ProcessDAO getProcess() {
- 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<ActivityRecoveryDAO> findActivityRecoveriesByInstance() {
- 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);
- }
-
- 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);
- }
-
- 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();
- }
-
- @SuppressWarnings("unchecked")
- protected <D, H> List<D> findByInstance(String queryString, Class daoClass, Class hibClass) {
- 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);
- }
-
- return results;
- }
-}
\ No newline at end of file
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.ode.daohib.bpel;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
-import org.apache.ode.bpel.dao.CorrelationSetDAO;
-import org.apache.ode.bpel.dao.CorrelatorDAO;
-import org.apache.ode.bpel.dao.FaultDAO;
-import org.apache.ode.bpel.dao.MessageDAO;
-import org.apache.ode.bpel.dao.MessageExchangeDAO;
-import org.apache.ode.bpel.dao.MessageRouteDAO;
-import org.apache.ode.bpel.dao.PartnerLinkDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
-import org.apache.ode.bpel.dao.ProcessProfileDAO;
-import org.apache.ode.bpel.dao.ScopeDAO;
-import org.apache.ode.bpel.dao.XmlDataDAO;
-import org.apache.ode.daohib.SessionManager;
-import org.apache.ode.daohib.bpel.hobj.HActivityRecovery;
-import org.apache.ode.daohib.bpel.hobj.HCorrelationSet;
-import org.apache.ode.daohib.bpel.hobj.HCorrelator;
-import org.apache.ode.daohib.bpel.hobj.HCorrelatorSelector;
-import org.apache.ode.daohib.bpel.hobj.HFaultData;
-import org.apache.ode.daohib.bpel.hobj.HMessage;
-import org.apache.ode.daohib.bpel.hobj.HMessageExchange;
-import org.apache.ode.daohib.bpel.hobj.HPartnerLink;
-import org.apache.ode.daohib.bpel.hobj.HProcess;
-import org.apache.ode.daohib.bpel.hobj.HProcessInstance;
-import org.apache.ode.daohib.bpel.hobj.HScope;
-import org.apache.ode.daohib.bpel.hobj.HXmlData;
-import org.hibernate.Query;
-
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 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;
-
- public ProcessProfileDaoImpl(SessionManager sm, ProcessDaoImpl process) {
- super(sm, process._hobj);
- entering("ProcessProfileDaoImpl.ProcessProfileDaoImpl");
- this.process = process;
- }
-
- public SessionManager getSessionManager() {
- 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);
- }
-
- public List<ActivityRecoveryDAO> findActivityRecoveriesByProcess() {
- 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);
- }
-
- public List<CorrelatorDAO> findCorrelatorsByProcess() {
- 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);
- }
-
- public int countEventsByProcess() {
- 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();
- }
-
- @SuppressWarnings("unchecked")
- 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);
- }
-
- return results;
- }
-}
\ No newline at end of file
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/process-sample02_standalone_policy/sample02-policy-for-service.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/process-sample02_standalone_policy/sample02-policy-for-service.xml 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/process-sample02_standalone_policy/sample02-policy-for-service.xml 2010-05-25 17:50:59 UTC (rev 667)
@@ -72,7 +72,7 @@
<ramp:signatureCrypto>
<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-processes/service.jks</ramp:property>
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/webapp/WEB-INF/conf.hib-derby/ode-axis2.properties
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/webapp/WEB-INF/conf.hib-derby/ode-axis2.properties 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/webapp/WEB-INF/conf.hib-derby/ode-axis2.properties 2010-05-25 17:50:59 UTC (rev 667)
@@ -14,10 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
ode-axis2.dao.factory=org.apache.ode.axis2.instancecleanup.HibDaoConnectionFactoryImpl
-ode-axis2.db.emb.name=hibdb
+ode-axis2.dao.factory.store=org.apache.ode.dao.hib.store.ConfStoreDAOConnectionFactoryImpl
+ode-axis2.db.emb.name=ode-db-hib
ode-axis2.db.mode=EMBEDDED
+ode-axis2.db.emb.type=derby
+ode-axis2.db.emb.create=false
ode-axis2.cluster.localRoute.targets=http://doesntexist:8080/ode/processes/
ode-axis2.cluster.localRoute.base=http://localhost:8888/ode/processes/
ode-axis2.event.listeners=org.apache.ode.bpel.common.evt.DebugBpelEventListener
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/src/test/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/test/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/test/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties 2010-05-25 17:50:59 UTC (rev 667)
@@ -15,4 +15,6 @@
# limitations under the License.
#
-ode-axis2.dao.factory=org.apache.ode.axis2.instancecleanup.JpaDaoConnectionFactoryImpl
\ No newline at end of file
+ode-axis2.dao.factory=org.apache.ode.axis2.instancecleanup.JpaDaoConnectionFactoryImpl
+ode-axis2.db.emb.type=derby
+ode-axis2.db.emb.create=false
\ No newline at end of file
Modified: branches/ODE/ODE-1.x-jpa/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -278,7 +278,7 @@
}
public int getPoolMaxSize() {
- return Integer.valueOf(getProperty(OdeConfigProperties.PROP_POOL_MAX, "10"));
+ return Integer.valueOf(getProperty(OdeConfigProperties.PROP_POOL_MAX, "15"));
}
public int getPoolMinSize() {
Modified: branches/ODE/ODE-1.x-jpa/bpel-schemas/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-schemas/pom.xml 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/bpel-schemas/pom.xml 2010-05-25 17:50:59 UTC (rev 667)
@@ -50,6 +50,7 @@
<configuration>
<schemaDirectory>src/main/xsd</schemaDirectory>
<sourceGenerationDirectory>target/generated/xmlbeans</sourceGenerationDirectory>
+ <classGenerationDirectory>target/generated/xmlbeans</classGenerationDirectory>
<xmlConfigs>
<xmlConfig implementation="java.io.File">src/main/xsd/dd.xsdconfig</xmlConfig>
<xmlConfig implementation="java.io.File">src/main/xsd/pmapi.xsdconfig</xmlConfig>
@@ -65,6 +66,25 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>xsd</classifier>
+ <classesDirectory>src/main/xsd</classesDirectory>
+ <includes>
+ <include>*.xsd</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: branches/ODE/ODE-1.x-jpa/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -18,6 +18,7 @@
*/
package org.apache.ode.test;
+import org.junit.Ignore;
import org.junit.Test;
public class DataHandling20Test extends BPELTestAbstract {
@@ -61,6 +62,7 @@
go("/bpel/2.0/TestAssignActivity1");
}
+ @Ignore
@Test
public void testAssignActivity2() throws Throwable {
go("/bpel/2.0/TestAssignActivity2");
Modified: branches/ODE/ODE-1.x-jpa/bpel-test/src/test/java/org/apache/ode/test/ExternalVariableTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-test/src/test/java/org/apache/ode/test/ExternalVariableTest.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/bpel-test/src/test/java/org/apache/ode/test/ExternalVariableTest.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -22,12 +22,15 @@
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
+import java.util.Properties;
import javax.sql.DataSource;
import javax.xml.namespace.QName;
-import org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource;
+
import org.apache.ode.bpel.extvar.jdbc.JdbcExternalVariableModule;
+import org.apache.ode.il.config.OdeConfigProperties;
+import org.apache.ode.il.dbutil.Database;
import org.junit.Test;
/**
@@ -37,21 +40,20 @@
private JdbcExternalVariableModule _jdbcext;
- private DataSource _ds;
+ private Database _db;
public void setUp() throws Exception {
super.setUp();
- EmbeddedConnectionPoolDataSource ds = new EmbeddedConnectionPoolDataSource();
- ds.setCreateDatabase("create");
- ds.setDatabaseName("target/ExternalVariableTest");
- _ds = ds;
+ OdeConfigProperties props = new OdeConfigProperties(new Properties(),"");
+ _db = new Database(props);
+ _db.start();
_jdbcext = new JdbcExternalVariableModule();
- _jdbcext.registerDataSource("testds", _ds);
+ _jdbcext.registerDataSource("testds", _db.getDataSource());
_server.registerExternalVariableEngine(_jdbcext);
- Connection conn = _ds.getConnection();
+ Connection conn = _db.getDataSource().getConnection();
Statement s = conn.createStatement();
dropTable(s, "extvartable1");
Modified: branches/ODE/ODE-1.x-jpa/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/BpelDAOConnectionFactoryImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/BpelDAOConnectionFactoryImpl.java 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/BpelDAOConnectionFactoryImpl.java 2010-05-25 17:50:59 UTC (rev 667)
@@ -48,9 +48,9 @@
protected SessionManager _sessionManager;
- private DataSource _ds;
+ protected DataSource _ds;
- private TransactionManager _tm;
+ protected TransactionManager _txm;
/**
* Constructor.
@@ -69,12 +69,12 @@
@SuppressWarnings("unchecked")
public void init(Properties initialProps, TransactionManager mgr, Object env) {
- _tm=mgr;
+ _txm=mgr;
_ds=(DataSource)env;
- if (_tm == null){
+ if (_txm == null){
__log.error("Hibernate BpelDAOConnectionFactoryImpl requires a JTA Transaction Manager to be set.");
}
- _sessionManager = setupSessionManager(initialProps, _tm, _ds);
+ _sessionManager = setupSessionManager(initialProps, _txm, _ds);
}
@@ -198,7 +198,7 @@
}
public void setTransactionManager(Object tm) {
- _tm = (TransactionManager) tm;
+ _txm = (TransactionManager) tm;
}
public void setUnmanagedDataSource(DataSource ds) {
Modified: branches/ODE/ODE-1.x-jpa/dao-hibernate-db/build.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-hibernate-db/build.xml 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/dao-hibernate-db/build.xml 2010-05-25 17:50:59 UTC (rev 667)
@@ -92,7 +92,7 @@
<include name="**/*.hbm.xml"/>
</fileset>
</schemaexport>
- <concat destfile="${db.scripts.dir}/(a){db}.sql">
+ <concat destfile="${db.scripts.dir}/scripts/(a){db}-hib.sql">
<fileset file="${sql.dir}/simplesched-(a){db}.sql"/>
<fileset file="${db.scripts.dir}/partial.(a){db}.sql"/>
</concat>
Modified: branches/ODE/ODE-1.x-jpa/dao-hibernate-db/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-hibernate-db/pom.xml 2010-05-25 17:27:34 UTC (rev 666)
+++ branches/ODE/ODE-1.x-jpa/dao-hibernate-db/pom.xml 2010-05-25 17:50:59 UTC (rev 667)
@@ -21,7 +21,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.bpel</groupId>
- <artifactId>riftsaw-dao-hibernate-db</artifactId>
+ <artifactId>riftsaw-dao-hib-db</artifactId>
<name>ODE :: Hibernate DAO DDL Generation</name>
<parent>
@@ -60,7 +60,7 @@
<artifactId>riftsaw-dao-hibernate</artifactId>
</dependency>
</dependencies>
- <build>
+ <build>
<plugins>
<plugin>
@@ -73,7 +73,7 @@
<phase>generate-sources</phase>
<configuration>
<tasks>
- <property name="maven.runtime.classpath" refid="maven.compile.classpath"/>
+ <property name="maven.runtime.classpath" refid="maven.compile.classpath"/>
<ant antfile="build.xml" target="create-schema" inheritRefs="true"/>
</tasks>
</configuration>
@@ -93,38 +93,39 @@
<goals>
<goal>execute</goal>
</goals>
- <configuration>
- <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
- <url>jdbc:derby:${basedir}/target/derby/hibdb;create=true</url>
- <username>sa</username>
- <password />
- <autocommit>true</autocommit>
- <onError>continue</onError>
- <srcFiles>
- <srcFile>target/derby.sql</srcFile>
- </srcFiles>
- </configuration>
+ <configuration>
+ <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+ <url>jdbc:derby:${basedir}/target/ode-db-hib;create=true</url>
+ <username>sa</username>
+ <password />
+ <autocommit>true</autocommit>
+ <onError>continue</onError>
+ <srcFiles>
+ <srcFile>target/scripts/derby-hib.sql</srcFile>
+ </srcFiles>
+ </configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>zip-derby-db</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="ode.version" value="${project.version}"/>
- <ant antfile="build.xml" target="zip-derby-db" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>ode-db-derby-hib-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Added: branches/ODE/ODE-1.x-jpa/dao-hibernate-db/src/main/assembly/bin.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-hibernate-db/src/main/assembly/bin.xml (rev 0)
+++ branches/ODE/ODE-1.x-jpa/dao-hibernate-db/src/main/assembly/bin.xml 2010-05-25 17:50:59 UTC (rev 667)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<assembly>
+ <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id></id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <directory>target</directory>
+ <includes>
+ <include>scripts/*.sql</include>
+ <include>ode-db-hib/**</include>
+ </includes>
+ <excludes>
+ <exclude>partial.*.sql</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+
+</assembly>
\ No newline at end of file
14 years, 1 month
- 1
- 0
riftsaw SVN: r666 - in branches/ODE/ODE-1.x-jpa/bpel-runtime: src/test/java/org/apache/ode/bpel/extvar/jdbc and 1 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-05-25 13:27:34 -0400 (Tue, 25 May 2010)
New Revision: 666
Modified:
branches/ODE/ODE-1.x-jpa/bpel-runtime/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java
branches/ODE/ODE-1.x-jpa/bpel-runtime/src/test/resources/log4j.properties
Log:
* fix the failed test case.
Modified: branches/ODE/ODE-1.x-jpa/bpel-runtime/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-runtime/pom.xml 2010-05-25 17:08:23 UTC (rev 665)
+++ branches/ODE/ODE-1.x-jpa/bpel-runtime/pom.xml 2010-05-25 17:27:34 UTC (rev 666)
@@ -81,6 +81,16 @@
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-dao-jpa-ojpa</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-dao-jpa-hibernate</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-dao-hibernate</artifactId>
<scope>test</scope>
</dependency>
Modified: branches/ODE/ODE-1.x-jpa/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java 2010-05-25 17:08:23 UTC (rev 665)
+++ branches/ODE/ODE-1.x-jpa/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java 2010-05-25 17:27:34 UTC (rev 666)
@@ -21,6 +21,7 @@
import java.sql.Connection;
import java.sql.Statement;
import java.util.ArrayList;
+import java.util.Properties;
import javax.xml.namespace.QName;
@@ -28,11 +29,11 @@
import org.apache.ode.bpel.engine.extvar.ExternalVariableConf;
import org.apache.ode.bpel.engine.extvar.ExternalVariableConf.Variable;
-import org.apache.ode.utils.DOMUtils;
-import org.apache.ode.utils.GUID;
import org.apache.ode.bpel.evar.ExternalVariableModule.Locator;
import org.apache.ode.bpel.evar.ExternalVariableModule.Value;
-import org.hsqldb.jdbc.jdbcDataSource;
+import org.apache.ode.il.config.OdeConfigProperties;
+import org.apache.ode.il.dbutil.Database;
+import org.apache.ode.utils.DOMUtils;
import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -54,16 +55,17 @@
final QName _varType = new QName("foo", "foobar");
ExternalVariableConf _econf;
- jdbcDataSource _ds;
+ Database _db;
JdbcExternalVariableModule _engine;
Element _el1;
public void setUp() throws Exception {
- _ds = new org.hsqldb.jdbc.jdbcDataSource();
- _ds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
- _ds.setUser("sa");
+
+ OdeConfigProperties props = new OdeConfigProperties(new Properties(),"");
+ _db = new Database(props);
+ _db.start();
- Connection conn = _ds.getConnection();
+ Connection conn = _db.getDataSource().getConnection();
Statement s = conn.createStatement();
s.execute("create table extvartable1 (" +
"id1 VARCHAR PRIMARY KEY," +
@@ -76,11 +78,15 @@
"bar VARCHAR );");
_engine = new JdbcExternalVariableModule();
- _engine.registerDataSource("testds",_ds);
+ _engine.registerDataSource("testds",_db.getDataSource());
_el1=DOMUtils.stringToDOM("<foobar><id2>ignored</id2><foo>foo</foo><bar>bar</bar></foobar>");
}
+ protected void tearDown() throws Exception {
+ _db.shutdown();
+ }
+
@Test
public void testConfigurationParsing() throws Exception {
Document deploydoc = DOMUtils.parse(getClass().getResourceAsStream("evardeploy.xml"));
Modified: branches/ODE/ODE-1.x-jpa/bpel-runtime/src/test/resources/log4j.properties
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-runtime/src/test/resources/log4j.properties 2010-05-25 17:08:23 UTC (rev 665)
+++ branches/ODE/ODE-1.x-jpa/bpel-runtime/src/test/resources/log4j.properties 2010-05-25 17:27:34 UTC (rev 666)
@@ -33,5 +33,8 @@
log4j.category.org.apache.ode.bpel=INFO
log4j.category.org.apache.ode.jacob=INFO
log4j.category.org.apache.ode.store=INFO
-log4j.category.org.apache.ode.daohib=INFO
+log4j.category.org.apache.ode.dao=INFO
log4j.category.org.apache.ode.utils=INFO
+log4j.category.openjpa=INFO
+log4j.category.org.apache.ode.sql=INFO
+log4j.category.org.apache.ode.il=INFO
14 years, 1 month
- 1
- 0
riftsaw SVN: r665 - in branches/ODE/ODE-1.x-jpa/dao-jpa: src/main/java/org/apache/ode/dao/jpa/bpel and 2 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-05-25 13:08:23 -0400 (Tue, 25 May 2010)
New Revision: 665
Modified:
branches/ODE/ODE-1.x-jpa/dao-jpa/pom.xml
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ConfStoreDAOConnectionImpl.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ProcessConfDaoImpl.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/resources/META-INF/persistence.xml
Log:
* fix the failed test cases in bpel-store module.
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/pom.xml 2010-05-25 16:45:03 UTC (rev 664)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/pom.xml 2010-05-25 17:08:23 UTC (rev 665)
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-dao-jpa</artifactId>
- <name>ODE :: OpenJPA DAO Impl</name>
+ <name>ODE :: JPA DAO Impl</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java 2010-05-25 16:45:03 UTC (rev 664)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java 2010-05-25 17:08:23 UTC (rev 665)
@@ -53,15 +53,13 @@
import org.apache.ode.dao.jpa.JpaConnection;
import org.apache.ode.dao.jpa.JpaOperator;
import org.apache.ode.utils.ISO8601DateParser;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.OpenJPAQuery;
/**
* @author Matthieu Riou <mriou at apache dot org>
*/
public class BpelDAOConnectionImpl extends JpaConnection implements BpelDAOConnection {
static final Log __log = LogFactory.getLog(BpelDAOConnectionImpl.class);
-
+
static final ThreadLocal<BpelDAOConnectionImpl> _connections = new ThreadLocal<BpelDAOConnectionImpl>();
public BpelDAOConnectionImpl(EntityManager mgr, TransactionManager txMgr, JpaOperator operator) {
@@ -71,7 +69,7 @@
public static ThreadLocal<BpelDAOConnectionImpl> getThreadLocal() {
return _connections;
}
-
+
public List<BpelEvent> bpelEventQuery(InstanceFilter ifilter,
BpelEventFilter efilter) {
// TODO
@@ -85,33 +83,42 @@
}
public ProcessInstanceDAO getInstance(Long iid) {
+ _txCtx.begin();
ProcessInstanceDAOImpl instance = _em.find(ProcessInstanceDAOImpl.class, iid);
+ _txCtx.commit();
return instance;
}
public MessageExchangeDAO createMessageExchange(char dir) {
+ _txCtx.begin();
MessageExchangeDAOImpl ret = new MessageExchangeDAOImpl(dir);
_em.persist(ret);
+ _txCtx.commit();
return ret;
}
public ProcessDAO createProcess(QName pid, QName type, String guid, long version) {
+ _txCtx.begin();
ProcessDAOImpl ret = new ProcessDAOImpl(pid,type,guid,version);
_em.persist(ret);
+ _txCtx.commit();
return ret;
}
public ProcessDAO createTransientProcess(Serializable id) {
+ _txCtx.begin();
ProcessDAOImpl ret = new ProcessDAOImpl(null, null, null, 0);
ret.setId((Long)id);
-
+ _txCtx.commit();
return ret;
}
@SuppressWarnings("unchecked")
public ProcessDAO getProcess(QName processId) {
+ _txCtx.begin();
List l = _em.createQuery("select x from ProcessDAOImpl x where x._processId = ?1")
.setParameter(1, processId.toString()).getResultList();
+ _txCtx.commit();
if (l.size() == 0) return null;
ProcessDAOImpl p = (ProcessDAOImpl) l.get(0);
return p;
@@ -125,10 +132,14 @@
}
public ScopeDAO getScope(Long siidl) {
- return _em.find(ScopeDAOImpl.class, siidl);
+ _txCtx.begin();
+ ScopeDAO dao = _em.find(ScopeDAOImpl.class, siidl);
+ _txCtx.commit();
+ return dao;
}
public void insertBpelEvent(BpelEvent event, ProcessDAO process, ProcessInstanceDAO instance) {
+ _txCtx.begin();
EventDAOImpl eventDao = new EventDAOImpl();
eventDao.setTstamp(new Timestamp(System.currentTimeMillis()));
eventDao.setType(BpelEvent.eventName(event));
@@ -142,6 +153,7 @@
eventDao.setScopeId(((ScopeEvent) event).getScopeId());
eventDao.setEvent(event);
_em.persist(eventDao);
+ _txCtx.commit();
}
private static String dateFilter(String filter) {
@@ -159,6 +171,7 @@
@SuppressWarnings("unchecked")
public Collection<ProcessInstanceDAO> instanceQuery(InstanceFilter criteria) {
+ _txCtx.begin();
StringBuffer query = new StringBuffer();
query.append("select pi from ProcessInstanceDAOImpl as pi left join fetch pi._fault ");
@@ -303,8 +316,7 @@
// criteria limit
Query pq = _em.createQuery(query.toString());
- OpenJPAQuery kq = OpenJPAPersistence.cast(pq);
- kq.getFetchPlan().setFetchBatchSize(criteria.getLimit());
+ getJPADaoOperator().setBatchSize(pq, criteria.getLimit());
List<ProcessInstanceDAO> ql = pq.getResultList();
Collection<ProcessInstanceDAO> list = new ArrayList<ProcessInstanceDAO>();
@@ -314,7 +326,7 @@
ProcessInstanceDAO processInstanceDAO = (ProcessInstanceDAO) iterator.next();
list.add(processInstanceDAO);
}
-
+ _txCtx.commit();
return list;
}
@@ -324,11 +336,16 @@
}
public MessageExchangeDAO getMessageExchange(String mexid) {
- return _em.find(MessageExchangeDAOImpl.class, mexid);
+ _txCtx.begin();
+ MessageExchangeDAO dao = _em.find(MessageExchangeDAOImpl.class, mexid);
+ _txCtx.commit();
+ return dao;
}
public void deleteMessageExchange(MessageExchangeDAO mexDao) {
+ _txCtx.begin();
_em.remove(mexDao);
+ _txCtx.commit();
}
public EntityManager getEntityManager() {
@@ -340,6 +357,7 @@
if (instances.size() == 0) {
return new HashMap<Long, Collection<CorrelationSetDAO>>();
}
+ _txCtx.begin();
ArrayList<Long> iids = new ArrayList<Long>(instances.size());
for (ProcessInstanceDAO dao: instances) {
iids.add(dao.getInstanceId());
@@ -355,12 +373,16 @@
}
existing.add(cset);
}
+ _txCtx.commit();
return map;
}
@SuppressWarnings("unchecked")
public Collection<CorrelationSetDAO> getActiveCorrelationSets() {
- return _em.createNamedQuery(CorrelationSetDAOImpl.SELECT_ACTIVE_SETS).setParameter("state", ProcessState.STATE_ACTIVE).getResultList();
+ _txCtx.begin();
+ Collection<CorrelationSetDAO> dao = _em.createNamedQuery(CorrelationSetDAOImpl.SELECT_ACTIVE_SETS).setParameter("state", ProcessState.STATE_ACTIVE).getResultList();
+ _txCtx.commit();
+ return dao;
}
public ProcessManagementDAO getProcessManagement() {
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ConfStoreDAOConnectionImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ConfStoreDAOConnectionImpl.java 2010-05-25 16:45:03 UTC (rev 664)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ConfStoreDAOConnectionImpl.java 2010-05-25 17:08:23 UTC (rev 665)
@@ -37,8 +37,9 @@
* @author Matthieu Riou <mriou at apache dot org>
*/
public class ConfStoreDAOConnectionImpl extends JpaConnection implements ConfStoreDAOConnection {
+
private static Log LOG = LogFactory.getLog(ConfStoreDAOConnectionImpl.class);
-
+
static final ThreadLocal<ConfStoreDAOConnectionImpl> _connections = new ThreadLocal<ConfStoreDAOConnectionImpl>();
@@ -50,23 +51,33 @@
}
public DeploymentUnitDAO createDeploymentUnit(String name) {
+ _txCtx.begin();
DeploymentUnitDaoImpl du = new DeploymentUnitDaoImpl();
du.setName(name);
du.setDeployDate(new Date());
_em.persist(du);
+ _txCtx.commit();
return du;
}
public DeploymentUnitDAO getDeploymentUnit(String name) {
- return _em.find(DeploymentUnitDaoImpl.class, name);
+ _txCtx.begin();
+ DeploymentUnitDAO dao= _em.find(DeploymentUnitDaoImpl.class, name);
+ _txCtx.commit();
+ return dao;
}
public Collection<DeploymentUnitDAO> getDeploymentUnits() {
- return _em.createQuery("SELECT du from DeploymentUnitDaoImpl du").getResultList();
+ _txCtx.begin();
+ Collection<DeploymentUnitDAO> dao = _em.createQuery("SELECT du from DeploymentUnitDaoImpl du").getResultList();
+ _txCtx.commit();
+ return dao;
}
public long getNextVersion() {
+ _txCtx.begin();
List<VersionTrackerDAOImpl> res = _em.createQuery("select v from VersionTrackerDAOImpl v").getResultList();
+ _txCtx.commit();
if (res.size() == 0) return 1;
else {
VersionTrackerDAOImpl vt = res.get(0);
@@ -75,16 +86,17 @@
}
public void setVersion(long version) {
+ _txCtx.begin();
List<VersionTrackerDAOImpl> res = _em.createQuery("select v from VersionTrackerDAOImpl v").getResultList();
VersionTrackerDAOImpl vt;
if (res.size() == 0) vt = new VersionTrackerDAOImpl();
else vt = res.get(0);
vt.setVersion(version);
_em.persist(vt);
+ _txCtx.commit();
}
public static ThreadLocal<ConfStoreDAOConnectionImpl> getThreadLocal() {
return _connections;
}
-
}
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ProcessConfDaoImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ProcessConfDaoImpl.java 2010-05-25 16:45:03 UTC (rev 664)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ProcessConfDaoImpl.java 2010-05-25 17:08:23 UTC (rev 665)
@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.Map;
/**
* @author Matthieu Riou <mriou at apache dot org>
@@ -44,7 +45,7 @@
@OneToMany(fetch=FetchType.EAGER,cascade={CascadeType.ALL})
@MapKey(name="_key")
@JoinTable(name="STORE_PROC_TO_PROP", inverseJoinColumns={ @JoinColumn(name = "STORE_PROPERTY_ID")})
- private HashMap<String,ProcessConfPropertyDaoImpl> _properties = new HashMap<String,ProcessConfPropertyDaoImpl>();
+ private Map<String,ProcessConfPropertyDaoImpl> _properties = new HashMap<String,ProcessConfPropertyDaoImpl>();
@Id @Column(name="PID")
private String _processId;
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/resources/META-INF/persistence.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/resources/META-INF/persistence.xml 2010-05-25 16:45:03 UTC (rev 664)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/resources/META-INF/persistence.xml 2010-05-25 17:08:23 UTC (rev 665)
@@ -20,27 +20,29 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="1.0">
- <persistence-unit name="ode-dao">
- <!--
- This properties file is used specifically by the
- OpenJPA Enhancer.
- -->
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.apache.ode.dao.jpa.ActivityRecoveryDAOImpl</class>
- <class>org.apache.ode.dao.jpa.CorrelationSetDAOImpl</class>
- <class>org.apache.ode.dao.jpa.CorrelatorDAOImpl</class>
- <class>org.apache.ode.dao.jpa.EventDAOImpl</class>
- <class>org.apache.ode.dao.jpa.FaultDAOImpl</class>
- <class>org.apache.ode.dao.jpa.MessageDAOImpl</class>
- <class>org.apache.ode.dao.jpa.MessageExchangeDAOImpl</class>
- <class>org.apache.ode.dao.jpa.MessageRouteDAOImpl</class>
- <class>org.apache.ode.dao.jpa.PartnerLinkDAOImpl</class>
- <class>org.apache.ode.dao.jpa.ProcessDAOImpl</class>
- <class>org.apache.ode.dao.jpa.ProcessInstanceDAOImpl</class>
- <class>org.apache.ode.dao.jpa.ScopeDAOImpl</class>
- <class>org.apache.ode.dao.jpa.XmlDataDAOImpl</class>
- <class>org.apache.ode.dao.jpa.CorrSetProperty</class>
- <class>org.apache.ode.dao.jpa.MexProperty</class>
- <class>org.apache.ode.dao.jpa.XmlDataProperty</class>
+ <persistence-unit name="ode-bpel" transaction-type="JTA">
+ <class>org.apache.ode.dao.jpa.bpel.ActivityRecoveryDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.CorrelationSetDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.CorrelatorDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.EventDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.FaultDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.MessageDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.MessageExchangeDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.MessageRouteDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.PartnerLinkDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.ProcessDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.ProcessInstanceDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.ScopeDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.XmlDataDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.bpel.CorrSetProperty</class>
+ <class>org.apache.ode.dao.jpa.bpel.MexProperty</class>
+ <class>org.apache.ode.dao.jpa.bpel.XmlDataProperty</class>
</persistence-unit>
+ <persistence-unit name="ode-store" transaction-type="JTA">
+ <class>org.apache.ode.dao.jpa.store.ProcessConfDaoImpl</class>
+ <class>org.apache.ode.dao.jpa.store.ProcessConfPropertyDaoImpl</class>
+ <class>org.apache.ode.dao.jpa.store.DeploymentUnitDaoImpl</class>
+ <class>org.apache.ode.dao.jpa.store.VersionTrackerDAOImpl</class>
+ </persistence-unit>
+
</persistence>
\ No newline at end of file
14 years, 1 month
- 1
- 0
riftsaw SVN: r664 - branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-05-25 12:45:03 -0400 (Tue, 25 May 2010)
New Revision: 664
Modified:
branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java
Log:
* update the hsql db to h2.
Modified: branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java 2010-05-25 16:20:16 UTC (rev 663)
+++ branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java 2010-05-25 16:45:03 UTC (rev 664)
@@ -25,7 +25,7 @@
import javax.transaction.TransactionManager;
import org.apache.ode.utils.GUID;
-import org.hsqldb.jdbc.jdbcDataSource;
+import org.h2.jdbcx.JdbcDataSource;
/**
@@ -47,8 +47,8 @@
}
protected void initialize(TransactionManager txm) throws Exception {
- jdbcDataSource ds = new jdbcDataSource();
- ds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
+ JdbcDataSource ds = new JdbcDataSource();
+ ds.setURL("jdbc:h2:mem:" + new GUID().toString() + ";DB_CLOSE_DELAY=-1");
ds.setUser("sa");
ds.setPassword("");
_ds = ds;
@@ -64,7 +64,7 @@
public void setup() throws Exception {
Connection c = _ds.getConnection();
try {
- c.createStatement().executeUpdate("CREATE ALIAS MOD FOR \"org.apache.ode.scheduler.simple.DelegateSupport.mod\";");
+ //c.createStatement().executeUpdate("CREATE ALIAS MOD FOR \"org.apache.ode.scheduler.simple.DelegateSupport.mod\";");
String sql = "CREATE TABLE \"ODE_JOB\" (\"JOBID\" CHAR(64) NOT NULL, \"TS\" NUMERIC NOT NULL, \"NODEID\" char(64) NULL, \"SCHEDULED\" int NOT NULL, \"TRANSACTED\" int NOT NULL, \"DETAILS\" BINARY(4096) NULL, PRIMARY KEY(\"JOBID\"));";
c.createStatement().executeUpdate(sql);
} finally {
Modified: branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java 2010-05-25 16:20:16 UTC (rev 663)
+++ branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java 2010-05-25 16:45:03 UTC (rev 664)
@@ -27,7 +27,7 @@
@Override
protected void initialize(TransactionManager txm) throws Exception {
- _ds = createGeronimoDataSource(txm, "jdbc:hsqldb:mem:" + new GUID().toString(), "org.hsqldb.jdbcDriver", "sa", "");
+ _ds = createGeronimoDataSource(txm, "jdbc:h2:mem:" + new GUID().toString(), org.h2.Driver.class.getName(), "sa", "");
setup();
_del = new JdbcDelegate(_ds);
}
14 years, 1 month
- 1
- 0