activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1496514 - in /activemq/trunk/activemq-leveldb-store: pom.xml src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala
Date Tue, 25 Jun 2013 15:12:24 GMT
Author: chirino
Date: Tue Jun 25 15:12:23 2013
New Revision: 1496514

URL: http://svn.apache.org/r1496514
Log:
Fixes AMQ-4599: Only package the pure java LevelDB driver by default

Modified:
    activemq/trunk/activemq-leveldb-store/pom.xml
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala

Modified: activemq/trunk/activemq-leveldb-store/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/pom.xml?rev=1496514&r1=1496513&r2=1496514&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb-store/pom.xml (original)
+++ activemq/trunk/activemq-leveldb-store/pom.xml Tue Jun 25 15:12:23 2013
@@ -77,6 +77,9 @@
       <artifactId>leveldbjni</artifactId>
       <version>${leveldbjni-version}</version>
     </dependency>
+    
+    <!-- Lets not include the JNI libs for now so that we can harden the pure java driver
more -->
+    <!--
     <dependency>
       <groupId>org.fusesource.leveldbjni</groupId>
       <artifactId>leveldbjni-osx</artifactId>
@@ -102,7 +105,8 @@
       <artifactId>leveldbjni-win64</artifactId>
       <version>1.5</version>
     </dependency>
-
+    -->
+    
     <!-- For Replication -->
     <dependency>
       <groupId>org.fusesource.hawtdispatch</groupId>

Modified: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala?rev=1496514&r1=1496513&r2=1496514&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala
(original)
+++ activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala
Tue Jun 25 15:12:23 2013
@@ -559,7 +559,10 @@ class LevelDBClient(store: LevelDBStore)
     }.headOption.getOrElse(throw new Exception("Could not load any of the index factory classes:
"+factoryNames))
 
     if( factory.getClass.getName == "org.iq80.leveldb.impl.Iq80DBFactory") {
-      warn("Using the pure java LevelDB implementation which is still experimental.  Production
users should use the JNI based LevelDB implementation instead.")
+      info("Using the pure java LevelDB implementation.")
+    }
+    if( factory.getClass.getName == "org.fusesource.leveldbjni.JniDBFactory") {
+      info("Using the JNI LevelDB implementation.")
     }
 
     indexOptions = new Options();



Mime
View raw message