From 4dfee8d6dfb0e0a33ada41d3bcd1869fe84be68d Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 13 Aug 2010 10:32:41 +0000 Subject: Ensure all the jms destination are correctly defined now that the jms binding has tightened up creation when using the jms uri format git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@985153 13f79535-47bb-0310-9956-ffa450edef68 --- sca-java-2.x/trunk/itest/jms/args/src/main/resources/jndi.properties | 2 +- .../trunk/itest/jms/callbacks/src/main/resources/jndi.properties | 2 +- .../trunk/itest/jms/defaults/src/main/resources/jndi.properties | 3 +-- .../trunk/itest/jms/exceptions1/src/main/resources/jndi.properties | 3 +-- .../trunk/itest/jms/non-sca-client/src/main/resources/jndi.properties | 4 ++-- sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/jndi.properties | 3 ++- .../trunk/itest/jms/policy-headers/src/main/resources/jndi.properties | 3 +-- .../trunk/itest/jms/properties/src/main/resources/jndi.properties | 3 +-- .../trunk/itest/jms/uri-rpc/src/main/resources/jndi.properties | 3 +-- .../itest/jms/uri-rpc/src/main/resources/simple/service.composite | 4 ++-- 10 files changed, 13 insertions(+), 17 deletions(-) (limited to 'sca-java-2.x/trunk/itest/jms') diff --git a/sca-java-2.x/trunk/itest/jms/args/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/args/src/main/resources/jndi.properties index 7ce468aa0f..7f82eb48d3 100644 --- a/sca-java-2.x/trunk/itest/jms/args/src/main/resources/jndi.properties +++ b/sca-java-2.x/trunk/itest/jms/args/src/main/resources/jndi.properties @@ -28,7 +28,7 @@ java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx= connectionFactoryNames = ConnectionFactory, ConnectionFactory2 # register some queues in JNDI using the form -# queue.[jndiName] = [physicalName] +queue.MyService = MyService # register some topics in JNDI using the form # topic.[jndiName] = [physicalName] diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/jndi.properties index be362c51cc..b8c4b1c6aa 100644 --- a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/jndi.properties +++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/jndi.properties @@ -30,7 +30,7 @@ connectionFactoryNames = ConnectionFactory # register some queues in JNDI using the form # queue.[jndiName] = [physicalName] queue.ServiceQueue = ServiceQueue -queue.ServiceQueue = TQServiceQueue +queue.TQServiceQueue = TQServiceQueue queue.CallbackQueue = CallbackQueue # register some topics in JNDI using the form diff --git a/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/jndi.properties index 4d6acc037b..c8b186a83c 100644 --- a/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/jndi.properties +++ b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/jndi.properties @@ -29,8 +29,7 @@ connectionFactoryNames = ConnectionFactory # register some queues in JNDI using the form # queue.[jndiName] = [physicalName] -queue.RequestQueue = RequestQueue -queue.ResponseQueue = ResponseQueue +queue.HelloWorldService = HelloWorldService # register some topics in JNDI using the form # topic.[jndiName] = [physicalName] diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/jndi.properties index 4d6acc037b..f7875b52a2 100644 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/jndi.properties +++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/jndi.properties @@ -29,8 +29,7 @@ connectionFactoryNames = ConnectionFactory # register some queues in JNDI using the form # queue.[jndiName] = [physicalName] -queue.RequestQueue = RequestQueue -queue.ResponseQueue = ResponseQueue +queue.ExceptionService = ExceptionService # register some topics in JNDI using the form # topic.[jndiName] = [physicalName] diff --git a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/jndi.properties index 4d6acc037b..03690b1169 100644 --- a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/jndi.properties +++ b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/jndi.properties @@ -29,8 +29,8 @@ connectionFactoryNames = ConnectionFactory # register some queues in JNDI using the form # queue.[jndiName] = [physicalName] -queue.RequestQueue = RequestQueue -queue.ResponseQueue = ResponseQueue +queue.TextDest = TextDest +queue.ObjectDest = ObjectDest # register some topics in JNDI using the form # topic.[jndiName] = [physicalName] diff --git a/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/jndi.properties index 7ce468aa0f..4bada514fa 100644 --- a/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/jndi.properties +++ b/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/jndi.properties @@ -28,7 +28,8 @@ java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx= connectionFactoryNames = ConnectionFactory, ConnectionFactory2 # register some queues in JNDI using the form -# queue.[jndiName] = [physicalName] +queue.MyService = MyService +queue.MyService2 = MyService2 # register some topics in JNDI using the form # topic.[jndiName] = [physicalName] diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/jndi.properties index 4d6acc037b..f0b9fbd734 100644 --- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/jndi.properties +++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/jndi.properties @@ -29,8 +29,7 @@ connectionFactoryNames = ConnectionFactory # register some queues in JNDI using the form # queue.[jndiName] = [physicalName] -queue.RequestQueue = RequestQueue -queue.ResponseQueue = ResponseQueue +queue.ServiceQueue = ServiceQueue # register some topics in JNDI using the form # topic.[jndiName] = [physicalName] diff --git a/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/jndi.properties index 4d6acc037b..c44da27df1 100644 --- a/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/jndi.properties +++ b/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/jndi.properties @@ -29,8 +29,7 @@ connectionFactoryNames = ConnectionFactory # register some queues in JNDI using the form # queue.[jndiName] = [physicalName] -queue.RequestQueue = RequestQueue -queue.ResponseQueue = ResponseQueue +queue.ServiceQueue = RequestQueue # register some topics in JNDI using the form # topic.[jndiName] = [physicalName] diff --git a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/jndi.properties index 4d6acc037b..f6dfc8e9d0 100644 --- a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/jndi.properties +++ b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/jndi.properties @@ -29,8 +29,7 @@ connectionFactoryNames = ConnectionFactory # register some queues in JNDI using the form # queue.[jndiName] = [physicalName] -queue.RequestQueue = RequestQueue -queue.ResponseQueue = ResponseQueue +queue.DestQueueA = DestQueueA # register some topics in JNDI using the form # topic.[jndiName] = [physicalName] diff --git a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/service.composite b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/service.composite index 33364f61c0..99ed243196 100644 --- a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/service.composite +++ b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/service.composite @@ -25,10 +25,10 @@ - + - + -- cgit v1.2.3