diff options
| author | Stephen D. Huston <shuston@apache.org> | 2011-10-21 01:19:00 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2011-10-21 01:19:00 +0000 |
| commit | ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 (patch) | |
| tree | dcfb94e75656c6c239fc3dcb754cd2015126424d /java/test-profiles/testprofile.defaults | |
| parent | 5eb354b338bb8d8fcd35b6ac3fb33f8103e757c3 (diff) | |
| download | qpid-python-ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5.tar.gz | |
Undo bad merge from trunk - merged at wrong level.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/test-profiles/testprofile.defaults')
| -rw-r--r-- | java/test-profiles/testprofile.defaults | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/java/test-profiles/testprofile.defaults b/java/test-profiles/testprofile.defaults deleted file mode 100644 index bd2faa7915..0000000000 --- a/java/test-profiles/testprofile.defaults +++ /dev/null @@ -1,59 +0,0 @@ -# -# 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. -# -java.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFactory -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 -broker.protocol.excludes= -broker.persistent=false - -max_prefetch=1000 -qpid.dest_syntax=BURL - -log=debug -amqj.logging.level=${log} -amqj.server.logging.level=${log} -amqj.protocol.logging.level=${log} -root.logging.level=warn -log4j.configuration=file:///${test.profiles}/log4j-test.xml -log4j.debug=false - -# Note test-provider.properties also has variables of same name. -# Keep in sync -test.port=15672 -test.mport=18999 -#Note : Management will start open second port on: mport + 100 : 19099 -test.port.ssl=15671 -test.port.alt=25672 -test.port.alt.ssl=25671 - -test.exclude=true -profile.excludes= -test.excludes=Excludes XAExcludes JavaExcludes ${profile}.excludes ${profile.excludes} -test.mem=512M -test=*Test -haltonfailure=no -haltonerror=no -exclude.modules=none - -profile.clustered=false - - |