You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2011/09/24 22:16:02 UTC
svn commit: r1175235 [5/5] - in /qpid/trunk: ./ qpid/java/
qpid/java/bdbstore/ qpid/java/bdbstore/bin/ qpid/java/bdbstore/etc/
qpid/java/bdbstore/etc/scripts/ qpid/java/bdbstore/src/
qpid/java/bdbstore/src/main/ qpid/java/bdbstore/src/main/java/ qpid/j...
Modified: qpid/trunk/qpid/java/broker-plugins/experimental/info/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/info/build.xml?rev=1175235&r1=1175234&r2=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/info/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/info/build.xml Sat Sep 24 20:16:00 2011
@@ -20,7 +20,14 @@ nn - or more contributor license agreeme
-->
<project name="AMQ Broker Info Plugin" default="build">
- <property name="module.depends" value="common broker broker-plugins"/>
+ <condition property="info-plugin.optional.depends" value="bdbstore" else="">
+ <and>
+ <contains string="${modules.opt}" substring="bdbstore"/>
+ <contains string="${profile}" substring="bdb"/>
+ </and>
+ </condition>
+
+ <property name="module.depends" value="common broker broker-plugins ${info-plugin.optional.depends}"/>
<property name="module.test.depends" value="test broker/test management/common client systests common/test"/>
<property name="module.manifest" value="MANIFEST.MF"/>
<property name="module.plugin" value="true"/>
Modified: qpid/trunk/qpid/java/broker/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/build.xml?rev=1175235&r1=1175234&r2=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/build.xml (original)
+++ qpid/trunk/qpid/java/broker/build.xml Sat Sep 24 20:16:00 2011
@@ -76,6 +76,10 @@
<copy todir="${module.release}/lib/plugins" failonerror="true">
<fileset dir="${build.lib}/plugins"/>
</copy>
+ <!--copy optional bdbstore module if it exists -->
+ <copy todir="${module.release}/lib/" failonerror="false">
+ <fileset file="${build.lib}/${project.name}-bdbstore-${project.version}.jar"/>
+ </copy>
</target>
<target name="release-bin" depends="release-bin-tasks"/>
Modified: qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1175235&r1=1175234&r2=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Sat Sep 24 20:16:00 2011
@@ -135,3 +135,8 @@ broker-plugins-experimental-info.test.li
management-eclipse-plugin.test.libs=${test.libs}
management-common.test.libs=${test.libs}
+
+# optional bdbstore module deps
+bdb-je=lib/bdbstore/je-4.0.103.jar
+bdbstore.libs=${bdb-je}
+bdbstore.test.libs=${test.libs}
Copied: qpid/trunk/qpid/java/build.overrides (from r1174842, qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.overrides?p2=qpid/trunk/qpid/java/build.overrides&p1=qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile&r1=1174842&r2=1175235&rev=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile (original)
+++ qpid/trunk/qpid/java/build.overrides Sat Sep 24 20:16:00 2011
@@ -16,15 +16,9 @@
# specific language governing permissions and limitations
# under the License.
#
-broker.language=java
-broker.version=v0_10
-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-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
-profile.excludes=JavaPersistentExcludes Java010Excludes
-broker.clean.between.tests=true
-broker.persistent=true
+
+# File to allow overriding default values of properties within the build system
+# without having to specify them on the command line on every build execution
+
+# Override the setting for the optional modules to be built
+#modules.opt=bdbstore
Modified: qpid/trunk/qpid/java/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=1175235&r1=1175234&r2=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Sat Sep 24 20:16:00 2011
@@ -22,6 +22,8 @@
<import file="common.xml"/>
+ <property file="${project.root}/build.overrides"/>
+
<findSubProjects name="broker-plugins" dir="broker-plugins"/>
<findSubProjects name="client-plugins" dir="client-plugins"/>
<findSubProjects name="management" dir="management" excludes="common,example"/>
@@ -31,8 +33,9 @@
<property name="modules.tests" value="systests perftests integrationtests testkit"/>
<property name="modules.management" value="${management}"/>
<property name="modules.plugin" value="${broker-plugins} ${client-plugins}"/>
+ <property name="modules.opt" value=""/>
<property name="modules" value="${modules.core} ${modules.examples}
- ${modules.management} ${modules.tests} ${modules.plugin}"/>
+ ${modules.management} ${modules.tests} ${modules.plugin} ${modules.opt}"/>
<property name="qpid.jar" location="${build.lib}/qpid-all.jar"/>
<basename property="qpid.jar.name" file="${qpid.jar}"/>
Added: qpid/trunk/qpid/java/lib/bdbstore/README.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/bdbstore/README.txt?rev=1175235&view=auto
==============================================================================
--- qpid/trunk/qpid/java/lib/bdbstore/README.txt (added)
+++ qpid/trunk/qpid/java/lib/bdbstore/README.txt Sat Sep 24 20:16:00 2011
@@ -0,0 +1,14 @@
+The BDB JE jar must be downloaded into this directory in order to allow the optional bdbstore module to be built against it.
+
+*NOTE* The BDB JE library is licensed under the Sleepycat Licence [1], which is not compatible with the Apache Lience v2.0. As a result, the BDB JE library is not distributed with the project, and the optional bdbstore module is not compiled by default.
+
+The jar file may be downloaded by either:
+
+ Seperately running the following command from the qpid/java/bdbstore dir: ant download-bdb
+
+ OR
+
+ Adding -Ddownload-bdb=true to your regular build command
+
+
+[1] http://www.oracle.com/technetwork/database/berkeleydb/downloads/jeoslicense-086837.html
Modified: qpid/trunk/qpid/java/systests/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/build.xml?rev=1175235&r1=1175234&r2=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/build.xml (original)
+++ qpid/trunk/qpid/java/systests/build.xml Sat Sep 24 20:16:00 2011
@@ -19,7 +19,15 @@ nn - or more contributor license agreeme
-
-->
<project name="System Tests" default="build">
- <property name="module.depends" value="client management/tools/qpid-cli management/common broker broker/test common common/test junit-toolkit"/>
+
+ <condition property="systests.optional.depends" value="bdbstore" else="">
+ <and>
+ <contains string="${modules.opt}" substring="bdbstore"/>
+ <contains string="${profile}" substring="bdb"/>
+ </and>
+ </condition>
+
+ <property name="module.depends" value="client management/common broker broker/test common common/test junit-toolkit ${systests.optional.depends}"/>
<property name="module.test.src" location="src/main/java"/>
<property name="module.test.excludes"
value="**/DropInTest.java,**/TestClientControlledTest.java"/>
Copied: qpid/trunk/qpid/java/systests/etc/config-systests-bdb-settings.xml (from r1174842, qpid/trunk/qpid/java/systests/build.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-bdb-settings.xml?p2=qpid/trunk/qpid/java/systests/etc/config-systests-bdb-settings.xml&p1=qpid/trunk/qpid/java/systests/build.xml&r1=1174842&r2=1175235&rev=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/build.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests-bdb-settings.xml Sat Sep 24 20:16:00 2011
@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
-nn - or more contributor license agreements. See the NOTICE file
- -n distributed with this work for additional information
+ - 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
@@ -18,12 +19,8 @@ nn - or more contributor license agreeme
- under the License.
-
-->
-<project name="System Tests" default="build">
- <property name="module.depends" value="client management/tools/qpid-cli management/common broker broker/test common common/test junit-toolkit"/>
- <property name="module.test.src" location="src/main/java"/>
- <property name="module.test.excludes"
- value="**/DropInTest.java,**/TestClientControlledTest.java"/>
+<broker>
+ <virtualhosts>${QPID_HOME}/etc/virtualhosts-systests-bdb.xml</virtualhosts>
+</broker>
- <import file="../module.xml"/>
-</project>
Copied: qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml (from r1174842, qpid/trunk/qpid/java/broker-plugins/experimental/info/build.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml?p2=qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml&p1=qpid/trunk/qpid/java/broker-plugins/experimental/info/build.xml&r1=1174842&r2=1175235&rev=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/info/build.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml Sat Sep 24 20:16:00 2011
@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
-nn - or more contributor license agreements. See the NOTICE file
- -n distributed with this work for additional information
+ - 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
@@ -18,15 +19,12 @@ nn - or more contributor license agreeme
- under the License.
-
-->
-<project name="AMQ Broker Info Plugin" default="build">
-
- <property name="module.depends" value="common broker broker-plugins"/>
- <property name="module.test.depends" value="test broker/test management/common client systests common/test"/>
- <property name="module.manifest" value="MANIFEST.MF"/>
- <property name="module.plugin" value="true"/>
-
- <import file="../../../module.xml"/>
-
- <target name="bundle" depends="bundle-tasks"/>
-
-</project>
+<configuration>
+ <system/>
+ <override>
+ <xml fileName="${test.config}" optional="true"/>
+ <xml fileName="${QPID_HOME}/etc/config-systests-bdb-settings.xml"/>
+ <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
+ <xml fileName="${QPID_HOME}/etc/config.xml"/>
+ </override>
+</configuration>
Added: qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb-settings.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb-settings.xml?rev=1175235&view=auto
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb-settings.xml (added)
+++ qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb-settings.xml Sat Sep 24 20:16:00 2011
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<virtualhosts>
+ <work>${QPID_WORK}</work>
+
+ <virtualhost>
+ <name>localhost</name>
+ <localhost>
+ <store>
+ <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
+ <environment-path>${work}/bdbstore/localhost-store</environment-path>
+ </store>
+ </localhost>
+ </virtualhost>
+
+ <virtualhost>
+ <name>development</name>
+ <development>
+ <store>
+ <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
+ <environment-path>${work}/bdbstore/development-store</environment-path>
+ </store>
+ </development>
+ </virtualhost>
+
+ <virtualhost>
+ <name>test</name>
+ <test>
+ <store>
+ <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
+ <environment-path>${work}/bdbstore/test-store</environment-path>
+ </store>
+ </test>
+ </virtualhost>
+</virtualhosts>
+
+
Copied: qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb.xml (from r1174842, qpid/trunk/qpid/java/systests/build.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb.xml?p2=qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb.xml&p1=qpid/trunk/qpid/java/systests/build.xml&r1=1174842&r2=1175235&rev=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/build.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb.xml Sat Sep 24 20:16:00 2011
@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
-nn - or more contributor license agreements. See the NOTICE file
- -n distributed with this work for additional information
+ - 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
@@ -18,12 +19,11 @@ nn - or more contributor license agreeme
- under the License.
-
-->
-<project name="System Tests" default="build">
- <property name="module.depends" value="client management/tools/qpid-cli management/common broker broker/test common common/test junit-toolkit"/>
- <property name="module.test.src" location="src/main/java"/>
- <property name="module.test.excludes"
- value="**/DropInTest.java,**/TestClientControlledTest.java"/>
-
- <import file="../module.xml"/>
-
-</project>
+<configuration>
+ <system/>
+ <override>
+ <xml fileName="${test.virtualhosts}" optional="true"/>
+ <xml fileName="${QPID_HOME}/etc/virtualhosts-systests-bdb-settings.xml"/>
+ <xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>
+ </override>
+</configuration>
Copied: qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes (from r1174842, qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes?p2=qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes&p1=qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes&r1=1174842&r2=1175235&rev=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes (original)
+++ qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes Sat Sep 24 20:16:00 2011
@@ -17,16 +17,6 @@
// under the License.
//
-//These tests require a persistent store
-org.apache.qpid.server.store.PersistentStoreTest#*
-
-org.apache.qpid.test.unit.ct.DurableSubscriberTest#*
-
-org.apache.qpid.server.store.MessageStoreTest#testMessagePersistence
-org.apache.qpid.server.store.MessageStoreTest#testMessageRemoval
-org.apache.qpid.server.store.MessageStoreTest#testBindingPersistence
-org.apache.qpid.server.store.MessageStoreTest#testDurableBindingRemoval
-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
+//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#*
Added: qpid/trunk/qpid/java/test-profiles/JavaDerbyExcludes
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaDerbyExcludes?rev=1175235&view=auto
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/JavaDerbyExcludes (added)
+++ qpid/trunk/qpid/java/test-profiles/JavaDerbyExcludes Sat Sep 24 20:16:00 2011
@@ -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#*
Modified: qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes?rev=1175235&r1=1175234&r2=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes (original)
+++ qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes Sat Sep 24 20:16:00 2011
@@ -30,3 +30,6 @@ org.apache.qpid.server.store.MessageStor
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#*
Copied: qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile (from r1174842, qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile?p2=qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile&p1=qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile&r1=1174842&r2=1175235&rev=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile Sat Sep 24 20:16:00 2011
@@ -16,15 +16,17 @@
# specific language governing permissions and limitations
# under the License.
#
+
broker.language=java
-broker.version=v0_10
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.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-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
-profile.excludes=JavaPersistentExcludes Java010Excludes
+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
+
Copied: qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (from r1174842, qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile?p2=qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile&p1=qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile&r1=1174842&r2=1175235&rev=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile Sat Sep 24 20:16:00 2011
@@ -16,19 +16,20 @@
# specific language governing permissions and limitations
# under the License.
#
-broker.version=v0_9_1
+
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.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-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
+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
#
Copied: qpid/trunk/qpid/java/test-profiles/java-bdb.0-10.testprofile (from r1174842, qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb.0-10.testprofile?p2=qpid/trunk/qpid/java/test-profiles/java-bdb.0-10.testprofile&p1=qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile&r1=1174842&r2=1175235&rev=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb.0-10.testprofile Sat Sep 24 20:16:00 2011
@@ -16,15 +16,17 @@
# specific language governing permissions and limitations
# under the License.
#
+
broker.language=java
-broker.version=v0_10
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.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-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
-profile.excludes=JavaPersistentExcludes Java010Excludes
+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
+
Copied: qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (from r1174842, qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile?p2=qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile&p1=qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile&r1=1174842&r2=1175235&rev=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile Sat Sep 24 20:16:00 2011
@@ -16,19 +16,20 @@
# specific language governing permissions and limitations
# under the License.
#
-broker.version=v0_9_1
+
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.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-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
+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
#
Modified: qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile?rev=1175235&r1=1175234&r2=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile Sat Sep 24 20:16:00 2011
@@ -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
Modified: qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile?rev=1175235&r1=1175234&r2=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile Sat Sep 24 20:16:00 2011
@@ -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
#
Modified: qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile?rev=1175235&r1=1175234&r2=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile Sat Sep 24 20:16:00 2011
@@ -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
Modified: qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile?rev=1175235&r1=1175234&r2=1175235&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile Sat Sep 24 20:16:00 2011
@@ -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
#
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org