Update jms resources and expected error messages

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@990327 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 9 insertions, 8 deletions

diff --git a/otest/newlayout/tuscany-jms-test-runner/src/test/resources/jndi.properties b/otest/newlayout/tuscany-jms-test-runner/src/test/resources/jndi.properties
index 5ce6f4477e..f25eed6df5 100644
--- a/otest/newlayout/tuscany-jms-test-runner/src/test/resources/jndi.properties
+++ b/otest/newlayout/tuscany-jms-test-runner/src/test/resources/jndi.properties
@@ -23,6 +23,8 @@ queue.TEST_BJM_3004_Queue = TEST_BJM_3004_Queue
 queue.TEST_BJM_3005_Queue = TEST_BJM_3005_Queue

 queue.TEST_BJM_3011_Queue =

 queue.TEST_BJM_3012_Queue = TEST_BJM_3012_Queue

+queue.TEST_BJM_3014_Queue = TEST_BJM_3014_Queue

+queue.TEST_BJM_3015_Queue = TEST_BJM_3015_Queue

 queue.TEST_BJM_3019_Queue = TEST_BJM_3019_Queue

 queue.TEST_BJM_3020_Queue = TEST_BJM_3020_Queue

 queue.TEST_BJM_3021_Queue = TEST_BJM_3021_Queue

@@ -75,10 +77,11 @@ queue.TEST_BJM_6014_Reference_Queue = TEST_BJM_6014_Reference_Queue
 queue.TEST_BJM_6014_Callback_Queue = TEST_BJM_6014_Callback_Queue

 

 queue.Service1 = Service1_Queue

+queue.AlreadyExists = AlreadyExists_Queue

 

 # Topic names used by JMS test cases

 # Expressed in the form:

 # topic.[jndiName] = [physicalName]

-topic.TEST_BJM_3014_Queue = TEST_BJM_3014_Queue

 topic.TEST_BJM_3010_Topic = TEST_BJM_3010_Topic

+topic.TEST_BJM_3014_Topic = TEST_BJM_3014_Topic

 topic.TEST_BJM_3015_Topic = TEST_BJM_3015_Topic

diff --git a/otest/newlayout/tuscany-jms-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties b/otest/newlayout/tuscany-jms-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
index e734b521b0..1e07a8e38d 100644
--- a/otest/newlayout/tuscany-jms-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
+++ b/otest/newlayout/tuscany-jms-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
@@ -8,22 +8,20 @@ BJM_3001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3001, Art
 BJM_3002=Test service got an exception during execution: org.apache.tuscany.sca.binding.jms.JMSBindingException JMS Destination BJM_3002_Queue not found with create mode of "ifNotExist" while registering binding Reference1 invoker

 BJM_3011=org.apache.tuscany.sca.binding.jms.JMSBindingException: JMS Destination TEST_BJM_3011_Queue already exists but has create mode of "always" while registering service Service1 listener

 BJM_3011D=org.apache.tuscany.sca.binding.jms.JMSBindingException: JMS Destination AlreadyExists already exists but has create mode of "always" while registering service Service1 listener

-BJM_3012=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3012, Artifact: Test_BJM_3012.composite] - Must specify jndiName attribute when create mode is "ifNotExist"

 BJM_3012A=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3012A, Artifact: Test_BJM_3012A.composite] - Must specify jndiName attribute when create mode is "ifNotExist"

-BJM_3012b=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3012b, Artifact: Test_BJM_3012b.composite] - Must specify jndiName attribute when create mode is "ifNotExist"

+BJM_3012C=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3012C, Artifact: Test_BJM_3012C.composite] - Missing ConnectionFactory Name

+BJM_3012D=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3012D, Artifact: Test_BJM_3012D.composite] - Must specify jndiName attribute when create mode is "ifNotExist"

 BJM_3012C=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3012C, Artifact: Test_BJM_3012C.composite] - Missing ConnectionFactory Name

 BJM_3013=org.apache.tuscany.sca.binding.jms.JMSBindingException: JMS Destination TEST_BJM_3013_Queue not found with create mode of "ifNotExist" while registering service Service1 listener

 BJM_3014=org.apache.tuscany.sca.binding.jms.JMSBindingException: JMS Destination TEST_BJM_3014_Queue expecting type of queue but found topic while registering service Service1 listener

-BJM_3014C=org.apache.tuscany.sca.binding.jms.JMSBindingException: connection factory not found: TEST_BJM_3014_AS

-BJM_3014a=org.apache.tuscany.sca.binding.jms.JMSBindingException: JNDI resource 'TEST_BJM_3014_Queue' is not a JMS ConnectionFactory

+BJM_3014C=org.apache.tuscany.sca.binding.jms.JMSBindingException: JNDI resource 'TEST_BJM_3014_Queue' is not a JMS ConnectionFactory

 BJM_3015Aa=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3015Aa, Artifact: Test_BJM_3015Aa.composite] - Must specify jndiName attribute when create mode is "never"

 BJM_3015Ca=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3015Ca, Artifact: Test_BJM_3015Ca.composite] - Missing ConnectionFactory Name

 BJM_3015Cb=org.apache.tuscany.sca.binding.jms.JMSBindingException: connection factory not found: DoesntExist

-BJM_3015Cc=org.apache.tuscany.sca.binding.jms.JMSBindingException: connection factory not found: TEST_BJM_3015_Queue

+BJM_3015Cc=org.apache.tuscany.sca.binding.jms.JMSBindingException: JNDI resource 'TEST_BJM_3015_Queue' is not a JMS ConnectionFactory

 BJM_3015Da=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3015Da, Artifact: Test_BJM_3015Da.composite] - Must specify jndiName attribute when create mode is "never"

 BJM_3015Db=org.apache.tuscany.sca.binding.jms.JMSBindingException: JMS Destination BJM_3015_DoesntExist not found but create mode of "never" while registering service Service1 listener

 BJM_3015Dc=org.apache.tuscany.sca.binding.jms.JMSBindingException: JMS Destination TEST_BJM_3015_Topic expecting type of queue but found topic while registering service Service1 listener

-BJM_3015Da=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3015Da, Artifact: Test_BJM_3015Da.composite] - Must specify jndiName attribute when create mode is "never"

 BJM_3017=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3017, Artifact: Test_BJM_3017.composite] - XMLSchema validation error occured in: Test_BJM_3017.composite ,line = 36, column = 17, Message = cvc-complex-type.2.4.a: Invalid content was found starting with element 'activationSpec'. One of '{"http://docs.oasis-open.org/ns/opencsa/sca/200912":response, "http://docs.oasis-open.org/ns/opencsa/sca/200912":headers, "http://docs.oasis-open.org/ns/opencsa/sca/200912":messageSelection, "http://docs.oasis-open.org/ns/opencsa/sca/200912":resourceAdapter, "http://docs.oasis-open.org/ns/opencsa/sca/200912":operationProperties, "http://docs.oasis-open.org/ns/opencsa/sca/200912":extensions}' is expected.

 BJM_3018=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3018, Artifact: Test_BJM_3018.composite] - When connection factory "TEST_BJM_3018_CF" element is present then a destination name must also be defined

 BJM_3019=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3019, Artifact: Test_BJM_3019.composite] - Activation spec name TEST_BJM_3019_AS must match destination name TEST_BJM_3019_Queue_XXX

@@ -36,6 +34,6 @@ BJM_3034=*com.sun.xml.ws.client.ClientTransportException: HTTP transport error:
 BJM_3036=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3036, Artifact: Test_BJM_3036.composite] - XMLSchema validation error occured in: Test_BJM_3036.composite ,line = 26, column = 13, Message = cvc-complex-type.3.2.2: Attribute 'invalidAttribute' is not allowed to appear in element 'binding.jms'

 BJM_3037C=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3037C, Artifact: Test_BJM_3037C.composite] - Missing ConnectionFactory Name

 BJM_3037D=org.apache.tuscany.sca.binding.jms.JMSBindingException: JMS Destination Service1 already exists but has create mode of "always" while registering service Service1 listener

-BJM_4004=Exception parsing message text: org.xml.sax.SAXParseException: Content is not allowed in prolog.

+BJM_4004=org.xml.sax.SAXParseException: Content is not allowed in prolog

 BJM_4011=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_4011, Artifact: Test_BJM_4011.composite] - XMLSchema validation error occured in: Test_BJM_4011.composite ,line = 25, column = 17, Message = cvc-type.2: The type definition cannot be abstract for element operationSelector.jmsDefault.