@@ -4842,6 +4875,7 @@ memory usage.
+
@@ -4946,6 +4980,7 @@ manage memory usage.
+
diff --git a/activemq-core/src/main/resources/activemq.xsd.html b/activemq-core/src/main/resources/activemq.xsd.html
index 7c853ea26c..598df803a6 100644
--- a/activemq-core/src/main/resources/activemq.xsd.html
+++ b/activemq-core/src/main/resources/activemq.xsd.html
@@ -140,6 +140,7 @@ performed against the Message store are done as a single uow.| org.apache
{@link Journal} and then check pointing asynchronously on a timeout with some
other long term persistent storage. | org.apache.activemq.store.journal.JournalPersistenceAdapter |
| journaledJDBC | Creates a default persistence model using the Journal and JDBC | org.apache.activemq.store.PersistenceAdapterFactoryBean |
+ | kahaDB | | org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter |
| kahaPersistenceAdapter | | org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter |
| lDAPAuthorizationMap | An {@link AuthorizationMap} which uses LDAP | org.apache.activemq.security.LDAPAuthorizationMap |
| lastImageSubscriptionRecoveryPolicy | This implementation of {@link SubscriptionRecoveryPolicy} will only keep the
@@ -459,7 +460,7 @@ consume a given message |
| networkConnectorURIs | (<spring:bean/>)* | |
| networkConnectors | (ldapNetworkConnector | multicastNetworkConnector | networkConnector)* | Sets the network connectors which this broker will use to connect to
other brokers in a federated network |
- | persistenceAdapter | amqPersistenceAdapter | jdbcPersistenceAdapter | journalPersistenceAdapter | kahaPersistenceAdapter | memoryPersistenceAdapter | Sets the persistence adaptor implementation to use for this broker |
+ | persistenceAdapter | amqPersistenceAdapter | jdbcPersistenceAdapter | journalPersistenceAdapter | kahaPersistenceAdapter | kahaDB | memoryPersistenceAdapter | Sets the persistence adaptor implementation to use for this broker |
| persistenceFactory | amqPersistenceAdapterFactory | journaledJDBC | |
| persistenceTaskRunnerFactory | <spring:bean/> | |
| plugins | (authorizationPlugin | connectionDotFilePlugin | destinationDotFilePlugin | jaasAuthenticationPlugin | jaasCertificateAuthenticationPlugin | loggingBrokerPlugin | multicastTraceBrokerPlugin | simpleAuthenticationPlugin | timeStampingBrokerPlugin | udpTraceBrokerPlugin)* | Sets a number of broker plugins to install such as for security
@@ -935,7 +936,7 @@ BrokerService when the Connector is embedded |
@@ -966,6 +967,21 @@ false so that messages actually reside long term in the JDBC database.
| statements | statements | |
| taskRunnerFactory | <spring:bean/> | |
+
+
+ | Attribute | Type | Description |
+
|---|
| brokerName | xs:string | |
+ | directory | xs:string | |
+ | journalMaxFileLength | xs:long | |
+ | indexWriteBatchSize | xs:integer | |
+ | enableIndexWriteAsync | xs:boolean | |
+ | enableJournalDiskSyncs | xs:boolean | |
+
+
+ | Element | Type | Description |
+
|---|
| size | <spring:bean/> | |
+ | usageManager | systemUsage | |
+
@@ -1541,7 +1557,7 @@ becomes available
| Element | Type | Description |
-
|---|
| adapter | amqPersistenceAdapter | jdbcPersistenceAdapter | journalPersistenceAdapter | kahaPersistenceAdapter | memoryPersistenceAdapter | |
+ | adapter | amqPersistenceAdapter | jdbcPersistenceAdapter | journalPersistenceAdapter | kahaPersistenceAdapter | kahaDB |memoryPersistenceAdapter | |
| memoryUsage | memoryUsage | |
| parent | systemUsage | |
| storeUsage | storeUsage | |
diff --git a/activemq-core/src/main/resources/activemq.xsd.wiki b/activemq-core/src/main/resources/activemq.xsd.wiki
index 9970cfa48b..6f5990261a 100644
--- a/activemq-core/src/main/resources/activemq.xsd.wiki
+++ b/activemq-core/src/main/resources/activemq.xsd.wiki
@@ -307,6 +307,7 @@ performed against the Message store are done as a single uow.{html} |
| _[|#journalPersistenceAdapter-element]_ | {html}An implementation of {@link PersistenceAdapter} designed for use with a
{@link Journal} and then check pointing asynchronously on a timeout with some
other long term persistent storage.{html} |
+ | _[|#kahaDB-element]_ | {html}{html} |
| _[|#kahaPersistenceAdapter-element]_ | {html}{html} |
| _[|#memoryPersistenceAdapter-element]_ | {html}{html} |
@@ -1235,6 +1236,20 @@ journal{html} |
journal and just stores a reference to the messages in JDBC. Defaults to
false so that messages actually reside long term in the JDBC database.{html} |
+{anchor:kahaDB-element}
+h3. The _[|#kahaDB-element]_ Element
+ {html}{html}
+h4. Properties
+ || Property Name || Type || Description ||
+ | brokerName | _java.lang.String_ | {html}{html} |
+ | directory | _java.io.File_ | {html}{html} |
+ | journalMaxFileLength | _long_ | {html}{html} |
+ | indexWriteBatchSize | _int_ | {html}{html} |
+ | enableIndexWriteAsync | _boolean_ | {html}{html} |
+ | enableJournalDiskSyncs | _boolean_ | {html}{html} |
+ | size | _java.util.concurrent.atomic.AtomicLong_ | {html}{html} |
+ | usageManager | _[org.apache.activemq.usage.SystemUsage|#org.apache.activemq.usage.SystemUsage-types]_ | {html}{html} |
+
{anchor:kahaPersistenceAdapter-element}
h3. The _[|#kahaPersistenceAdapter-element]_ Element
{html}{html}
@@ -2252,6 +2267,7 @@ performed against the Message store are done as a single uow.{html} |
{@link Journal} and then check pointing asynchronously on a timeout with some
other long term persistent storage.{html} |
| _[|#journaledJDBC-element]_ | {html}Creates a default persistence model using the Journal and JDBC{html} |
+ | _[|#kahaDB-element]_ | {html}{html} |
| _[|#kahaPersistenceAdapter-element]_ | {html}{html} |
| _[|#lDAPAuthorizationMap-element]_ | {html}An {@link AuthorizationMap} which uses LDAP{html} |
| _[|#lastImageSubscriptionRecoveryPolicy-element]_ | {html}This implementation of {@link SubscriptionRecoveryPolicy} will only keep the