diff options
| author | bdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68> | 2010-09-08 15:59:10 +0000 |
|---|---|---|
| committer | bdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68> | 2010-09-08 15:59:10 +0000 |
| commit | 67c6737195b9e096f426aa0acb203d142dae2c37 (patch) | |
| tree | b47bf2a659563494d0682232b3423b56a1245a15 /sca-java-2.x/trunk | |
| parent | e513a8fb1a7360f56e788318d8e5521a4ac40a6d (diff) | |
BJM_3034 Add validation to check that a destination is not present when a uri is specified
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@995109 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
2 files changed, 7 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java b/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java index b01f1b7e76..9d98d33216 100644 --- a/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java +++ b/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java @@ -991,6 +991,12 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St } } + // If URI is specified, destination should not be present + if ( ( jmsBinding.getJMSURI() != null ) && ( jmsBinding.getJMSURI().length() > 0) && + (jmsBinding.getDestinationName() != null) && (jmsBinding.getDestinationName().length() > 0)) { + error(monitor, "DestinationURIContradiction", jmsBinding, jmsBinding.getJMSURI(), jmsBinding.getDestinationName()); + } + // If activation spec and destination are both specified, they have to match if ( ( jmsBinding.getActivationSpecName() != null ) && (jmsBinding.getActivationSpecName().length() > 0 ) && (jmsBinding.getDestinationName() != null) && (jmsBinding.getDestinationName().length() > 0 ) ) { diff --git a/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties b/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties index 73d7705927..527a7471c1 100644 --- a/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties +++ b/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties @@ -44,6 +44,7 @@ InvalidOPJMSDeliveryMode = Invalid OPJMSDeliveryMode: {0} InvalidOPJMSPriority = Invalid OPJMSPriority: {0} DestinationQueueContradiction = Destination type queue contradicts connection factory name: {0} DestinationTopicContradiction = Destination type topic contradicts connection factory name: {0} +DestinationURIContradiction = Destination {1} can not be specified when URI {0} is present ConnectionFactoryActivationSpecContradiction = Connection factory \"{0}\" and activation specification \"{0}\" are mutually exclusive ConnectionFactoryDestinationContradiction = When connection factory \"{0}\" element is present then a destination name must also be defined ResponseAttrElement = Response connection \"{0}\" and response element \"{1}\" are mutually exclusive |