svn commit: r822245 - in /tuscany/java/sca/modules/binding-jms/src: main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java

[antelder]

Author: antelder
Date: Tue Oct  6 12:30:32 2009
New Revision: 822245

URL: http://svn.apache.org/viewvc?rev=822245&view=rev
Log:
Updates for OASIS selectors

Modified:
    
tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
    
tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java

Modified: 
tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java?rev=822245&r1=822244&r2=822245&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
 (original)
+++ 
tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
 Tue Oct  6 12:30:32 2009
@@ -290,7 +290,7 @@
                         parseHeaders(reader, jmsBinding);
                     } else if ("operationProperties".equals(elementName)) {
                         parseOperationProperties(reader, jmsBinding);
-                    } else if ("SubscriptionHeaders".equals(elementName)) {
+                    } else if ("messageSelection".equals(elementName)) {
                         parseSubscriptionHeaders(reader, jmsBinding);
                     } else if 
(Constants.OPERATION_QNAME.equals(reader.getName())) {
                         ConfiguredOperation confOp = 
configuredOperationProcessor.read(reader);
@@ -777,14 +777,14 @@
     }
 
     private void parseSubscriptionHeaders(XMLStreamReader reader, JMSBinding 
jmsBinding) throws XMLStreamException {
-        String jmsSelector = reader.getAttributeValue(null, "JMSSelector");
+        String jmsSelector = reader.getAttributeValue(null, "selector");
         if (jmsSelector != null && jmsSelector.length() > 0) {
             jmsBinding.setJMSSelector(jmsSelector);
         }
         
         // Skip to end element
         while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && 
"SubscriptionHeaders".equals(reader.getName().getLocalPart())) {
+            if (reader.next() == END_ELEMENT && 
"messageSelection".equals(reader.getName().getLocalPart())) {
                 break;
             }
         } // end while
@@ -1234,16 +1234,16 @@
 
     /**
      * Writes subscription headers if there are any.
-     *     <complexType name="SubscriptionHeaders"> 
-     *         <attribute name="JMSSelector" type="string"/> 
+     *     <complexType name="messageSelection"> 
+     *         <attribute name="selector" type="string"/> 
      *     </complexType>
      *
      */
     private void writeSubscriptionHeaders( JMSBinding jmsBinding, 
XMLStreamWriter writer) throws XMLStreamException {
         String jmsSubscriptionHeaders = jmsBinding.getJMSSelector();
         if (jmsSubscriptionHeaders != null && jmsSubscriptionHeaders.length() 
> 0) {
-            writer.writeStartElement(Constants.SCA11_NS, 
"SubscriptionHeaders");
-            writer.writeAttribute("JMSSelector", jmsSubscriptionHeaders);
+            writer.writeStartElement(Constants.SCA11_NS, "messageSelection");
+            writer.writeAttribute("selector", jmsSubscriptionHeaders);
             writer.writeEndElement();
             // Strange bug. Without white space, headers end tag improperly 
read. 
             // writer.writeCharacters( " " ); 

Modified: 
tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java?rev=822245&r1=822244&r2=822245&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
 (original)
+++ 
tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
 Tue Oct  6 12:30:32 2009
@@ -154,7 +154,7 @@
             + "   <implementation.java class=\"services.HelloWorld\"/>"
             + "      <service name=\"HelloWorldService\">"
             + "          <binding.jms uri=\"jms:testQueue\" >"
-            + "             <SubscriptionHeaders JMSSelector=\"prop1 = 2\" />"
+            + "             <messageSelection selector=\"prop1 = 2\" />"
             + "          </binding.jms>"
             + "      </service>"
             + " </component>"