svn commit: r1760376 - in /ofbiz/trunk/framework: component-load.xml entity/config/entityengine.xml entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java geronimo/

[ja...@apache.org]

Author: jacopoc
Date: Mon Sep 12 14:09:00 2016
New Revision: 1760376

URL: http://svn.apache.org/viewvc?rev=1760376&view=rev
Log:
Improved: Removed the "geronimo" component and moved GeronimoTransactionFactory into the "entity" component.
(OFBIZ-8179)

Without functional changes, this design removes a cyclic dependency between the "entity" and "geronimo" components.

Added:
    ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java
      - copied, changed from r1760363, ofbiz/trunk/framework/geronimo/src/main/java/org/apache/ofbiz/geronimo/GeronimoTransactionFactory.java
Removed:
    ofbiz/trunk/framework/geronimo/
Modified:
    ofbiz/trunk/framework/component-load.xml
    ofbiz/trunk/framework/entity/config/entityengine.xml

Modified: ofbiz/trunk/framework/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/component-load.xml?rev=1760376&r1=1760375&r2=1760376&view=diff
==============================================================================
--- ofbiz/trunk/framework/component-load.xml (original)
+++ ofbiz/trunk/framework/component-load.xml Mon Sep 12 14:09:00 2016
@@ -21,7 +21,6 @@ under the License.
 <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
     <load-component component-location="base"/>
-    <load-component component-location="geronimo"/>
     <load-component component-location="entity"/>
     <load-component component-location="security"/>
     <load-component component-location="datafile"/>

Modified: ofbiz/trunk/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/config/entityengine.xml?rev=1760376&r1=1760375&r2=1760376&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/config/entityengine.xml (original)
+++ ofbiz/trunk/framework/entity/config/entityengine.xml Mon Sep 12 14:09:00 2016
@@ -28,7 +28,7 @@ access. For a detailed description see t
 
     <!-- the transaction factory class to use, one is needed for each way of getting JTA interfaces -->
     <!-- Use this one for Geronimo -->
-    <transaction-factory class="org.apache.ofbiz.geronimo.GeronimoTransactionFactory"/>
+    <transaction-factory class="org.apache.ofbiz.entity.transaction.GeronimoTransactionFactory"/>
 
     <!-- Use this one for getting the JTA objects from JNDI -->
     <!-- NOTE: to use the JndiFactory you must specify the necessary JNDI properties

Copied: ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java (from r1760363, ofbiz/trunk/framework/geronimo/src/main/java/org/apache/ofbiz/geronimo/GeronimoTransactionFactory.java)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java?p2=ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java&p1=ofbiz/trunk/framework/geronimo/src/main/java/org/apache/ofbiz/geronimo/GeronimoTransactionFactory.java&r1=1760363&r2=1760376&rev=1760376&view=diff
==============================================================================
--- ofbiz/trunk/framework/geronimo/src/main/java/org/apache/ofbiz/geronimo/GeronimoTransactionFactory.java (original)
+++ ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java Mon Sep 12 14:09:00 2016
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
-package org.apache.ofbiz.geronimo;
+package org.apache.ofbiz.entity.transaction;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -35,11 +35,7 @@ import org.apache.ofbiz.entity.config.mo
 import org.apache.ofbiz.entity.config.model.EntityConfig;
 import org.apache.ofbiz.entity.datasource.GenericHelperInfo;
 import org.apache.ofbiz.entity.jdbc.ConnectionFactoryLoader;
-import org.apache.ofbiz.entity.transaction.TransactionFactory;
 
-/**
- * GeronimoTransactionFactory
- */
 public class GeronimoTransactionFactory implements TransactionFactory {
 
     public static final String module = GeronimoTransactionFactory.class.getName();