Author: antelder
Date: Tue Oct 6 10:50:49 2009
New Revision: 822211
URL: http://svn.apache.org/viewvc?rev=822211&view=rev
Log:
Update JMS binding header attributes for OASIS spec
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=822211&r1=822210&r2=822211&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 10:50:49 2009
@@ -69,11 +69,10 @@
* operationProperties="QName"?
* ...>
*
- * <headers JMSType="string"?
- * JMSCorrelationID="string"?
- * JMSDeliveryMode="string"?
+ * <headers type="string"?
+ * deliveryMode="string"?
* timeToLive="int"?
- * JMSPriority="string"?>
+ * priority="string"?>
* <property name="NMTOKEN" type="NMTOKEN">*
* </headers>?
*
@@ -115,11 +114,10 @@
*
* <operationProperties name="string" nativeOperation="string"?>
* <property name="NMTOKEN" type="NMTOKEN">*
- * <headers JMSType="string"?
- * JMSCorrelationID="string"?
- * JMSDeliveryMode="string"?
+ * <headers type="string"?
+ * deliveryMode="string"?
* timeToLive="int"?
- * JMSPriority="string"?>
+ * priority="string"?>
* <property name="NMTOKEN" type="NMTOKEN">*
* </headers>?
* </operationProperties>*
@@ -558,21 +556,16 @@
* </headers>?
*/
private void parseHeaders(XMLStreamReader reader, JMSBinding jmsBinding)
throws XMLStreamException {
- String jmsType = reader.getAttributeValue(null, "JMSType");
+ String jmsType = reader.getAttributeValue(null, "type");
if (jmsType != null && jmsType.length() > 0) {
jmsBinding.setJMSType(jmsType);
}
- String jmsCorrelationId = reader.getAttributeValue(null,
"JMSCorrelationID");
- if (jmsCorrelationId != null && jmsCorrelationId.length() > 0) {
- jmsBinding.setJMSCorrelationId(jmsCorrelationId);
- }
-
- String jmsDeliveryMode = reader.getAttributeValue(null,
"JMSDeliveryMode");
+ String jmsDeliveryMode = reader.getAttributeValue(null,
"deliveryMode");
if (jmsDeliveryMode != null && jmsDeliveryMode.length() > 0) {
- if ("PERSISTENT".equalsIgnoreCase(jmsDeliveryMode)) {
+ if ("persistent".equalsIgnoreCase(jmsDeliveryMode)) {
jmsBinding.setJMSDeliveryMode(true);
- } else if ("NON_PERSISTENT".equalsIgnoreCase(jmsDeliveryMode)) {
+ } else if ("nonpersistent".equalsIgnoreCase(jmsDeliveryMode)) {
jmsBinding.setJMSDeliveryMode(false);
} else {
error("InvalidJMSDeliveryMode", jmsBinding, jmsDeliveryMode);
@@ -584,7 +577,7 @@
jmsBinding.setJMSTimeToLive(Long.parseLong(jmsTimeToLive));
}
- String jmsPriority = reader.getAttributeValue(null, "JMSPriority");
+ String jmsPriority = reader.getAttributeValue(null, "priority");
if (jmsPriority != null && jmsPriority.length() > 0) {
try {
int p = Integer.parseInt(jmsPriority);
@@ -704,21 +697,16 @@
}
private void parseOperationHeaders(XMLStreamReader reader, JMSBinding
jmsBinding, String opName) throws XMLStreamException {
- String jmsType = reader.getAttributeValue(null, "JMSType");
+ String jmsType = reader.getAttributeValue(null, "type");
if (jmsType != null && jmsType.length() > 0) {
jmsBinding.setOperationJMSType(opName, jmsType);
}
- String jmsCorrelationId = reader.getAttributeValue(null,
"JMSCorrelationID");
- if (jmsCorrelationId != null && jmsCorrelationId.length() > 0) {
- jmsBinding.setOperationJMSCorrelationId(opName, jmsCorrelationId);
- }
-
- String jmsDeliveryMode = reader.getAttributeValue(null,
"JMSDeliveryMode");
+ String jmsDeliveryMode = reader.getAttributeValue(null,
"deliveryMode");
if (jmsDeliveryMode != null && jmsDeliveryMode.length() > 0) {
- if ("PERSISTENT".equalsIgnoreCase(jmsDeliveryMode)) {
+ if ("persistent".equalsIgnoreCase(jmsDeliveryMode)) {
jmsBinding.setOperationJMSDeliveryMode(opName, true);
- } else if ("NON_PERSISTENT".equalsIgnoreCase(jmsDeliveryMode)) {
+ } else if ("nonpersistent".equalsIgnoreCase(jmsDeliveryMode)) {
jmsBinding.setOperationJMSDeliveryMode(opName, false);
} else {
error("InvalidOPJMSDeliveryMode", jmsBinding, jmsDeliveryMode);
@@ -730,7 +718,7 @@
jmsBinding.setOperationJMSTimeToLive(opName,
Long.parseLong(jmsTimeToLive));
}
- String jmsPriority = reader.getAttributeValue(null, "JMSPriority");
+ String jmsPriority = reader.getAttributeValue(null, "priority");
if (jmsPriority != null && jmsPriority.length() > 0) {
try {
int p = Integer.parseInt(jmsPriority);
@@ -1028,20 +1016,15 @@
String jmsType = jmsBinding.getJMSType();
if (jmsType != null && jmsType.length() > 0) {
- writer.writeAttribute("JMSType", jmsType);
- }
-
- String jmsCorrelationId = jmsBinding.getJMSCorrelationId();
- if (jmsCorrelationId != null && jmsCorrelationId.length() > 0) {
- writer.writeAttribute("JMSCorrelationID", jmsCorrelationId);
+ writer.writeAttribute("type", jmsType);
}
Boolean jmsDeliveryMode = jmsBinding.isdeliveryModePersistent();
if (jmsDeliveryMode != null) {
if ( jmsDeliveryMode.booleanValue() )
- writer.writeAttribute("JMSDeliveryMode", "PERSISTENT");
+ writer.writeAttribute("deliveryMode", "persistent");
else
- writer.writeAttribute("JMSDeliveryMode", "NON_PERSISTENT");
+ writer.writeAttribute("deliveryMode", "nonpersistent");
}
Long jmsTimeToLive = jmsBinding.getJMSTimeToLive();
@@ -1051,7 +1034,7 @@
Integer jmsPriority = jmsBinding.getJMSPriority();
if (jmsPriority != null) {
- writer.writeAttribute("JMSPriority", jmsPriority.toString());
+ writer.writeAttribute("priority", jmsPriority.toString());
}
Map<String, Object> properties = jmsBinding.getProperties();
@@ -1178,18 +1161,14 @@
writer.writeStartElement(Constants.SCA11_NS,
JMSBindingConstants.HEADERS);
if (jmsType != null && jmsType.length() > 0) {
- writer.writeAttribute("JMSType", jmsType);
- }
-
- if (jmsCorrelationId != null && jmsCorrelationId.length()
> 0) {
- writer.writeAttribute("JMSCorrelationID",
jmsCorrelationId);
+ writer.writeAttribute("type", jmsType);
}
if (jmsDeliveryMode != null) {
if (jmsDeliveryMode.booleanValue())
- writer.writeAttribute("JMSDeliveryMode",
"PERSISTENT");
+ writer.writeAttribute("deliveryMode",
"persistent");
else
- writer.writeAttribute("JMSDeliveryMode",
"NON_PERSISTENT");
+ writer.writeAttribute("deliveryMode",
"nonpersistent");
}
if (jmsTimeToLive != null) {
@@ -1197,7 +1176,7 @@
}
if (jmsPriority != null) {
- writer.writeAttribute("JMSPriority",
jmsPriority.toString());
+ writer.writeAttribute("priority",
jmsPriority.toString());
}
writeProperties( operationProperties, writer );
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=822211&r1=822210&r2=822211&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 10:50:49 2009
@@ -70,7 +70,7 @@
+ " <implementation.java class=\"services.HelloWorld\"/>"
+ " <service name=\"HelloWorldService\">"
+ " <binding.jms uri=\"jms:testQueue\" >"
- + " <headers JMSType=\"myType\"
JMSCorrelationID=\"myCorrelId\" JMSDeliveryMode=\"PERSISTENT\"
timeToLive=\"54321\" JMSPriority=\"5\">"
+ + " <headers type=\"myType\"
deliveryMode=\"persistent\" timeToLive=\"54321\" priority=\"5\">"
+ " </headers>"
+ " </binding.jms>"
+ " </service>"
@@ -84,7 +84,7 @@
+ " <implementation.java class=\"services.HelloWorld\"/>"
+ " <service name=\"HelloWorldService\">"
+ " <binding.jms uri=\"jms:testQueue\" >"
- + " <headers JMSType=\"myType\"
JMSCorrelationID=\"myCorrelId\" JMSDeliveryMode=\"PERSISTENT\"
timeToLive=\"54321\" JMSPriority=\"medium\">"
+ + " <headers type=\"myType\"
deliveryMode=\"persistent\" timeToLive=\"54321\" priority=\"medium\">"
+ " </headers>"
+ " </binding.jms>"
+ " </service>"
@@ -115,13 +115,13 @@
+ " <service name=\"HelloWorldService\">"
+ " <binding.jms uri=\"jms:testQueue\" >"
+ " <operationProperties name=\"op1\">"
- + " <headers JMSType=\"op1Type\" >"
+ + " <headers type=\"op1Type\" >"
+ " <property name=\"p1\">bla</property>"
+ " <property name=\"intProp\"
type=\"int\">42</property>"
+ " </headers>"
+ " </operationProperties >"
+ " <operationProperties name=\"op2\"
nativeOperation=\"nativeOp2\" >"
- + " <headers JMSType=\"op2Type\">"
+ + " <headers type=\"op2Type\">"
+ " <property name=\"p2\">op2bla</property>"
+ " <property name=\"intProp\"
type=\"int\">77</property>"
+ " </headers>"
@@ -438,7 +438,6 @@
assertNotNull(binding);
assertEquals("myType", binding.getJMSType());
- assertEquals("myCorrelId", binding.getJMSCorrelationId());
assertTrue(binding.isdeliveryModePersistent());
assertEquals(54321, binding.getJMSTimeToLive().longValue());
assertEquals(5, binding.getJMSPriority().intValue());
