refs/heads/java-broker-config-store-changes - qpid

commit: 676b0069419e84024417ea72f46487ae003dfd4c
[log]
author: Robert Godfrey <rgodfrey@apache.org>
Fri Apr 04 22:10:24 2014 +0000
committer: Robert Godfrey <rgodfrey@apache.org>
Fri Apr 04 22:10:24 2014 +0000
tree: 563df3e3637b1868857d4e30e6ac7e356c8ad344
parent: 0a64e2b857dc189a621d51dffedf573746bd08e5 [diff]

Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-config-store-changes@1584926 13f79535-47bb-0310-9956-ffa450edef68

qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHost.java[diff]
qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java[diff]
qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/Xid.java[Deleted - diff]
qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/XidBinding.java[diff]
qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java[Renamed from qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java - diff]
qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java[diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/BrokerStoreUpgrader.java[diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java[diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java[diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java[diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java[diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java[diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfiguredObjectRecordRecoveverAndUpgrader.java[Added - diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java[diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java[diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStore.java[diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStoreRecoveryHandler.java[Deleted - diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/NullMessageStore.java[diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java[Deleted - diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Xid.java[Added - diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/handler/ConfiguredObjectRecordHandler.java[Added - diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/handler/DistributedTransactionHandler.java[Copied from qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStoreFactory.java - diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/handler/MessageHandler.java[Copied from qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStoreFactory.java - diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/handler/MessageInstanceHandler.java[Copied from qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStoreFactory.java - diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java[diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/MessageStoreRecoverer.java[Added - diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java[diff]
qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java[Deleted - diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java[diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java[diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreConfigurationTest.java[diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java[diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java[diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java[diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java[diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java[diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java[diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestRecord.java[Added - diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java[Deleted - diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java[diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java[diff]
qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MessageStoreRecovererTest.java[Added - diff]
qpid/java/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory[diff]
qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java[diff]
qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java[diff]
qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java[diff]
qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java[diff]
qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java[diff]
qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java[diff]
qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java[diff]
qpid/java/broker-plugins/memory-store/pom.xml[diff]
qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java[diff]
qpid/java/broker-plugins/memory-store/src/test/java/org/apache/qpid/server/store/MemoryMessageStoreTest.java[Renamed from qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStoreFactory.java - diff]
qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java[diff]
qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java[diff]
qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java[Renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java - diff]
qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java[diff]
qpid/java/test-profiles/CPPExcludes[diff]
qpid/java/test-profiles/JavaBDBExcludes[diff]
qpid/java/test-profiles/JavaTransientExcludes[diff]

60 files changed

tree: 563df3e3637b1868857d4e30e6ac7e356c8ad344

qpid/
.gitignore