Author: dblevins
Date: Fri Jun 20 15:23:55 2008
New Revision: 670085
URL: http://svn.apache.org/viewvc?rev=670085&view=rev
Log:
OPENEJB-824: HOWL TX Logging left on by default
Also added an explicit "TxRecovery" flag to turn on tx logging.
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java?rev=670085&r1=670084&r2=670085&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java
Fri Jun 20 15:23:55 2008
@@ -32,7 +32,7 @@
import org.apache.openejb.loader.SystemInstance;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class GeronimoTransactionManagerFactory {
@@ -40,6 +40,7 @@
private static final int DEFAULT_BUFFER_SIZE = 32;
public static GeronimoTransactionManager create(int
defaultTransactionTimeoutSeconds,
+ boolean txRecovery,
byte[] tmId,
String bufferClassName,
int bufferSizeKb,
@@ -56,7 +57,7 @@
int
threadsWaitingForceThreshold) throws Exception {
XidFactory xidFactory = null;
TransactionLog txLog = null;
- if (maxLogFiles > 0) {
+ if (txRecovery) {
xidFactory = new XidFactoryImpl(tmId == null ? DEFAULT_TM_ID:
tmId);
txLog = new HOWLLog(bufferClassName == null ?
"org.objectweb.howl.log.BlockLogBuffer" : bufferClassName,
bufferSizeKb == 0 ? DEFAULT_BUFFER_SIZE : bufferSizeKb,
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml?rev=670085&r1=670084&r2=670085&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
Fri Jun 20 15:23:55 2008
@@ -231,9 +231,10 @@
service="TransactionManager"
types="TransactionManager"
factory-name="create"
- constructor="defaultTransactionTimeoutSeconds, tmId,
bufferClassName, bufferSizeKb, checksumEnabled, adler32Checksum,
flushSleepTimeMilliseconds, logFileDir, logFileExt, logFileName,
maxBlocksPerFile, maxBuffers, maxLogFiles, minBuffers,
threadsWaitingForceThreshold"
+ constructor="defaultTransactionTimeoutSeconds, TxRecovery, tmId,
bufferClassName, bufferSizeKb, checksumEnabled, adler32Checksum,
flushSleepTimeMilliseconds, logFileDir, logFileExt, logFileName,
maxBlocksPerFile, maxBuffers, maxLogFiles, minBuffers,
threadsWaitingForceThreshold"
class-name="org.apache.openejb.resource.GeronimoTransactionManagerFactory">
defaultTransactionTimeoutSeconds 600
+ TxRecovery false
bufferSizeKb 32
checksumEnabled true
adler32Checksum true
@@ -243,8 +244,7 @@
logFileName howl
maxBlocksPerFile -1
maxBuffers 0
- # set to 0 or less to disable transaction logging and recovery
- maxLogFiles 0
+ maxLogFiles 2
minBuffers 4
threadsWaitingForceThreshold -1
</ServiceProvider>
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?rev=670085&r1=670084&r2=670085&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
Fri Jun 20 15:23:55 2008
@@ -233,9 +233,10 @@
service="TransactionManager"
types="TransactionManager"
factory-name="create"
- constructor="defaultTransactionTimeoutSeconds, tmId,
bufferClassName, bufferSizeKb, checksumEnabled, adler32Checksum,
flushSleepTimeMilliseconds, logFileDir, logFileExt, logFileName,
maxBlocksPerFile, maxBuffers, maxLogFiles, minBuffers,
threadsWaitingForceThreshold"
+ constructor="defaultTransactionTimeoutSeconds, TxRecovery, tmId,
bufferClassName, bufferSizeKb, checksumEnabled, adler32Checksum,
flushSleepTimeMilliseconds, logFileDir, logFileExt, logFileName,
maxBlocksPerFile, maxBuffers, maxLogFiles, minBuffers,
threadsWaitingForceThreshold"
class-name="org.apache.openejb.resource.GeronimoTransactionManagerFactory">
defaultTransactionTimeoutSeconds 600
+ TxRecovery false
bufferSizeKb 32
checksumEnabled true
adler32Checksum true
@@ -245,7 +246,6 @@
logFileName howl
maxBlocksPerFile -1
maxBuffers 0
- # set to 0 or less to disable transaction logging and recovery
maxLogFiles 2
minBuffers 4
threadsWaitingForceThreshold -1
