You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/09/14 14:34:19 UTC
svn commit: r814612 - in /tuscany/java/sca/modules/binding-jms/src:
main/java/org/apache/tuscany/sca/binding/jms/
test/java/org/apache/tuscany/sca/binding/jms/
Author: antelder
Date: Mon Sep 14 12:34:18 2009
New Revision: 814612
URL: http://svn.apache.org/viewvc?rev=814612&view=rev
Log:
Update JMS binding model for OASIS changes destination name attribute changed to jndiName, header property JMSTimeToLive changed to timeToLive
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
tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.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=814612&r1=814611&r2=814612&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 Mon Sep 14 12:34:18 2009
@@ -72,12 +72,12 @@
* <headers JMSType="string"?
* JMSCorrelationID="string"?
* JMSDeliveryMode="string"?
- * JMSTimeToLive="int"?
+ * timeToLive="int"?
* JMSPriority="string"?>
* <property name="NMTOKEN" type="NMTOKEN">*
* </headers>?
*
- * <destination name="xs:anyURI" type="string"? create="string"?>
+ * <destination jndiName="xs:anyURI" type="string"? create="string"?>
* <property name="NMTOKEN" type="NMTOKEN">*
* </destination>?
*
@@ -90,7 +90,7 @@
* </activationSpec>?
*
* <response>
- * <destination name="xs:anyURI" type="string"? create="string"?>
+ * <destination jndiName="xs:anyURI" type="string"? create="string"?>
* <property name="NMTOKEN" type="NMTOKEN">*
* </destination>?
*
@@ -118,7 +118,7 @@
* <headers JMSType="string"?
* JMSCorrelationID="string"?
* JMSDeliveryMode="string"?
- * JMSTimeToLive="int"?
+ * timeToLive="int"?
* JMSPriority="string"?>
* <property name="NMTOKEN" type="NMTOKEN">*
* </headers>?
@@ -407,7 +407,7 @@
}
private void parseDestination(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
- String name = reader.getAttributeValue(null, "name");
+ String name = reader.getAttributeValue(null, "jndiName");
if (name != null && name.length() > 0) {
jmsBinding.setDestinationName(name);
}
@@ -453,7 +453,7 @@
}
private void parseResponseDestination(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
- String name = reader.getAttributeValue(null, "name");
+ String name = reader.getAttributeValue(null, "jndiName");
if (name != null && name.length() > 0) {
jmsBinding.setResponseDestinationName(name);
}
@@ -552,7 +552,7 @@
* <headers JMSType=string?
* JMSCorrelationID=string?
* JMSDeliveryMode=PERSISTENT or NON_PERSISTENT?
- * JMSTimeToLive=long?
+ * timeToLive=long?
* JMSPriority=0 .. 9?>
* <property name=NMTOKEN type=NMTOKEN?>*
* </headers>?
@@ -579,7 +579,7 @@
}
}
- String jmsTimeToLive = reader.getAttributeValue(null, "JMSTimeToLive");
+ String jmsTimeToLive = reader.getAttributeValue(null, "timeToLive");
if (jmsTimeToLive != null && jmsTimeToLive.length() > 0) {
jmsBinding.setJMSTimeToLive(Long.parseLong(jmsTimeToLive));
}
@@ -649,7 +649,7 @@
* <headers JMSType=string?
* JMSCorrelationID=string?
* JMSDeliveryMode=PERSISTENT or NON_PERSISTENT?
- * JMSTimeToLive=long?
+ * timeToLive=long?
* JMSPriority=0 .. 9?>
* <property name=NMTOKEN type=NMTOKEN?>*
* </headers>?
@@ -725,7 +725,7 @@
}
}
- String jmsTimeToLive = reader.getAttributeValue(null, "JMSTimeToLive");
+ String jmsTimeToLive = reader.getAttributeValue(null, "timeToLive");
if (jmsTimeToLive != null && jmsTimeToLive.length() > 0) {
jmsBinding.setOperationJMSTimeToLive(opName, Long.parseLong(jmsTimeToLive));
}
@@ -1017,7 +1017,7 @@
* <headers JMSType=string?
* JMSCorrelationID=string?
* JMSDeliveryMode=PERSISTENT or NON_PERSISTENT?
- * JMSTimeToLive=long?
+ * timeToLive=long?
* JMSPriority=0 .. 9?>
* <property name=NMTOKEN type=NMTOKEN?>*
* </headers>?
@@ -1046,7 +1046,7 @@
Long jmsTimeToLive = jmsBinding.getJMSTimeToLive();
if (jmsTimeToLive != null) {
- writer.writeAttribute("JMSTimeToLive", jmsTimeToLive.toString());
+ writer.writeAttribute("timeToLive", jmsTimeToLive.toString());
}
Integer jmsPriority = jmsBinding.getJMSPriority();
@@ -1129,7 +1129,7 @@
* <headers JMSType="string"?
* JMSCorrelationID="string"?
* JMSDeliveryMode="string"?
- * JMSTimeToLive="int"?
+ * timeToLive="int"?
* JMSPriority="string"?>
* <property name="NMTOKEN" type="NMTOKEN">*
* </headers>?
@@ -1193,7 +1193,7 @@
}
if (jmsTimeToLive != null) {
- writer.writeAttribute("JMSTimeToLive", jmsTimeToLive.toString());
+ writer.writeAttribute("timeToLive", jmsTimeToLive.toString());
}
if (jmsPriority != null) {
@@ -1273,7 +1273,7 @@
/**
* Writes destination properties if there are any.
- * <destination name="xs:anyURI" type="string"? create="string"?>
+ * <destination jndiName="xs:anyURI" type="string"? create="string"?>
* <property name="NMTOKEN" type="NMTOKEN">*
* </destination>?
*/
@@ -1289,7 +1289,7 @@
writer.writeStartElement(Constants.SCA11_NS, "destination");
if ( destinationName != null && destinationName.length() > 0) {
- writer.writeAttribute("name", destinationName);
+ writer.writeAttribute("jndiName", destinationName);
}
// Type not handled yet
@@ -1381,7 +1381,7 @@
/**
* Writes response destination properties if there are any.
- * <destination name="xs:anyURI" type="string"? create="string"?>
+ * <destination jndiName="xs:anyURI" type="string"? create="string"?>
* <property name="NMTOKEN" type="NMTOKEN">*
* </destination>?
*/
@@ -1397,7 +1397,7 @@
writer.writeStartElement(Constants.SCA11_NS, "destination");
if ( destinationName != null && destinationName.length() > 0) {
- writer.writeAttribute("name", destinationName);
+ writer.writeAttribute("jndiName", destinationName);
}
// Type not handled yet
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=814612&r1=814611&r2=814612&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 Mon Sep 14 12:34:18 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\" JMSTimeToLive=\"54321\" JMSPriority=\"5\">"
+ + " <headers JMSType=\"myType\" JMSCorrelationID=\"myCorrelId\" JMSDeliveryMode=\"PERSISTENT\" timeToLive=\"54321\" JMSPriority=\"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\" JMSTimeToLive=\"54321\" JMSPriority=\"medium\">"
+ + " <headers JMSType=\"myType\" JMSCorrelationID=\"myCorrelId\" JMSDeliveryMode=\"PERSISTENT\" timeToLive=\"54321\" JMSPriority=\"medium\">"
+ " </headers>"
+ " </binding.jms>"
+ " </service>"
@@ -180,7 +180,7 @@
+ " <service name=\"HelloWorldService\">"
+ " <binding.jms uri=\"jms:testQueue\" responseConnection=\"responseConnectionAttrName\">"
+ " <response>"
- + " <destination name=\"responseConnectionElementName\"/>"
+ + " <destination jndiName=\"responseConnectionElementName\"/>"
+ " </response>"
+ " </binding.jms>"
+ " </service>"
@@ -194,7 +194,7 @@
+ " <implementation.java class=\"services.HelloWorld\"/>"
+ " <service name=\"HelloWorldService\">"
+ " <binding.jms>"
- + " <destination name=\"foo\">"
+ + " <destination jndiName=\"foo\">"
+ " <property name=\"xxx\" type=\"yyy\">"
+ " some value text"
+ " </property>"
@@ -255,7 +255,7 @@
+ " <service name=\"HelloWorldService\">"
+ " <binding.jms>"
+ " <response>"
- + " <destination name=\"foo\">"
+ + " <destination jndiName=\"foo\">"
+ " <property name=\"xxx\" type=\"yyy\">"
+ " some value text"
+ " </property>"
@@ -376,7 +376,7 @@
+ " <service name=\"HelloWorldService\">"
+ " <binding.jms uri=\"jms:testQueue\" >"
+ " <response>"
- + " <destination name=\"responseConnectionElementName\"/>"
+ + " <destination jndiName=\"responseConnectionElementName\"/>"
+ " <tuscany:wireFormat.jmsBytes/>"
+ " </response>"
+ " <tuscany:wireFormat.jmsObject/>"
Modified: tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java?rev=814612&r1=814611&r2=814612&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java (original)
+++ tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java Mon Sep 14 12:34:18 2009
@@ -57,7 +57,7 @@
+ " <component name=\"HelloWorldComponent\">"
+ " <service name=\"HelloWorldService\">"
+ " <binding.jms>"
- + " <destination name=\"AAA\">"
+ + " <destination jndiName=\"AAA\">"
+ " <property name=\"AAAProp\" type=\"string\"/>"
+ " </destination>"
+ " <connectionFactory name=\"ABC\"/>"
@@ -405,7 +405,7 @@
"<component name=\"HelloWorldComponent\">" +
"<service name=\"HelloWorldService\">" +
"<binding.jms><operationProperties name=\"JKL\" /> " +
- "<destination name=\"AAA\">" +
+ "<destination jndiName=\"AAA\">" +
"<property name=\"AAAProp\" type=\"string\"></property>" +
"</destination> " +
"<connectionFactory name=\"ABC\" /> "+