diff options
Diffstat (limited to 'java/test-profiles')
19 files changed, 19 insertions, 23 deletions
diff --git a/java/test-profiles/JavaDerbyExcludes b/java/test-profiles/JavaDerbyExcludes index 931a0b0ddb..7ea00680c1 100644 --- a/java/test-profiles/JavaDerbyExcludes +++ b/java/test-profiles/JavaDerbyExcludes @@ -17,6 +17,4 @@ // under the License. // -org.apache.qpid.server.store.berkeleydb.BDBMessageStoreTest#* -org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#* -org.apache.qpid.server.store.berkeleydb.BDBBackupTest#* +org.apache.qpid.server.store.berkeleydb.* diff --git a/java/test-profiles/JavaTransientExcludes b/java/test-profiles/JavaTransientExcludes index cf11e99e89..168be7736c 100644 --- a/java/test-profiles/JavaTransientExcludes +++ b/java/test-profiles/JavaTransientExcludes @@ -40,6 +40,4 @@ org.apache.qpid.server.store.MessageStoreTest#testDurableQueueRemoval org.apache.qpid.server.store.MessageStoreTest#testExchangePersistence org.apache.qpid.server.store.MessageStoreTest#testDurableExchangeRemoval -org.apache.qpid.server.store.berkeleydb.BDBMessageStoreTest#* -org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#* -org.apache.qpid.server.store.berkeleydb.BDBBackupTest#* +org.apache.qpid.server.store.berkeleydb.* diff --git a/java/test-profiles/java-bdb-spawn.0-10.testprofile b/java/test-profiles/java-bdb-spawn.0-10.testprofile index cba348b67f..2cef1fd53e 100644 --- a/java/test-profiles/java-bdb-spawn.0-10.testprofile +++ b/java/test-profiles/java-bdb-spawn.0-10.testprofile @@ -23,7 +23,7 @@ broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test- broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-bdb-spawn.0-8.testprofile b/java/test-profiles/java-bdb-spawn.0-8.testprofile index 011fd9fe91..08da12c44c 100644 --- a/java/test-profiles/java-bdb-spawn.0-8.testprofile +++ b/java/test-profiles/java-bdb-spawn.0-8.testprofile @@ -23,7 +23,7 @@ broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FIL broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-bdb-spawn.0-9-1.testprofile b/java/test-profiles/java-bdb-spawn.0-9-1.testprofile index 7d178d958f..240ade18c0 100644 --- a/java/test-profiles/java-bdb-spawn.0-9-1.testprofile +++ b/java/test-profiles/java-bdb-spawn.0-9-1.testprofile @@ -23,7 +23,7 @@ broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FIL broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-bdb-spawn.0-9.testprofile b/java/test-profiles/java-bdb-spawn.0-9.testprofile index f5c321dc02..5e3ca0b470 100644 --- a/java/test-profiles/java-bdb-spawn.0-9.testprofile +++ b/java/test-profiles/java-bdb-spawn.0-9.testprofile @@ -23,7 +23,7 @@ broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FIL broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-bdb.0-10.testprofile b/java/test-profiles/java-bdb.0-10.testprofile index 3ef93a68cb..4ac4c3baf2 100644 --- a/java/test-profiles/java-bdb.0-10.testprofile +++ b/java/test-profiles/java-bdb.0-10.testprofile @@ -24,7 +24,7 @@ broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test- broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-bdb.0-8.testprofile b/java/test-profiles/java-bdb.0-8.testprofile index 322168064f..7590f7b858 100644 --- a/java/test-profiles/java-bdb.0-8.testprofile +++ b/java/test-profiles/java-bdb.0-8.testprofile @@ -24,7 +24,7 @@ broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FIL broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-bdb.0-9-1.testprofile b/java/test-profiles/java-bdb.0-9-1.testprofile index f0b34c5f67..1543bcd0ad 100644 --- a/java/test-profiles/java-bdb.0-9-1.testprofile +++ b/java/test-profiles/java-bdb.0-9-1.testprofile @@ -24,7 +24,7 @@ broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FIL broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-bdb.0-9.testprofile b/java/test-profiles/java-bdb.0-9.testprofile index 1ac4ef74c0..5a6a6536b4 100644 --- a/java/test-profiles/java-bdb.0-9.testprofile +++ b/java/test-profiles/java-bdb.0-9.testprofile @@ -24,7 +24,7 @@ broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FIL broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-dby-spawn.0-10.testprofile b/java/test-profiles/java-dby-spawn.0-10.testprofile index 5bd6f330d5..3b57dca346 100644 --- a/java/test-profiles/java-dby-spawn.0-10.testprofile +++ b/java/test-profiles/java-dby-spawn.0-10.testprofile @@ -23,7 +23,7 @@ broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test- broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-derby.xml -messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-dby-spawn.0-8.testprofile b/java/test-profiles/java-dby-spawn.0-8.testprofile index 3a6023e78f..27b4b30d0f 100644 --- a/java/test-profiles/java-dby-spawn.0-8.testprofile +++ b/java/test-profiles/java-dby-spawn.0-8.testprofile @@ -24,7 +24,7 @@ broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-derby.xml broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT -messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-dby-spawn.0-9-1.testprofile b/java/test-profiles/java-dby-spawn.0-9-1.testprofile index 0e910e8ce5..8a9ea0b55e 100644 --- a/java/test-profiles/java-dby-spawn.0-9-1.testprofile +++ b/java/test-profiles/java-dby-spawn.0-9-1.testprofile @@ -24,7 +24,7 @@ broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-derby.xml broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT -messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-dby-spawn.0-9.testprofile b/java/test-profiles/java-dby-spawn.0-9.testprofile index 232586623c..1f6c2877da 100644 --- a/java/test-profiles/java-dby-spawn.0-9.testprofile +++ b/java/test-profiles/java-dby-spawn.0-9.testprofile @@ -24,7 +24,7 @@ broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-derby.xml broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT -messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-dby.0-10.testprofile b/java/test-profiles/java-dby.0-10.testprofile index 9c23d18f45..51f6c4ca6f 100644 --- a/java/test-profiles/java-dby.0-10.testprofile +++ b/java/test-profiles/java-dby.0-10.testprofile @@ -24,7 +24,7 @@ broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test- broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-derby.xml -messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-dby.0-8.testprofile b/java/test-profiles/java-dby.0-8.testprofile index 161c3dcfe2..68227e87c5 100644 --- a/java/test-profiles/java-dby.0-8.testprofile +++ b/java/test-profiles/java-dby.0-8.testprofile @@ -25,7 +25,7 @@ broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-derby.xml broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT -messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-dby.0-9-1.testprofile b/java/test-profiles/java-dby.0-9-1.testprofile index b5561782a7..2a3644d39a 100644 --- a/java/test-profiles/java-dby.0-9-1.testprofile +++ b/java/test-profiles/java-dby.0-9-1.testprofile @@ -25,7 +25,7 @@ broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-derby.xml broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT -messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-dby.0-9.testprofile b/java/test-profiles/java-dby.0-9.testprofile index 289554e618..7fd70665c2 100644 --- a/java/test-profiles/java-dby.0-9.testprofile +++ b/java/test-profiles/java-dby.0-9.testprofile @@ -25,7 +25,7 @@ broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-derby.xml broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT -messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/testprofile.defaults b/java/test-profiles/testprofile.defaults index b0c1aea661..2c3c92e922 100644 --- a/java/test-profiles/testprofile.defaults +++ b/java/test-profiles/testprofile.defaults @@ -21,7 +21,7 @@ java.naming.provider.url=${test.profiles}/test-provider.properties broker.ready=Listening on TCP broker.config=build/etc/config-systests.xml -messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore +messagestorefactory.class.name=org.apache.qpid.server.store.MemoryMessageStoreFactory broker.protocol.excludes= broker.persistent=false |