You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2012/08/30 15:00:04 UTC
svn commit: r1378917 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq: broker/Locker.java store/SharedFileLocker.java store/kahadb/KahaDBPersistenceAdapter.java store/kahadb/SharedFileLocker.java

Author: dejanb
Date: Thu Aug 30 13:00:04 2012
New Revision: 1378917

URL: http://svn.apache.org/viewvc?rev=1378917&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4005 - pluggable lockers; move shared file locker from kahadb package and improve javadocs

Added:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/SharedFileLocker.java
      - copied, changed from r1378881, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/SharedFileLocker.java
Removed:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/SharedFileLocker.java
Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Locker.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Locker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Locker.java?rev=1378917&r1=1378916&r2=1378917&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Locker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Locker.java Thu Aug 30 13:00:04 2012
@@ -56,7 +56,9 @@ public interface Locker extends Service 
 
 
     /**
-     * Configure the locker with the persistence adapter currently used
+     * Optionally configure the locker with the persistence adapter currently used
+     * You can use persistence adapter configuration details like, data directory
+     * datasource, etc. to be used by the locker
      *
      * @param persistenceAdapter
      * @throws IOException

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/SharedFileLocker.java (from r1378881, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/SharedFileLocker.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/SharedFileLocker.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/SharedFileLocker.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/SharedFileLocker.java&r1=1378881&r2=1378917&rev=1378917&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/SharedFileLocker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/SharedFileLocker.java Thu Aug 30 13:00:04 2012
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.store.kahadb;
+package org.apache.activemq.store;
 
 import org.apache.activemq.broker.AbstractLocker;
-import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.store.kahadb.MessageDatabase;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.kahadb.util.LockFile;
 import org.slf4j.Logger;

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=1378917&r1=1378916&r2=1378917&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 Thu Aug 30 13:00:04 2012
@@ -30,6 +30,7 @@ import org.apache.activemq.protobuf.Buff
 import org.apache.activemq.broker.Locker;
 import org.apache.activemq.store.MessageStore;
 import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.store.SharedFileLocker;
 import org.apache.activemq.store.TopicMessageStore;
 import org.apache.activemq.store.TransactionStore;
 import org.apache.activemq.store.kahadb.data.KahaLocalTransactionId;