added M2 connection factory and JNDI destinations

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

1 files changed, 46 insertions, 39 deletions

diff --git a/java/perftests/src/main/java/perftests.properties b/java/perftests/src/main/java/perftests.properties
index a60e3964ad..6ac8b8349d 100644
--- a/java/perftests/src/main/java/perftests.properties
+++ b/java/perftests/src/main/java/perftests.properties
@@ -1,39 +1,46 @@
-# 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
-
-# use the following property to configure the default connector
-#java.naming.provider.url - ignored.
-
-# register some connection factories
-# connectionfactory.[jndiname] = [ConnectionURL]
-connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.MyQueue = example.MyQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-topic.ibmStocks = stocks.nyse.ibm
-
-# Register an AMQP destination in JNDI
-#   NOTE: Qpid currently only supports direct,topics and headers
-# destination.[jniName] = [BindingURL]
-destination.direct = direct://amq.direct//directQueue
+# 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

+

+# use the following property to configure the default connector

+#java.naming.provider.url - ignored.

+

+# register some connection factories

+# connectionfactory.[jndiname] = [ConnectionURL]

+#connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://192.168.1.10:5672'

+connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'

+

+# A M2 connection factory

+#connectionfactory.local = qpid:password=pass;username=name@tcp:192.168.1.10:5672

+

+# register some queues in JNDI using the form

+# queue.[jndiName] = [physicalName]

+#queue.MyQueue = example.MyQueue

+queue.syncQueue = syncQueue

+queue.testQueue = testQueue

+

+# register some topics in JNDI using the form

+# topic.[jndiName] = [physicalName]

+#topic.ibmStocks = stocks.nyse.ibm

+topic.testTopic = testTopic

+

+# Register an AMQP destination in JNDI

+#   NOTE: Qpid currently only supports direct,topics and headers

+# destination.[jniName] = [BindingURL]

+destination.direct = direct://amq.direct//directQueue