geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r472646 - in /geronimo/server/trunk: configs/transaction/src/plan/ modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/log/ modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/log/ modules/geron...
Date Wed, 08 Nov 2006 21:11:29 GMT
Author: djencks
Date: Wed Nov  8 13:11:28 2006
New Revision: 472646

URL: http://svn.apache.org/viewvc?view=rev&rev=472646
Log:
GERONIMO-2113 Make HOWL log jdk independent using adler32 checksum

Modified:
    geronimo/server/trunk/configs/transaction/src/plan/plan.xml
    geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/log/HOWLLog.java
    geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/log/HOWLLogGBean.java
    geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/log/HOWLLogTest.java
    geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java

Modified: geronimo/server/trunk/configs/transaction/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction/src/plan/plan.xml?view=diff&rev=472646&r1=472645&r2=472646
==============================================================================
--- geronimo/server/trunk/configs/transaction/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/transaction/src/plan/plan.xml Wed Nov  8 13:11:28 2006
@@ -51,6 +51,7 @@
         <attribute name="bufferClassName">org.objectweb.howl.log.BlockLogBuffer</attribute>
         <attribute name="bufferSizeKBytes">32</attribute>
         <attribute name="checksumEnabled">true</attribute>
+        <attribute name="adler32Checksum">true</attribute>
         <attribute name="flushSleepTimeMilliseconds">50</attribute>
         <attribute name="logFileDir">var/txlog</attribute>
         <attribute name="logFileExt">log</attribute>

Modified: geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/log/HOWLLog.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/log/HOWLLog.java?view=diff&rev=472646&r1=472645&r2=472646
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/log/HOWLLog.java
(original)
+++ geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/log/HOWLLog.java
Wed Nov  8 13:11:28 2006
@@ -72,6 +72,7 @@
     public HOWLLog(String bufferClassName,
                    int bufferSize,
                    boolean checksumEnabled,
+                   boolean adler32Checksum,
                    int flushSleepTimeMilliseconds,
                    String logFileDir,
                    String logFileExt,
@@ -87,6 +88,7 @@
         setBufferClassName(bufferClassName);
         setBufferSizeKBytes(bufferSize);
         setChecksumEnabled(checksumEnabled);
+        setAdler32Checksum(adler32Checksum);
         setFlushSleepTimeMilliseconds(flushSleepTimeMilliseconds);
         //setLogFileDir(logFileDir);
         this.logFileDir = logFileDir;
@@ -139,6 +141,14 @@
 
     public void setChecksumEnabled(boolean checksumOption) {
         configuration.setChecksumEnabled(checksumOption);
+    }
+
+    public boolean isAdler32ChecksumEnabled() {
+        return configuration.isAdler32ChecksumEnabled();
+    }
+
+    public void setAdler32Checksum(boolean checksumOption) {
+        configuration.setAdler32Checksum(checksumOption);
     }
 
     public int getBufferSizeKBytes() {

Modified: geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/log/HOWLLogGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/log/HOWLLogGBean.java?view=diff&rev=472646&r1=472645&r2=472646
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/log/HOWLLogGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/log/HOWLLogGBean.java
Wed Nov  8 13:11:28 2006
@@ -31,8 +31,8 @@
  * @version $Rev$ $Date$
  */
 public class HOWLLogGBean extends HOWLLog implements GBeanLifecycle {
-    public HOWLLogGBean(String bufferClassName, int bufferSize, boolean checksumEnabled,
int flushSleepTimeMilliseconds, String logFileDir, String logFileExt, String logFileName,
int maxBlocksPerFile, int maxBuffers, int maxLogFiles, int minBuffers, int threadsWaitingForceThreshold,
XidFactory xidFactory, ServerInfo serverInfo) throws IOException, LogConfigurationException
{
-        super(bufferClassName, bufferSize, checksumEnabled, flushSleepTimeMilliseconds, logFileDir,
logFileExt, logFileName, maxBlocksPerFile, maxBuffers, maxLogFiles, minBuffers, threadsWaitingForceThreshold,
xidFactory, serverInfo.resolveServer("."));
+    public HOWLLogGBean(String bufferClassName, int bufferSize, boolean checksumEnabled,
boolean adler32Checksum, int flushSleepTimeMilliseconds, String logFileDir, String logFileExt,
String logFileName, int maxBlocksPerFile, int maxBuffers, int maxLogFiles, int minBuffers,
int threadsWaitingForceThreshold, XidFactory xidFactory, ServerInfo serverInfo) throws IOException,
LogConfigurationException {
+        super(bufferClassName, bufferSize, checksumEnabled, adler32Checksum, flushSleepTimeMilliseconds,
logFileDir, logFileExt, logFileName, maxBlocksPerFile, maxBuffers, maxLogFiles, minBuffers,
threadsWaitingForceThreshold, xidFactory, serverInfo.resolveServer("."));
     }
 
     public static final GBeanInfo GBEAN_INFO;
@@ -42,6 +42,7 @@
         infoFactory.addAttribute("bufferClassName", String.class, true);
         infoFactory.addAttribute("bufferSizeKBytes", Integer.TYPE, true);
         infoFactory.addAttribute("checksumEnabled", Boolean.TYPE, true);
+        infoFactory.addAttribute("adler32Checksum", Boolean.TYPE, true);
         infoFactory.addAttribute("flushSleepTimeMilliseconds", Integer.TYPE, true);
         infoFactory.addAttribute("logFileDir", String.class, true);
         infoFactory.addAttribute("logFileExt", String.class, true);
@@ -58,20 +59,21 @@
         infoFactory.addInterface(TransactionLog.class);
 
         infoFactory.setConstructor(new String[]{
-            "bufferClassName",
-            "bufferSizeKBytes",
-            "checksumEnabled",
-            "flushSleepTimeMilliseconds",
-            "logFileDir",
-            "logFileExt",
-            "logFileName",
-            "maxBlocksPerFile",
-            "maxBuffers",
-            "maxLogFiles",
-            "minBuffers",
-            "threadsWaitingForceThreshold",
-            "XidFactory",
-            "ServerInfo"});
+                "bufferClassName",
+                "bufferSizeKBytes",
+                "checksumEnabled",
+                "adler32ChecksumEnabled",
+                "flushSleepTimeMilliseconds",
+                "logFileDir",
+                "logFileExt",
+                "logFileName",
+                "maxBlocksPerFile",
+                "maxBuffers",
+                "maxLogFiles",
+                "minBuffers",
+                "threadsWaitingForceThreshold",
+                "XidFactory",
+                "ServerInfo"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 

Modified: geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/log/HOWLLogTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/log/HOWLLogTest.java?view=diff&rev=472646&r1=472645&r2=472646
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/log/HOWLLogTest.java
(original)
+++ geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/log/HOWLLogTest.java
Wed Nov  8 13:11:28 2006
@@ -52,6 +52,7 @@
                 "org.objectweb.howl.log.BlockLogBuffer", //                "bufferClassName",
                 4, //                "bufferSizeKBytes",
                 true, //                "checksumEnabled",
+                true, //                "adler32Checksum",
                 20, //                "flushSleepTime",
                 "txlog", //                "logFileDir",
                 "log", //                "logFileExt",

Modified: geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java?view=diff&rev=472646&r1=472645&r2=472646
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java
(original)
+++ geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java
Wed Nov  8 13:11:28 2006
@@ -61,6 +61,7 @@
                 "org.objectweb.howl.log.BlockLogBuffer", //                "bufferClassName",
                 4, //                "bufferSizeKBytes",
                 true, //                "checksumEnabled",
+                true, //                "adler32Checksum",
                 20, //                "flushSleepTime",
                 logFileDir, //                "logFileDir",
                 "log", //                "logFileExt",



Mime
View raw message