QPID-4390, QPID-4743: configuration improvements from review

- Rename the embedded initial config file to initial-config.json
- Ensure the default vhost store path is unique by including its type and vhost name.
- Rename ports to remove the port number.
- Remove leftover systests config.xml file.
- Stop shipping unused virtualhosts.xml in example config to reduce confusion

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467938 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 28 deletions

diff --git a/qpid/java/systests/etc/config-systests.xml b/qpid/java/systests/etc/config-systests.xml
deleted file mode 100644
index 958aafc9da..0000000000
--- a/qpid/java/systests/etc/config-systests.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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="${QPID_HOME}/${test.config}" optional="true"/>
-        <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
-    </override>
-</configuration>