From cbcb239474c989b1646c81e0e1e613f8758fa411 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Sat, 24 Sep 2011 20:16:00 +0000 Subject: QPID-3504: add the Java broker bdbstore to the build as an optional module git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1175235 13f79535-47bb-0310-9956-ffa450edef68 --- java/test-profiles/JavaBDBExcludes | 22 +++++++++++++ java/test-profiles/JavaDerbyExcludes | 21 ++++++++++++ java/test-profiles/JavaTransientExcludes | 3 ++ java/test-profiles/java-bdb-spawn.0-10.testprofile | 32 +++++++++++++++++++ .../test-profiles/java-bdb-spawn.0-9-1.testprofile | 37 ++++++++++++++++++++++ java/test-profiles/java-bdb.0-10.testprofile | 32 +++++++++++++++++++ java/test-profiles/java-bdb.0-9-1.testprofile | 37 ++++++++++++++++++++++ java/test-profiles/java-dby-spawn.0-10.testprofile | 2 +- .../test-profiles/java-dby-spawn.0-9-1.testprofile | 2 +- java/test-profiles/java-dby.0-10.testprofile | 2 +- java/test-profiles/java-dby.0-9-1.testprofile | 2 +- 11 files changed, 188 insertions(+), 4 deletions(-) create mode 100644 java/test-profiles/JavaBDBExcludes create mode 100644 java/test-profiles/JavaDerbyExcludes create mode 100644 java/test-profiles/java-bdb-spawn.0-10.testprofile create mode 100644 java/test-profiles/java-bdb-spawn.0-9-1.testprofile create mode 100644 java/test-profiles/java-bdb.0-10.testprofile create mode 100644 java/test-profiles/java-bdb.0-9-1.testprofile (limited to 'java/test-profiles') diff --git a/java/test-profiles/JavaBDBExcludes b/java/test-profiles/JavaBDBExcludes new file mode 100644 index 0000000000..3fac01cb6d --- /dev/null +++ b/java/test-profiles/JavaBDBExcludes @@ -0,0 +1,22 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +//This test is subclassed within the bdbstore module to enable it to run and +//also add some bdb-specific tests. It is excluded to prevent running twice. +org.apache.qpid.server.store.MessageStoreTest#* diff --git a/java/test-profiles/JavaDerbyExcludes b/java/test-profiles/JavaDerbyExcludes new file mode 100644 index 0000000000..3caa360d48 --- /dev/null +++ b/java/test-profiles/JavaDerbyExcludes @@ -0,0 +1,21 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +org.apache.qpid.server.store.berkeleydb.BDBMessageStoreTest#* +org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#* diff --git a/java/test-profiles/JavaTransientExcludes b/java/test-profiles/JavaTransientExcludes index 2ea46795d9..2ce514461a 100644 --- a/java/test-profiles/JavaTransientExcludes +++ b/java/test-profiles/JavaTransientExcludes @@ -30,3 +30,6 @@ org.apache.qpid.server.store.MessageStoreTest#testQueuePersistence 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#* diff --git a/java/test-profiles/java-bdb-spawn.0-10.testprofile b/java/test-profiles/java-bdb-spawn.0-10.testprofile new file mode 100644 index 0000000000..d3778d3441 --- /dev/null +++ b/java/test-profiles/java-bdb-spawn.0-10.testprofile @@ -0,0 +1,32 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +broker.language=java +broker.type=spawned +broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/* +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=${project.root}/build/etc/config-systests-bdb.xml +messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes +broker.clean.between.tests=true +broker.persistent=true +broker.version=v0_10 + diff --git a/java/test-profiles/java-bdb-spawn.0-9-1.testprofile b/java/test-profiles/java-bdb-spawn.0-9-1.testprofile new file mode 100644 index 0000000000..3f2ea49e31 --- /dev/null +++ b/java/test-profiles/java-bdb-spawn.0-9-1.testprofile @@ -0,0 +1,37 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +broker.language=java +broker.type=spawned +broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/* +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=${project.root}/build/etc/config-systests-bdb.xml +messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +profile.excludes=JavaExcludes JavaPersistentExcludes JavaPre010Excludes JavaBDBExcludes +broker.clean.between.tests=true +broker.persistent=true +broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT +broker.version=v0_9_1 +# +# Do not enable. Allow client to attempt 0-10 and negotiate downwards +# +#qpid.amqp.version=0-91 + diff --git a/java/test-profiles/java-bdb.0-10.testprofile b/java/test-profiles/java-bdb.0-10.testprofile new file mode 100644 index 0000000000..d4f0cdb17c --- /dev/null +++ b/java/test-profiles/java-bdb.0-10.testprofile @@ -0,0 +1,32 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +broker.language=java +broker.type=internal +broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/* +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=${project.root}/build/etc/config-systests-bdb.xml +messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes +broker.clean.between.tests=true +broker.persistent=true +broker.version=v0_10 + diff --git a/java/test-profiles/java-bdb.0-9-1.testprofile b/java/test-profiles/java-bdb.0-9-1.testprofile new file mode 100644 index 0000000000..887eb9d5bc --- /dev/null +++ b/java/test-profiles/java-bdb.0-9-1.testprofile @@ -0,0 +1,37 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +broker.language=java +broker.type=internal +broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/* +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=${project.root}/build/etc/config-systests-bdb.xml +messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +profile.excludes=JavaExcludes JavaPersistentExcludes JavaPre010Excludes JavaBDBExcludes +broker.clean.between.tests=true +broker.persistent=true +broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT +broker.version=v0_9_1 +# +# Do not enable. Allow client to attempt 0-10 and negotiate downwards +# +#qpid.amqp.version=0-91 + diff --git a/java/test-profiles/java-dby-spawn.0-10.testprofile b/java/test-profiles/java-dby-spawn.0-10.testprofile index f51f5a26ac..9d7ca333b5 100644 --- a/java/test-profiles/java-dby-spawn.0-10.testprofile +++ b/java/test-profiles/java-dby-spawn.0-10.testprofile @@ -25,6 +25,6 @@ broker.ready=BRK-1004 broker.stopped=Exception broker.config=${project.root}/build/etc/config-systests-derby.xml messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore -profile.excludes=JavaPersistentExcludes Java010Excludes +profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes 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 1580cec1c5..7af1a8125a 100644 --- a/java/test-profiles/java-dby-spawn.0-9-1.testprofile +++ b/java/test-profiles/java-dby-spawn.0-9-1.testprofile @@ -26,7 +26,7 @@ broker.stopped=Exception broker.config=${project.root}/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 -profile.excludes=JavaPersistentExcludes JavaPre010Excludes +profile.excludes=JavaPersistentExcludes JavaDerbyExcludes 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 5a7b9b5cdc..f40d674ff8 100644 --- a/java/test-profiles/java-dby.0-10.testprofile +++ b/java/test-profiles/java-dby.0-10.testprofile @@ -25,6 +25,6 @@ broker.ready=BRK-1004 broker.stopped=Exception broker.config=${project.root}/build/etc/config-systests-derby.xml messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore -profile.excludes=JavaPersistentExcludes Java010Excludes +profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes 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 b4d506df05..43788a5386 100644 --- a/java/test-profiles/java-dby.0-9-1.testprofile +++ b/java/test-profiles/java-dby.0-9-1.testprofile @@ -26,7 +26,7 @@ broker.stopped=Exception broker.config=${project.root}/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 -profile.excludes=JavaPersistentExcludes JavaPre010Excludes +profile.excludes=JavaPersistentExcludes JavaDerbyExcludes JavaPre010Excludes broker.clean.between.tests=true broker.persistent=true # -- cgit v1.2.1