Author: rgemmell Date: 2010-03-30 11:21:15 -0400 (Tue, 30 Mar 2010) New Revision: 3884 Added: store/branches/java/0.5.x-dev/etc/virtualhosts-systests-bdb-settings.xml store/branches/java/0.5.x-dev/etc/virtualhosts-systests-bdb.xml Modified: store/branches/java/0.5.x-dev/etc/config-systests-bdb-settings.xml store/branches/java/0.5.x-dev/etc/config-systests-bdb.xml Log: Update BDBStore systest configuration to align with the changes made for QPID-2360 Modified: store/branches/java/0.5.x-dev/etc/config-systests-bdb-settings.xml =================================================================== --- store/branches/java/0.5.x-dev/etc/config-systests-bdb-settings.xml 2010-03-29 14:03:37 UTC (rev 3883) +++ store/branches/java/0.5.x-dev/etc/config-systests-bdb-settings.xml 2010-03-30 15:21:15 UTC (rev 3884) @@ -20,40 +20,7 @@ - --> <broker> - <virtualhosts> - <directory>${conf}/virtualhosts</directory> - - <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> + <virtualhosts>${QPID_HOME}/etc/virtualhosts-systests-bdb.xml</virtualhosts> </broker> Modified: store/branches/java/0.5.x-dev/etc/config-systests-bdb.xml =================================================================== --- store/branches/java/0.5.x-dev/etc/config-systests-bdb.xml 2010-03-29 14:03:37 UTC (rev 3883) +++ store/branches/java/0.5.x-dev/etc/config-systests-bdb.xml 2010-03-30 15:21:15 UTC (rev 3884) @@ -22,7 +22,7 @@ <configuration> <system/> <override> - <xml fileName="${test.config}" config-optional="true"/> + <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"/> Added: store/branches/java/0.5.x-dev/etc/virtualhosts-systests-bdb-settings.xml =================================================================== --- store/branches/java/0.5.x-dev/etc/virtualhosts-systests-bdb-settings.xml (rev 0) +++ store/branches/java/0.5.x-dev/etc/virtualhosts-systests-bdb-settings.xml 2010-03-30 15:21:15 UTC (rev 3884) @@ -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> + <directory>${conf}/virtualhosts</directory> + + <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: store/branches/java/0.5.x-dev/etc/virtualhosts-systests-bdb.xml (from rev 3847, store/branches/java/0.5.x-dev/etc/config-systests-bdb.xml) =================================================================== --- store/branches/java/0.5.x-dev/etc/virtualhosts-systests-bdb.xml (rev 0) +++ store/branches/java/0.5.x-dev/etc/virtualhosts-systests-bdb.xml 2010-03-30 15:21:15 UTC (rev 3884) @@ -0,0 +1,29 @@ +<?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. + - + --> +<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>