svn commit: r1619999 - in /ofbiz/branches/framework-api-cleanup/framework/entity: config/ src/org/ofbiz/entity/transaction/

[jacopoc]

Author: jacopoc
Date: Sat Aug 23 10:13:28 2014
New Revision: 1619999

URL: http://svn.apache.org/r1619999
Log:
Renamed DumbFactory into DumbTransactionFactory.
Renamed JNDIFactory into JNDITransactionFactory.

Added:
    ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/DumbTransactionFactory.java
      - copied, changed from r1619995, ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/DumbFactory.java
    ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/JNDITransactionFactory.java
      - copied, changed from r1619995, ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/JNDIFactory.java
Removed:
    ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/DumbFactory.java
    ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/JNDIFactory.java
Modified:
    ofbiz/branches/framework-api-cleanup/framework/entity/config/entityengine.xml

Modified: ofbiz/branches/framework-api-cleanup/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/framework-api-cleanup/framework/entity/config/entityengine.xml?rev=1619999&r1=1619998&r2=1619999&view=diff
==============================================================================
--- ofbiz/branches/framework-api-cleanup/framework/entity/config/entityengine.xml (original)
+++ ofbiz/branches/framework-api-cleanup/framework/entity/config/entityengine.xml Sat Aug 23 10:13:28 2014
@@ -32,7 +32,7 @@ access. For a detailed description see t
 
     <!-- Use this one for getting the JTA objects from JNDI -->
     <!-- NOTE: to use the JndiFactory you must specify the necessary JNDI properties
-    <transaction-factory class="org.ofbiz.entity.transaction.JNDIFactory">
+    <transaction-factory class="org.ofbiz.entity.transaction.JNDITransactionFactory">
         <user-transaction-jndi jndi-server-name="default" jndi-name="java:comp/UserTransaction"/>
         <transaction-manager-jndi jndi-server-name="default" jndi-name="java:comp/UserTransaction"/>
     </transaction-factory>

Copied: ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/DumbTransactionFactory.java (from r1619995, ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/DumbFactory.java)
URL: http://svn.apache.org/viewvc/ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/DumbTransactionFactory.java?p2=ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/DumbTransactionFactory.java&p1=ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/DumbFactory.java&r1=1619995&r2=1619999&rev=1619999&view=diff
==============================================================================
--- ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/DumbFactory.java (original)
+++ ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/DumbTransactionFactory.java Sat Aug 23 10:13:28 2014
@@ -42,9 +42,9 @@ import org.ofbiz.entity.jdbc.ConnectionF
 /**
  * A dumb, non-working transaction manager.
  */
-public class DumbFactory implements TransactionFactory {
+public class DumbTransactionFactory implements TransactionFactory {
 
-    public static final String module = DumbFactory.class.getName();
+    public static final String module = DumbTransactionFactory.class.getName();
 
     public TransactionManager getTransactionManager() {
         return new TransactionManager() {

Copied: ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/JNDITransactionFactory.java (from r1619995, ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/JNDIFactory.java)
URL: http://svn.apache.org/viewvc/ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/JNDITransactionFactory.java?p2=ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/JNDITransactionFactory.java&p1=ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/JNDIFactory.java&r1=1619995&r2=1619999&rev=1619999&view=diff
==============================================================================
--- ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/JNDIFactory.java (original)
+++ ofbiz/branches/framework-api-cleanup/framework/entity/src/org/ofbiz/entity/transaction/JNDITransactionFactory.java Sat Aug 23 10:13:28 2014
@@ -44,10 +44,10 @@ import org.ofbiz.entity.jdbc.ConnectionF
 /**
  * Central source for Tyrex JTA objects from JNDI
  */
-public class JNDIFactory implements TransactionFactory {
+public class JNDITransactionFactory implements TransactionFactory {
 
     // Debug module name
-    public static final String module = JNDIFactory.class.getName();
+    public static final String module = JNDITransactionFactory.class.getName();
 
     static TransactionManager transactionManager = null;
     static UserTransaction userTransaction = null;
@@ -57,7 +57,7 @@ public class JNDIFactory implements Tran
 
     public TransactionManager getTransactionManager() {
         if (transactionManager == null) {
-            synchronized (JNDIFactory.class) {
+            synchronized (JNDITransactionFactory.class) {
                 // try again inside the synch just in case someone when through while we were waiting
                 if (transactionManager == null) {
                     try {
@@ -65,7 +65,7 @@ public class JNDIFactory implements Tran
                         String jndiServerName = EntityConfig.getInstance().getTransactionFactory().getTransactionManagerJndi().getJndiServerName();
 
                         if (UtilValidate.isNotEmpty(jndiName)) {
-                            // if (Debug.verboseOn()) Debug.logVerbose("[JNDIFactory.getTransactionManager] Trying JNDI name " + jndiName, module);
+                            // if (Debug.verboseOn()) Debug.logVerbose("[JNDITransactionFactory.getTransactionManager] Trying JNDI name " + jndiName, module);
 
                             try {
                                 InitialContext ic = JNDIContextFactory.getInitialContext(jndiServerName);
@@ -78,7 +78,7 @@ public class JNDIFactory implements Tran
                                 transactionManager = null;
                             }
                             if (transactionManager == null) {
-                                Debug.logWarning("[JNDIFactory.getTransactionManager] Failed to find TransactionManager named " + jndiName + " in JNDI.", module);
+                                Debug.logWarning("Failed to find TransactionManager named " + jndiName + " in JNDI.", module);
                             }
                         }
                     } catch (GeneralException e) {
@@ -93,7 +93,7 @@ public class JNDIFactory implements Tran
 
     public UserTransaction getUserTransaction() {
         if (userTransaction == null) {
-            synchronized (JNDIFactory.class) {
+            synchronized (JNDITransactionFactory.class) {
                 // try again inside the synch just in case someone when through while we were waiting
                 if (userTransaction == null) {
                     try {
@@ -101,7 +101,6 @@ public class JNDIFactory implements Tran
                         String jndiServerName = EntityConfig.getInstance().getTransactionFactory().getUserTransactionJndi().getJndiServerName();
 
                         if (UtilValidate.isNotEmpty(jndiName)) {
-                            // if (Debug.verboseOn()) Debug.logVerbose("[JNDIFactory.getTransactionManager] Trying JNDI name " + jndiName, module);
 
                             try {
                                 InitialContext ic = JNDIContextFactory.getInitialContext(jndiServerName);
@@ -114,7 +113,7 @@ public class JNDIFactory implements Tran
                                 userTransaction = null;
                             }
                             if (userTransaction == null) {
-                                Debug.logWarning("[JNDIFactory.getUserTransaction] Failed to find UserTransaction named " + jndiName + " in JNDI.", module);
+                                Debug.logWarning("Failed to find UserTransaction named " + jndiName + " in JNDI.", module);
                             }
                         }
                     } catch (GeneralException e) {