Author: chirino
Date: Sat Jan 21 17:13:21 2012
New Revision: 1234368
URL: http://svn.apache.org/viewvc?rev=1234368&view=rev
Log:
Drop the cassandra, jdbm2, and hawtdb store implementations. They were
experimental and at this point keeping them is just increasing the maintenance
burden required when the store interfaces need to be updated.
Removed:
activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml
activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/modules.index
activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index
activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/jaxb.index
activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/package-info.java
activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraClient.scala
activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStore.scala
activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStoreFactory.scala
activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/ExtensionModule.scala
activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/Schema.scala
activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/CassandraStoreDTO.java
activemq/activemq-apollo/trunk/apollo-cassandra/src/resources/scala/org/apache/activemq/apollo/store/cassandra/dto/jaxb.index
activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/simple.xml
activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/log4j.properties
activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/storage-conf.xml
activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraServerMixin.scala
activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStoreTest.scala
activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/XmlCodecTest.java
activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml
activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/jaxb-module.index
activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index
activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/jaxb.index
activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/ExtensionJaxbModule.scala
activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBClient.scala
activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStore.scala
activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreFactory.scala
activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/Helper.scala
activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/RecordLog.scala
activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreDTO.java
activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.java
activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/package-info.java
activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.jade
activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/ide-resources/log4j.properties
activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/log4j.properties
activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/simple.xml
activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreTest.scala
activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/XmlCodecTest.java
activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml
activemq/activemq-apollo/trunk/apollo-jdbm2/src/main/resources/META-INF/services/org.apache.activemq.apollo/jaxb-module.index
activemq/activemq-apollo/trunk/apollo-jdbm2/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index
activemq/activemq-apollo/trunk/apollo-jdbm2/src/main/resources/org/apache/activemq/apollo/broker/store/jdbm2/dto/jaxb.index
activemq/activemq-apollo/trunk/apollo-jdbm2/src/main/scala/org/apache/activemq/apollo/broker/store/jdbm2/ExtensionJaxbModule.scala
activemq/activemq-apollo/trunk/apollo-jdbm2/src/main/scala/org/apache/activemq/apollo/broker/store/jdbm2/JDBM2Client.scala
activemq/activemq-apollo/trunk/apollo-jdbm2/src/main/scala/org/apache/activemq/apollo/broker/store/jdbm2/JDBM2Store.scala
activemq/activemq-apollo/trunk/apollo-jdbm2/src/main/scala/org/apache/activemq/apollo/broker/store/jdbm2/JDBM2StoreFactory.scala
activemq/activemq-apollo/trunk/apollo-jdbm2/src/main/scala/org/apache/activemq/apollo/broker/store/jdbm2/dto/JDBM2StoreDTO.java
activemq/activemq-apollo/trunk/apollo-jdbm2/src/main/scala/org/apache/activemq/apollo/broker/store/jdbm2/dto/JDBM2StoreStatusDTO.java
activemq/activemq-apollo/trunk/apollo-jdbm2/src/main/scala/org/apache/activemq/apollo/broker/store/jdbm2/dto/package-info.java
activemq/activemq-apollo/trunk/apollo-jdbm2/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/jdbm2/dto/JDBM2StoreStatusDTO.jade
activemq/activemq-apollo/trunk/apollo-jdbm2/src/test/ide-resources/log4j.properties
activemq/activemq-apollo/trunk/apollo-jdbm2/src/test/resources/log4j.properties
activemq/activemq-apollo/trunk/apollo-jdbm2/src/test/resources/org/apache/activemq/apollo/broker/store/jdbm2/dto/simple.xml
activemq/activemq-apollo/trunk/apollo-jdbm2/src/test/scala/org/apache/activemq/apollo/broker/store/jdbm2/JDBM2StoreTest.scala
activemq/activemq-apollo/trunk/apollo-jdbm2/src/test/scala/org/apache/activemq/apollo/broker/store/jdbm2/dto/XmlCodecTest.java
Modified:
activemq/activemq-apollo/trunk/apollo-cli/pom.xml
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
activemq/activemq-apollo/trunk/apollo-distro/pom.xml
activemq/activemq-apollo/trunk/apollo-dto/pom.xml
activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/log4j.properties
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties
activemq/activemq-apollo/trunk/apollo-util/src/test/resources/log4j.properties
activemq/activemq-apollo/trunk/apollo-website/pom.xml
activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
activemq/activemq-apollo/trunk/pom.xml
Modified: activemq/activemq-apollo/trunk/apollo-cli/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/pom.xml?rev=1234368&r1=1234367&r2=1234368&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/pom.xml Sat Jan 21 17:13:21 2012
@@ -176,42 +176,6 @@
<plugins>
- <!-- Generate a test jar for the test cases in this package -->
- <!-- <plugin>
- <groupId>org.fusesource.mvnplugins</groupId>
- <artifactId>maven-fab-plugin</artifactId>
- <version>1.16-SNAPSHOT</version>
- <configuration>
- <descriptor>
- <Name>apollo</Name>
- <Long-Description>
- ActiveMQ Apollo is a faster, more reliable, easier to maintain
messaging
- broker built from the foundations of the original ActiveMQ. It
accomplishes
- this using a radically different threading and message
dispatching architecture.
-
- In itâs current incarnation, Apollo only supports the STOMP
protocol but just
- like the original ActiveMQ, itâs been designed to be a multi
protocol broker.
- In future versions it should get OpenWire support so it can be
compatible
- with ActiveMQ 5.x JMS clients.
- </Long-Description>
- <Endorsed-Extensions>
- ${project.groupId}:apollo-jdbm2:${project.version}
- ${project.groupId}:apollo-bdb:${project.version}
- ${project.groupId}:apollo-stomp:${project.version}
- ${project.groupId}:apollo-web:${project.version}
- </Endorsed-Extensions>
- <Default-Extensions>bdb stomp web</Default-Extensions>
- </descriptor>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin> -->
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Modified:
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala?rev=1234368&r1=1234367&r2=1234368&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
(original)
+++
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
Sat Jan 21 17:13:21 2012
@@ -269,10 +269,6 @@ class Create extends Action {
"""<!-- You can delete this element if you want to disable persistence for
this virtual host -->
<bdb_store directory="${apollo.base}/data"/>
"""
- } else if( can_load("jdbm.RecordManagerFactory") ) {
- """<!-- You can delete this element if you want to disable persistence for
this virtual host -->
- <jdbm2_store directory="${apollo.base}/data"/>
- """
} else {
"""<!-- Perisistence disabled because no store implementations were found
on the classpath -->
<!-- <bdb_store directory="${apollo.base}/data"/> -->
Modified: activemq/activemq-apollo/trunk/apollo-distro/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/pom.xml?rev=1234368&r1=1234367&r2=1234368&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/pom.xml Sat Jan 21 17:13:21
2012
@@ -120,14 +120,9 @@
<dependencies>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>apollo-hawtdb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>apollo-openwire</artifactId>
+ <version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>apollo-cassandra</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
</dependencies>
</profile>
Modified: activemq/activemq-apollo/trunk/apollo-dto/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/pom.xml?rev=1234368&r1=1234367&r2=1234368&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/pom.xml Sat Jan 21 17:13:21 2012
@@ -114,8 +114,6 @@
<include name="**/package-info.java" />
<include name="**/*DTO.java" />
<exclude name="apollo-openwire/**" />
- <exclude name="apollo-hawtdb/**" />
- <exclude name="apollo-cassandra/**" />
<exclude name="**/.git/**" />
<exclude name="**/.svn/**" />
</schemagen>
Modified: activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/pom.xml?rev=1234368&r1=1234367&r2=1234368&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/pom.xml Sat Jan 21 17:13:21
2012
@@ -60,7 +60,7 @@
<!-- so we can test against a persisentce store -->
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>apollo-hawtdb</artifactId>
+ <artifactId>apollo-leveldb</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified:
activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/log4j.properties?rev=1234368&r1=1234367&r2=1234368&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/log4j.properties
(original)
+++
activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/log4j.properties
Sat Jan 21 17:13:21 2012
@@ -29,7 +29,6 @@ log4j.logger.org.apache.activemq.apollo.
log4j.logger.org.apache.activemq.apollo.broker=TRACE
log4j.logger.org.apache.activemq.apollo.web=TRACE
log4j.logger.org.apache.activemq.apollo.cli=TRACE
-log4j.logger.org.apache.activemq.apollo.broker.store.hawtdb=TRACE
# Console Settings
log4j.appender.console=org.apache.log4j.ConsoleAppender
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties?rev=1234368&r1=1234367&r2=1234368&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties
(original)
+++
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties
Sat Jan 21 17:13:21 2012
@@ -28,7 +28,6 @@ log4j.logger.org.apache.activemq.apollo=
# log4j.logger.org.apache.activemq.apollo.broker=DEBUG
# log4j.logger.org.apache.activemq.apollo.web=DEBUG
# log4j.logger.org.apache.activemq.apollo.cli=DEBUG
-# log4j.logger.org.apache.activemq.apollo.broker.store.hawtdb=DEBUG
# Console Settings
log4j.appender.console=org.apache.log4j.ConsoleAppender
Modified:
activemq/activemq-apollo/trunk/apollo-util/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/test/resources/log4j.properties?rev=1234368&r1=1234367&r2=1234368&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-util/src/test/resources/log4j.properties
(original)
+++
activemq/activemq-apollo/trunk/apollo-util/src/test/resources/log4j.properties
Sat Jan 21 17:13:21 2012
@@ -20,7 +20,6 @@
#
log4j.rootLogger=WARN, console, file
log4j.logger.org.apache.activemq=INFO
-log4j.logger.org.fusesource.hawtdb=TRACE
# Console will only display warnnings
log4j.appender.console=org.apache.log4j.ConsoleAppender
Modified: activemq/activemq-apollo/trunk/apollo-website/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/pom.xml?rev=1234368&r1=1234367&r2=1234368&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-website/pom.xml Sat Jan 21 17:13:21
2012
@@ -181,8 +181,6 @@
<include name="**/package-info.java" />
<include name="**/*DTO.java" />
<exclude name="apollo-openwire/**" />
- <exclude name="apollo-cassandra/**" />
- <exclude name="apollo-hawtdb/**" />
<exclude name="**/.git/**" />
<exclude name="**/.svn/**" />
</schemagen>
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=1234368&r1=1234367&r2=1234368&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
Sat Jan 21 17:13:21 2012
@@ -363,16 +363,6 @@ implementations currently supported are:
[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
- debugger.
--->
-
-
###### LevelDB Store
The LevelDB store is the default store which a newly created Broker instance
@@ -462,77 +452,6 @@ 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
-be used out of the box without having to install any additional software.
-The problem with this store is that it's single threaded in nature and
-subsequently has several unwanted performance problems. For example,
-the store periodically will compact itself to reclaim disk space but
-the compaction is a slow process which pauses access to the store while
-the compaction is running.
-
-You can enable the store by adding a `jdbm2_store` element
-inside your `virtual_host`. Example:
-
-{pygmentize:: xml}
- ...
- <virtual_host id="default">
- ...
- <jdbm2_store directory="${apollo.base}/data"/>
- ..
- </virtual_host>
- ...
-{pygmentize}
-
-A `jdbm2_store` element may be configured with the following attributes:
-
-* `directory` : The directory which the store will use to hold it's data
- files. The store will create the directory if it does not already
- exist.
-* `flush_delay` : The flush delay is the amount of time in milliseconds
- that a store will delay persisting a messaging unit of work in hopes
- that it will be invalidated shortly thereafter by another unit of work
- which would negate the operation.
-* `compact_interval` : how often the store is compacted in seconds. If
- 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
-be used out of the box without having to install any additional software.
-The problem is that it is still unstable and you should only use it
-if your willing to dive in with a debugger to help solidify the
-implementation.
-
-You can enable the store by adding a `hawtdb_store` element
-inside your `virtual_host`. Example:
-
-{pygmentize:: xml}
- ...
- <virtual_host id="default">
- ...
- <hawtdb_store directory="${apollo.base}/data"/>
- ..
- </virtual_host>
- ...
-{pygmentize}
-
-A `hawtdb_store` element may be configured with the following attributes:
-
-* `directory` : The directory which the store will use to hold it's data
- files. The store will create the directory if it does not already
- exist.
-* `flush_delay` : The flush delay is the amount of time in milliseconds
- that a store will delay persisting a messaging unit of work in hopes
- that it will be invalidated shortly thereafter by another unit of work
- which would negate the operation.
-
--->
-
### Security
#### The SSL/TLS Transport
@@ -972,7 +891,7 @@ to:
The stores which support exporting and importing are:
* [BDB Store](#BDB_Store)
-* [JDBM2 Store](#JDBM2_Store)
+* [LevelDB Store](#LevelDB_Store)
The broker must be stopped before using the import or export commands. Be
careful when importing an archive, since it will first purge the message
Modified: activemq/activemq-apollo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1234368&r1=1234367&r2=1234368&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Sat Jan 21 17:13:21 2012
@@ -100,7 +100,6 @@
<hawtbuf-version>1.8</hawtbuf-version>
<stompjms-version>1.7</stompjms-version>
- <jdbm-version>2.0.1</jdbm-version>
<bdb-version>4.1.10</bdb-version>
<leveldb-api-version>0.1</leveldb-api-version>
@@ -126,8 +125,6 @@
<!-- disable unique version timestamps in snapshots -->
<uniqueVersion>false</uniqueVersion>
- <cascal-version>1.3-SNAPSHOT</cascal-version>
- <hawtdb-version>1.6</hawtdb-version>
<josql-version>1.5</josql-version>
<!-- osgi stuff -->
@@ -470,10 +467,7 @@
<profile>
<id>unstable</id>
<modules>
- <!-- <module>apollo-cassandra</module> -->
- <module>apollo-hawtdb</module>
<module>apollo-openwire</module>
- <module>apollo-jdbm2</module>
</modules>
</profile>
