Author: gtully
Date: Fri Aug 14 08:28:07 2009
New Revision: 804124
URL: http://svn.apache.org/viewvc?rev=804124&view=rev
Log:
allow journalMaxFileLength config to take xGb or ymb string notation and
truncate to int to remain within limits of kahadb page
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
activemq/trunk/activemq-core/src/main/resources/activemq.xsd
activemq/trunk/activemq-core/src/main/resources/activemq.xsd.html
activemq/trunk/activemq-core/src/main/resources/activemq.xsd.wiki
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java?rev=804124&r1=804123&r2=804124&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
Fri Aug 14 08:28:07 2009
@@ -193,19 +193,19 @@
* Get the journalMaxFileLength
* @return the journalMaxFileLength
*/
- public int getJournalMaxFileLength() {
+ public long getJournalMaxFileLength() {
return this.letter.getJournalMaxFileLength();
}
/**
- * @param journalMaxFileLength
+ * @param journalMaxFileLength which is rounded to an integer
* When set using XBean, you can use values such as: "20
* mb", "1024 kb", or "1 gb"
*
* @org.apache.xbean.Property
propertyEditor="org.apache.activemq.util.MemoryPropertyEditor"
*/
- public void setJournalMaxFileLength(int journalMaxFileLength) {
- this.letter.setJournalMaxFileLength(journalMaxFileLength);
+ public void setJournalMaxFileLength(long journalMaxFileLength) {
+
this.letter.setJournalMaxFileLength(Long.valueOf(journalMaxFileLength).intValue());
}
/**
Modified: activemq/trunk/activemq-core/src/main/resources/activemq.xsd
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/resources/activemq.xsd?rev=804124&r1=804123&r2=804124&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/resources/activemq.xsd (original)
+++ activemq/trunk/activemq-core/src/main/resources/activemq.xsd Fri Aug 14
08:28:07 2009
@@ -2880,7 +2880,7 @@
<xs:attribute name='brokerName' type='xs:string'/>
<xs:attribute name='directory' type='xs:string'/>
<xs:attribute name='indexWriteBatchSize' type='xs:integer'/>
- <xs:attribute name='journalMaxFileLength' type='xs:integer'/>
+ <xs:attribute name='journalMaxFileLength' type='xs:string'/>
<xs:attribute name='enableIndexWriteAsync' type='xs:boolean'/>
<xs:attribute name='enableJournalDiskSyncs' type='xs:boolean'/>
<xs:attribute name='ignoreMissingJournalfiles' type='xs:boolean'/>
Modified: activemq/trunk/activemq-core/src/main/resources/activemq.xsd.html
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/resources/activemq.xsd.html?rev=804124&r1=804123&r2=804124&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/resources/activemq.xsd.html (original)
+++ activemq/trunk/activemq-core/src/main/resources/activemq.xsd.html Fri Aug
14 08:28:07 2009
@@ -972,7 +972,7 @@
<tr><th>Attribute</th><th>Type</th><th>Description</th>
<tr><td>brokerName</td><td>xs:string</td><td></td></tr>
<tr><td>directory</td><td>xs:string</td><td></td></tr>
- <tr><td>journalMaxFileLength</td><td>xs:integer</td><td></td></tr>
+ <tr><td>journalMaxFileLength</td><td>xs:string</td><td></td></tr>
<tr><td>indexWriteBatchSize</td><td>xs:integer</td><td></td></tr>
<tr><td>enableIndexWriteAsync</td><td>xs:boolean</td><td></td></tr>
<tr><td>enableJournalDiskSyncs</td><td>xs:boolean</td><td></td></tr>
Modified: activemq/trunk/activemq-core/src/main/resources/activemq.xsd.wiki
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/resources/activemq.xsd.wiki?rev=804124&r1=804123&r2=804124&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/resources/activemq.xsd.wiki (original)
+++ activemq/trunk/activemq-core/src/main/resources/activemq.xsd.wiki Fri Aug
14 08:28:07 2009
@@ -1243,7 +1243,7 @@
|| Property Name || Type || Description ||
| brokerName | _java.lang.String_ | {html}{html} |
| directory | _java.io.File_ | {html}{html} |
- | journalMaxFileLength | _int_ | {html}{html} |
+ | journalMaxFileLength | _java.lang.String_ | {html}{html} |
| indexWriteBatchSize | _int_ | {html}{html} |
| enableIndexWriteAsync | _boolean_ | {html}{html} |
| enableJournalDiskSyncs | _boolean_ | {html}{html} |
