Author: mriou
Date: Thu Aug 2 11:44:22 2007
New Revision: 562218
URL: http://svn.apache.org/viewvc?view=rev&rev=562218
Log:
Re-removed dependency toward JOTM and its howl / carol friends.
Modified:
ode/trunk/Rakefile
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java
Modified: ode/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/ode/trunk/Rakefile?view=diff&rev=562218&r1=562217&r2=562218
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Thu Aug 2 11:44:22 2007
@@ -23,7 +23,6 @@
require "buildr/jetty"
require "buildr/hibernate"
-
# Keep this structure to allow the build system to update version numbers.
VERSION_NUMBER = "1.1-SNAPSHOT"
NEXT_VERSION = "1.1"
@@ -59,7 +58,6 @@
)
HIBERNATE = [ "org.hibernate:hibernate:jar:3.2.4.sp1",
"asm:asm:jar:1.5.3",
"antlr:antlr:jar:2.7.6", "cglib:cglib:jar:2.1_3",
"net.sf.ehcache:ehcache:jar:1.2.3" ]
-HOWL_LOGGER = "howl:howl-logger:jar:0.1.11"
HSQLDB = "hsqldb:hsqldb:jar:1.8.0.7"
JAVAX = struct(
:activation =>"javax.activation:activation:jar:1.1",
@@ -100,13 +98,6 @@
XBEAN = group("xbean-classloader", "xbean-kernel",
"xbean-server", "xbean-spring",
:under=>"org.apache.xbean", :version=>"2.8")
XMLBEANS = "xmlbeans:xbean:jar:2.2.0"
-JOTM = struct(
- :jotm =>"jotm:jotm:jar:2.0.10",
- :carol =>"org.objectweb.carol:carol:jar:2.0.5",
- :jrmp =>"jotm:jotm_jrmp_stubs:jar:2.0.10",
- :howl =>"howl:howl-logger:jar:0.1.11"
-)
-
repositories.remote << "http://pxe.intalio.org/public/maven2";
repositories.remote << "http://people.apache.org/repo/m2-incubating-repository";
@@ -259,8 +250,9 @@
desc "ODE Simple Scheduler"
define "scheduler-simple" do
compile.with projects("bpel-api", "utils"), COMMONS.collections,
COMMONS.logging, JAVAX.transaction
- test.compile.with HSQLDB, JOTM.jotm
- test.with HSQLDB, JOTM.jotm, JOTM.carol, JOTM.jrmp, JAVAX.transaction,
JOTM.howl, JAVAX.resource, JAVAX.connector, LOG4J
+ test.compile.with HSQLDB, GERONIMO.kernel, GERONIMO.transaction
+ test.with HSQLDB, JAVAX.transaction, JAVAX.resource, JAVAX.connector,
LOG4J,
+ GERONIMO.kernel, GERONIMO.transaction, BACKPORT, JAVAX.ejb
package :jar
end
Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?view=diff&rev=562218&r1=562217&r2=562218
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Thu Aug
2 11:44:22 2007
@@ -278,7 +278,6 @@
if (_txMgr != null) {
__log.debug("shutting down transaction manager.");
- // TODO: we need to shutdown jotm if it is running.
_txMgr = null;
}
Modified:
ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java
URL:
http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java?view=diff&rev=562218&r1=562217&r2=562218
==============================================================================
---
ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java
(original)
+++
ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java
Thu Aug 2 11:44:22 2007
@@ -16,25 +16,18 @@
import org.apache.ode.bpel.iapi.Scheduler.JobInfo;
import org.apache.ode.bpel.iapi.Scheduler.JobProcessor;
import org.apache.ode.bpel.iapi.Scheduler.JobProcessorException;
-import org.objectweb.jotm.Jotm;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
public class SimpleSchedulerTest extends TestCase implements JobProcessor {
DelegateSupport _ds;
-
SimpleScheduler _scheduler;
-
ArrayList<JobInfo> _jobs;
ArrayList<JobInfo> _commit;
-
TransactionManager _txm;
-
- Jotm _jotm;
-
public void setUp() throws Exception {
- _jotm = new Jotm(true, false);
- _txm = _jotm.getTransactionManager();
+ _txm = new GeronimoTransactionManager();
_ds = new DelegateSupport();
_scheduler = newScheduler("n1");
@@ -44,7 +37,6 @@
public void tearDown() throws Exception {
_scheduler.shutdown();
-
}
public void testConcurrentExec() throws Exception {
