activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1232572 - in /activemq/activemq-apollo/trunk: ./ apollo-distro/ apollo-distro/src/main/release/ apollo-karaf-feature/ apollo-karaf-feature/.redcar/ apollo-karaf-feature/src/main/resources/ apollo-stomp/src/main/scala/org/apache/activemq/ap...
Date Tue, 17 Jan 2012 21:03:48 GMT
Author: chirino
Date: Tue Jan 17 21:03:48 2012
New Revision: 1232572

URL: http://svn.apache.org/viewvc?rev=1232572&view=rev
Log:
Fixes APLO-126 : Deprecate the JDBM2 store as the leveldb store is faster and more stable.

Also remove the apollo-karaf-feature as that is not well maintained.

Removed:
    activemq/activemq-apollo/trunk/apollo-karaf-feature/.redcar/tags
    activemq/activemq-apollo/trunk/apollo-karaf-feature/pom.xml
    activemq/activemq-apollo/trunk/apollo-karaf-feature/src/main/resources/features.xml
Modified:
    activemq/activemq-apollo/trunk/apollo-distro/pom.xml
    activemq/activemq-apollo/trunk/apollo-distro/src/main/release/NOTICE
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
    activemq/activemq-apollo/trunk/apollo-website/src/documentation/getting-started.md
    activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-distro/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/pom.xml?rev=1232572&r1=1232571&r2=1232572&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/pom.xml Tue Jan 17 21:03:48 2012
@@ -47,11 +47,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-jdbm2</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
       <artifactId>apollo-bdb</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>

Modified: activemq/activemq-apollo/trunk/apollo-distro/src/main/release/NOTICE
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/NOTICE?rev=1232572&r1=1232571&r2=1232572&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/release/NOTICE (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/release/NOTICE Tue Jan 17 21:03:48
2012
@@ -12,7 +12,12 @@ The Apache Software Foundation (http://w
 
 -------------------------------------------------------------------------
 
-This product includes software (hawtdispatch,hawtbuf) developed at
+This product includes software (Scala) developed at
+EPFL, Lausanne (http://www.scala-lang.org/).
+
+-------------------------------------------------------------------------
+
+This product includes software (hawtdispatch,hawtbuf,levedbjni) developed at
 The FuseSource Corp (http://fusesource.com/).
 
 -------------------------------------------------------------------------
@@ -57,11 +62,6 @@ used (note that this software is not inc
 
 -------------------------------------------------------------------------
 
-This product includes software (jdbm2) developed by
-Cees De Groot, Alex Boisvert, Jan Kotek
-
--------------------------------------------------------------------------
-
 This product includes software (jersey) developed at
 Oracle and/or its affiliates.
 

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala?rev=1232572&r1=1232571&r2=1232572&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
Tue Jan 17 21:03:48 2012
@@ -593,8 +593,8 @@ class StompProtocolHandler extends Proto
     protocol_filters = ProtocolFilter.create_filters(config.protocol_filters.toList, this)
 
     import OptionSupport._
-    Option(config.max_data_length).map(MemoryPropertyEditor.parse(_)).foreach( codec.max_data_length
= _ )
-    Option(config.max_header_length).map(MemoryPropertyEditor.parse(_)).foreach( codec.max_header_length
= _ )
+    Option(config.max_data_length).map(MemoryPropertyEditor.parse(_).toInt).foreach( codec.max_data_length
= _ )
+    Option(config.max_header_length).map(MemoryPropertyEditor.parse(_).toInt).foreach( codec.max_header_length
= _ )
     config.max_headers.foreach( codec.max_headers = _ )
 
     if( config.queue_prefix!=null ||

Modified: activemq/activemq-apollo/trunk/apollo-website/src/documentation/getting-started.md
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/documentation/getting-started.md?rev=1232572&r1=1232571&r2=1232572&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/documentation/getting-started.md (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/documentation/getting-started.md Tue
Jan 17 21:03:48 2012
@@ -85,21 +85,3 @@ the admin interface will be accessible a
 * [http://127.0.0.1:61680/](http://127.0.0.1:61680/) or [https://127.0.0.1:61681/](https://127.0.0.1:61681/)
 
 The default login id and password is `admin` and `password`.
-
-## Installing Recommended Optional Features
-
-### Switching to the BDB Store
-
-If your on Windows, it is highly recommended that you switch the the BDB based message
-store due to the LevelDB store implementation on Windows still being buggy.
-Unfortunately, BDB cannot be redistributed by Apache so you must first download the 
-bdb jar directly from Oracle at 
-[je-4.1.10.jar](http://download.oracle.com/maven/com/sleepycat/je/4.1.10/je-4.1.10.jar) 
-and then copy it into the `${APOLLO_HOME}/lib` directory.
-
-For those of you with curl installed, you can just run:
-
-    curl http://download.oracle.com/maven/com/sleepycat/je/4.1.10/je-4.1.10.jar > %APOLLO_HOME%\lib\je-4.1.10.jar
-    
-Once installed, you then need to update the configuration by editing the `etc/apollo.xml`
file and
-replace `leveldb_store` with `bdb_store`.

Modified: activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md?rev=1232572&r1=1232571&r2=1232572&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md Tue Jan
17 21:03:48 2012
@@ -362,10 +362,10 @@ implementations currently supported are:
 * [BDB Store](#BDB_Store) : is a file based message store implemented using the 
   [Sleepycat BDB](http://en.wikipedia.org/wiki/Berkeley_DB) library.
   This is the most stable implementation.
+
+<!-- These modules are deprecated.. don't expose in end user doco.
 * [JDBM2 Store](#JDBM2_Store) : is a file based message store implemented using the 
   [JDBM2](http://code.google.com/p/jdbm2/) library.
-
-<!-- 
 * [HawtDB Store](#HawtDB_Store) : is a file based message store implemented using the 
   [HawtDB](http://hawtdb.fusesource.org/) library.  This implementation
   has known bugs and not recommend to be used unless your good with a 
@@ -462,6 +462,8 @@ A `bdb_store` element may be configured 
 * `read_threads` : The number of concurrent read threads to use when
   accessing the store. The value defaults to 10.
 
+<!-- These modules are deprecated.. don't expose in end user doco.
+
 ###### JDBM2 Store
 
 The JDBM2 store implementation is redistributable by apache so it can 
@@ -498,7 +500,6 @@ A `jdbm2_store` element may be configure
   this attribute is not set, it will default to 60 seconds. Set to -1 
   to disable compaction altogether.
 
-<!--  
 ###### HawtDB Store
 
 The HawtDB store implementation is redistributable by apache so it can 

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1232572&r1=1232571&r2=1232572&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Tue Jan 17 21:03:48 2012
@@ -169,14 +169,12 @@
     <module>apollo-selector</module>
     <module>apollo-leveldb</module>
     <module>apollo-bdb</module>
-    <module>apollo-jdbm2</module>
     <module>apollo-dto</module>
     <module>apollo-stomp</module>
     <module>apollo-web</module>
     <module>apollo-cli</module>
     <module>apollo-website</module>
     <module>apollo-distro</module>
-    <module>apollo-karaf-feature</module>
   </modules>
 
   <scm>
@@ -474,6 +472,7 @@
         <!-- <module>apollo-cassandra</module> -->
         <module>apollo-hawtdb</module>
         <module>apollo-openwire</module>
+        <module>apollo-jdbm2</module>
       </modules>
     </profile>
 



Mime
View raw message