activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1435163 - in /activemq/trunk/activemq-leveldb-store/src/main: java/org/apache/activemq/leveldb/ scala/org/apache/activemq/leveldb/
Date Fri, 18 Jan 2013 14:38:01 GMT
Author: dejanb
Date: Fri Jan 18 14:38:01 2013
New Revision: 1435163

URL: http://svn.apache.org/viewvc?rev=1435163&view=rev
Log:
resolve leveldb store jmx issues and use the proper mbean naming

Added:
    activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/
    activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java
      - copied, changed from r1435065, activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java
Removed:
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java
Modified:
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala

Copied: activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java
(from r1435065, activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java?p2=activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java&p1=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java&r1=1435065&r2=1435163&rev=1435163&view=diff
==============================================================================
    (empty)

Modified: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala?rev=1435163&r1=1435162&r2=1435163&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
(original)
+++ activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
Fri Jan 18 14:38:01 2013
@@ -31,7 +31,7 @@ import java.util._
 import collection.mutable.ListBuffer
 import concurrent.CountDownLatch
 import javax.management.ObjectName
-import org.apache.activemq.broker.jmx.AnnotatedMBean
+import org.apache.activemq.broker.jmx.{BrokerMBeanSupport, AnnotatedMBean}
 import org.apache.activemq.util._
 import org.apache.activemq.leveldb.util.{RetrySupport, FileSupport, Log}
 import org.apache.activemq.store.PList.PListIterator
@@ -171,13 +171,12 @@ class LevelDBStore extends LockableServi
   }
 
   override def toString: String = {
-    return "LevelDB:[" + directory.getAbsolutePath + "]"
+    return "LevelDB[" + directory.getAbsolutePath + "]"
   }
 
   def objectName = {
     var brokerON = brokerService.getBrokerObjectName
-    new ObjectName(brokerON.toString() +",persistentAdapter=LevelDBStore");
-
+    BrokerMBeanSupport.createPersistenceAdapterName(brokerON.toString, this.toString)
   }
 
   def retry[T](func : =>T):T = RetrySupport.retry(LevelDBStore, isStarted, func _)



Mime
View raw message