svn commit: r669921 - in /ode/branches/APACHE_ODE_1.1: Rakefile jbi/src/main/java/org/apache/ode/jbi/OdeContext.java jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java

[boisvert]

Author: boisvert
Date: Fri Jun 20 07:50:04 2008
New Revision: 669921

URL: http://svn.apache.org/viewvc?rev=669921&view=rev
Log:
Revert changeset 669918

Modified:
    ode/branches/APACHE_ODE_1.1/Rakefile
    
ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
    
ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java

Modified: ode/branches/APACHE_ODE_1.1/Rakefile
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/Rakefile?rev=669921&r1=669920&r2=669921&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.1/Rakefile Fri Jun 20 07:50:04 2008
@@ -78,7 +78,7 @@
 JENCKS              = "org.jencks:jencks:jar:all:1.3"
 JIBX                = "jibx:jibx-run:jar:1.1-beta3"
 LOG4J               = "log4j:log4j:jar:1.2.13"
-OPENJPA             = ["org.apache.openjpa:openjpa:jar:1.1.0",
+OPENJPA             = ["org.apache.openjpa:openjpa:jar:1.0.1",
                        "net.sourceforge.serp:serp:jar:1.13.1"]
 SAXON               = group("saxon", "saxon-xpath", "saxon-dom", 
:under=>"net.sf.saxon", :version=>"8.7")
 SERVICEMIX          = group("servicemix-core", "servicemix-shared", 
"servicemix-services",

Modified: 
ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java?rev=669921&r1=669920&r2=669921&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
 Fri Jun 20 07:50:04 2008
@@ -72,8 +72,6 @@
     private static OdeContext __self;
 
     private ComponentContext _context;
-    
-    private TransactionManager _txm;
 
     private Map<QName, Document> _descriptorCache = new 
ConcurrentHashMap<QName, Document>();
 
@@ -168,15 +166,7 @@
     }
 
     public TransactionManager getTransactionManager() {
-        if (_txm == null) {
-            return (TransactionManager) getContext().getTransactionManager();
-        } else {
-            return _txm;
-        }
-    }
-
-    public void setTransactionManager(TransactionManager txm) {
-        _txm = txm;
+        return (TransactionManager) getContext().getTransactionManager();
     }
 
     public MyEndpointReference activateEndpoint(QName pid, Endpoint endpoint) 
throws Exception {

Modified: 
ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java?rev=669921&r1=669920&r2=669921&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
 Fri Jun 20 07:50:04 2008
@@ -35,7 +35,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
 import org.apache.ode.bpel.connector.BpelServerConnector;
 import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC;
 import org.apache.ode.bpel.engine.BpelServerImpl;
@@ -107,20 +106,6 @@
             __log.debug("Loading properties.");
             initProperties();
 
-            switch (_ode._config.getDbMode()) {
-            case EMBEDDED:
-            case INTERNAL:
-                try {
-                    TransactionManager txm = new GeronimoTransactionManager();
-                    _ode.setTransactionManager(txm);
-                } catch (Exception e) {
-                    throw new RuntimeException("Unable to create Geronimo 
Transaction Manager", e);
-                }
-                break;
-            default:
-                break;
-            }
-
             __log.debug("Initializing message mappers.");
             initMappers();