You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by bd...@apache.org on 2010/08/30 18:19:04 UTC

svn commit: r990848 - in /tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main: java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java resources/binding-jms-validation-messages.properties

Author: bdaniel
Date: Mon Aug 30 16:19:04 2010
New Revision: 990848

URL: http://svn.apache.org/viewvc?rev=990848&view=rev
Log:
BJM_3037A Add validation for ActivationSpec with "always" create and no JNDI name

Modified:
    tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
    tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties

Modified: tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java?rev=990848&r1=990847&r2=990848&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java Mon Aug 30 16:19:04 2010
@@ -996,6 +996,11 @@ public class JMSBindingProcessor extends
         	}
         }
 
+        // If activation spec exists with create=always, a jndiName must be specified
+        if (JMSBindingConstants.CREATE_ALWAYS.equals(jmsBinding.getActivationSpecCreate()) &&
+        		(jmsBinding.getActivationSpecName() == null)) {
+        	error(monitor, "ActivationSpecNameRequiredForCreateAlways", jmsBinding);
+        }
         // If Connection factory specified then destination name must also be
         if (( connectionFactoryName != null ) && ( connectionFactoryName.length() > 0 )) {
             String destinationName = jmsBinding.getDestinationName();

Modified: tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties?rev=990848&r1=990847&r2=990848&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties Mon Aug 30 16:19:04 2010
@@ -56,3 +56,4 @@ MissingNameForCREATE_NEVER = Must specif
 MissingNameForCREATE_IF_NOT_EXIST = Must specify jndiName attribute when create mode is "ifNotExist"
 InvalidCreate = Attribute create {0} invalid, must be 'always', 'never', or 'ifNotExist'
 ActivationSpecAndDestinationMismatch = Activation spec name {0} must match destination name {1}
+ActivationSpecNameRequiredForCreateAlways = A JNDI name must be specified when an ActivationSpec has a create mode of "always"