From commits-return-7161-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Thu Oct 11 20:58:48 2007 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 69009 invoked from network); 11 Oct 2007 20:58:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Oct 2007 20:58:48 -0000 Received: (qmail 46703 invoked by uid 500); 11 Oct 2007 20:58:35 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 46683 invoked by uid 500); 11 Oct 2007 20:58:35 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 46674 invoked by uid 99); 11 Oct 2007 20:58:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Oct 2007 13:58:35 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Oct 2007 20:58:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E8F5F1A9838; Thu, 11 Oct 2007 13:58:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r583949 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq: kaha/impl/async/AsyncDataManager.java store/amq/AMQPersistenceAdapter.java store/amq/AMQPersistenceAdapterFactory.java Date: Thu, 11 Oct 2007 20:58:26 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071011205826.E8F5F1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Thu Oct 11 13:58:25 2007 New Revision: 583949 URL: http://svn.apache.org/viewvc?rev=583949&view=rev Log: Expose properties for configuring the asyncDataManager Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/AsyncDataManager.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapterFactory.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/AsyncDataManager.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/AsyncDataManager.java?rev=583949&r1=583948&r2=583949&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/AsyncDataManager.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/AsyncDataManager.java Thu Oct 11 13:58:25 2007 @@ -564,4 +564,12 @@ this.lastAppendLocation.set(lastSyncedLocation); } + public boolean isUseNio() { + return useNio; + } + + public void setUseNio(boolean useNio) { + this.useNio = useNio; + } + } Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java?rev=583949&r1=583948&r2=583949&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java Thu Oct 11 13:58:25 2007 @@ -100,6 +100,9 @@ private BrokerService brokerService; private AtomicLong storeSize = new AtomicLong(); private boolean persistentIndex=true; + private boolean useNio = true; + private int maxFileLength = AsyncDataManager.DEFAULT_MAX_FILE_LENGTH; + public String getBrokerName() { return this.brokerName; @@ -609,6 +612,8 @@ protected AsyncDataManager createAsyncDataManager() { AsyncDataManager manager = new AsyncDataManager(storeSize); manager.setDirectory(new File(directory, "journal")); + manager.setMaxFileLength(maxFileLength); + manager.setUseNio(useNio); return manager; } @@ -706,4 +711,20 @@ public long size(){ return storeSize.get(); } + + public boolean isUseNio() { + return useNio; + } + + public void setUseNio(boolean useNio) { + this.useNio = useNio; + } + + public int getMaxFileLength() { + return maxFileLength; + } + + public void setMaxFileLength(int maxFileLength) { + this.maxFileLength = maxFileLength; + } } Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapterFactory.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapterFactory.java?rev=583949&r1=583948&r2=583949&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapterFactory.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapterFactory.java Thu Oct 11 13:58:25 2007 @@ -17,6 +17,8 @@ package org.apache.activemq.store.amq; import java.io.File; + +import org.apache.activemq.kaha.impl.async.AsyncDataManager; import org.apache.activemq.store.PersistenceAdapter; import org.apache.activemq.store.PersistenceAdapterFactory; import org.apache.activemq.store.ReferenceStoreAdapter; @@ -39,6 +41,9 @@ private ReferenceStoreAdapter referenceStoreAdapter; private boolean syncOnWrite; private boolean persistentIndex=true; + private boolean useNio = true; + private int maxFileLength = AsyncDataManager.DEFAULT_MAX_FILE_LENGTH; + /** * @return a AMQPersistenceAdapter @@ -52,6 +57,8 @@ result.setSyncOnWrite(isSyncOnWrite()); result.setPersistentIndex(isPersistentIndex()); result.setReferenceStoreAdapter(getReferenceStoreAdapter()); + result.setUseNio(isUseNio()); + result.setMaxFileLength(getMaxFileLength()); return result; } @@ -146,5 +153,21 @@ public void setSyncOnWrite(boolean syncOnWrite) { this.syncOnWrite = syncOnWrite; + } + + public boolean isUseNio() { + return useNio; + } + + public void setUseNio(boolean useNio) { + this.useNio = useNio; + } + + public int getMaxFileLength() { + return maxFileLength; + } + + public void setMaxFileLength(int maxFileLength) { + this.maxFileLength = maxFileLength; } }