expose journal writeBatchSize and tidy up xbean annotations

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@813469 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java

@@ -286,6 +286,7 @@ public class PolicyEntry extends DestinationMapEntry {
     }
 
     /**
+     * When set using Xbean, values of the form "20 Mb", "1024kb", and "1g" can be used
      * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor"
      */
     public void setMemoryLimit(long memoryLimit) {

activemq-core/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBroker.java

@@ -30,6 +30,7 @@ import org.apache.commons.logging.LogFactory;
  * 
  * Useful, if you have set the broker usage policy to process ONLY persistent or ONLY non-persistent
  * messages. 
+ * @org.apache.xbean.XBean element="forcePersistencyModeBroker"
  */
 public class ForcePersistencyModeBroker extends BrokerFilter{
   public static Log log = LogFactory.getLog(ForcePersistencyModeBroker.class);

activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java

@@ -799,10 +799,8 @@ public class AMQPersistenceAdapter implements PersistenceAdapter, UsageListener,
     }
 
     /** 
-     * When set using XBean, you can use values such as: "20
+     * When set using Xbean, values of the form "20 Mb", "1024kb", and "1g" can be used
-     * mb", "1024 kb", or "1 gb"
+     * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryIntPropertyEditor"
-     * 
-     * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor"
      */
     public void setMaxCheckpointMessageAddSize(int maxCheckpointMessageAddSize) {
         this.maxCheckpointMessageAddSize = maxCheckpointMessageAddSize;
@@ -857,9 +855,7 @@ public class AMQPersistenceAdapter implements PersistenceAdapter, UsageListener,
 	}
 
 	 /**
-     * When set using XBean, you can use values such as: "20
+      * When set using Xbean, values of the form "20 Mb", "1024kb", and "1g" can be used
-     * mb", "1024 kb", or "1 gb"
-     * 
       * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor"
       */
 	public void setMaxFileLength(int maxFileLength) {
@@ -911,9 +907,7 @@ public class AMQPersistenceAdapter implements PersistenceAdapter, UsageListener,
     }
 
     /**
-     * When set using XBean, you can use values such as: "20
+     * When set using Xbean, values of the form "20 Mb", "1024kb", and "1g" can be used
-     * mb", "1024 kb", or "1 gb"
-     * 
      * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor"
      */
     public void setIndexPageSize(int indexPageSize) {
@@ -933,9 +927,7 @@ public class AMQPersistenceAdapter implements PersistenceAdapter, UsageListener,
     }
 
     /**
-     * When set using XBean, you can use values such as: "20
+     * When set using Xbean, values of the form "20 Mb", "1024kb", and "1g" can be used
-     * mb", "1024 kb", or "1 gb"
-     * 
      * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor"
      */
     public void setMaxReferenceFileLength(int maxReferenceFileLength) {

activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapterFactory.java

@@ -81,7 +81,7 @@ public class JournalPersistenceAdapterFactory extends DataSourceSupport implemen
 
     /**
      * Sets the size of the journal log files
-     * 
+     * When set using Xbean, values of the form "20 Mb", "1024kb", and "1g" can be used
      * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryIntPropertyEditor"
      */
     public void setJournalLogFileSize(int journalLogFileSize) {

activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistenceAdapter.java

@@ -282,7 +282,7 @@ public class KahaPersistenceAdapter implements PersistenceAdapter {
 	}
 
     /**
-     * @param maxDataFileLength the maxDataFileLength to set
+     * When set using Xbean, values of the form "20 Mb", "1024kb", and "1g" can be used
      * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor"
      */
     public void setMaxDataFileLength(long maxDataFileLength) {

activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java

@@ -34,7 +34,7 @@ import java.util.Set;
  * {@link Journal} and then check pointing asynchronously on a timeout with some
  * other long term persistent storage.
  * 
- * @org.apache.xbean.XBean element="KahaDB"
+ * @org.apache.xbean.XBean element="kahaDB"
  * @version $Revision: 1.17 $
  */
 public class KahaDBPersistenceAdapter implements PersistenceAdapter {
@@ -193,19 +193,16 @@ public class KahaDBPersistenceAdapter implements PersistenceAdapter {
      * Get the journalMaxFileLength
      * @return the journalMaxFileLength
      */
-    public long getJournalMaxFileLength() {
+    public int getJournalMaxFileLength() {
         return this.letter.getJournalMaxFileLength();
     }
 
     /**
-     * @param journalMaxFileLength which is rounded to an integer
+     * When set using Xbean, values of the form "20 Mb", "1024kb", and "1g" can be used
-     * When set using XBean, you can use values such as: "20
+     * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryIntPropertyEditor"
-     * mb", "1024 kb", or "1 gb"
-     * 
-     * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor"
      */
-    public void setJournalMaxFileLength(long journalMaxFileLength) {
+    public void setJournalMaxFileLength(int journalMaxFileLength) {
-        this.letter.setJournalMaxFileLength(Long.valueOf(journalMaxFileLength).intValue());
+        this.letter.setJournalMaxFileLength(journalMaxFileLength);
     }
 
     /**
@@ -256,6 +253,22 @@ public class KahaDBPersistenceAdapter implements PersistenceAdapter {
         this.letter.setIndexWriteBatchSize(indexWriteBatchSize);
     }
 
+    /**
+     * Get the journalMaxWriteBatchSize
+     * @return the journalMaxWriteBatchSize
+     */
+    public int getJournalMaxWriteBatchSize() {
+        return this.letter.getJournalMaxWriteBatchSize();
+    }
+
+    /**
+     * Set the journalMaxWriteBatchSize
+     * @param journalMaxWriteBatchSize the journalMaxWriteBatchSize to set
+     */
+    public void setJournalMaxWriteBatchSize(int journalMaxWriteBatchSize) {
+        this.letter.setJournalMaxWriteBatchSize(journalMaxWriteBatchSize);
+    }
+    
     /**
      * Get the enableIndexWriteAsync
      * @return the enableIndexWriteAsync

activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java

@@ -25,7 +25,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
 
-import org.apache.activeio.journal.Journal;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;

activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java

@@ -142,6 +142,7 @@ public class MessageDatabase {
     long checkpointInterval = 5*1000;
     long cleanupInterval = 30*1000;
     int journalMaxFileLength = Journal.DEFAULT_MAX_FILE_LENGTH;
+    int journalMaxWriteBatchSize = Journal.DEFAULT_MAX_WRITE_BATCH_SIZE;
     boolean enableIndexWriteAsync = false;
     int setIndexWriteBatchSize = PageFile.DEFAULT_WRITE_BATCH_SIZE; 
     
@@ -1337,9 +1338,18 @@ public class MessageDatabase {
         Journal manager = new Journal();
         manager.setDirectory(directory);
         manager.setMaxFileLength(getJournalMaxFileLength());
+        manager.setWriteBatchSize(getJournalMaxWriteBatchSize());
         return manager;
     }
 
+    public int getJournalMaxWriteBatchSize() {
+        return journalMaxWriteBatchSize;
+    }
+    
+    public void setJournalMaxWriteBatchSize(int journalMaxWriteBatchSize) {
+        this.journalMaxWriteBatchSize = journalMaxWriteBatchSize;
+    }
+
     public File getDirectory() {
         return directory;
     }

activemq-core/src/main/java/org/apache/activemq/usage/Usage.java

@@ -134,8 +134,8 @@ public abstract class Usage<T extends Usage> implements Service {
     /**
      * Sets the memory limit in bytes. Setting the limit in bytes will set the
      * usagePortion to 0 since the UsageManager is not going to be portion based
-     * off the parent. When set using XBean, you can use values such as: "20
+     * off the parent.
-     * mb", "1024 kb", or "1 gb"
+     * When set using Xbean, values of the form "20 Mb", "1024kb", and "1g" can be used
      * 
      * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor"
      */