Author: antelder
Date: Fri May 1 10:33:59 2009
New Revision: 770621
URL: http://svn.apache.org/viewvc?rev=770621&view=rev
Log:
TUSCANY-3002: fix writeStartElement calls in JMSBindingProcessor do not pass
namespace
Modified:
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
Modified:
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java?rev=770621&r1=770620&r2=770621&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
Fri May 1 10:33:59 2009
@@ -35,7 +35,6 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.Extension;
import org.apache.tuscany.sca.assembly.OperationSelector;
import org.apache.tuscany.sca.assembly.OperationsConfigurator;
import org.apache.tuscany.sca.assembly.WireFormat;
@@ -51,8 +50,6 @@
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
@@ -948,7 +945,7 @@
responseCFName != null ||
responseASName != null ) {
- writer.writeStartElement("response");
+ writer.writeStartElement(Constants.SCA10_NS, "response");
writeResponseDestinationProperties( jmsBinding, writer );
writeResponseConnectionFactoryProperties( jmsBinding, writer );
writeResponseActivationSpecProperties( jmsBinding, writer );
@@ -992,7 +989,7 @@
*/
private void writeHeaders( JMSBinding jmsBinding, XMLStreamWriter writer)
throws XMLStreamException {
- writer.writeStartElement(JMSBindingConstants.HEADERS);
+ writer.writeStartElement(Constants.SCA10_NS,
JMSBindingConstants.HEADERS);
String jmsType = jmsBinding.getJMSType();
if (jmsType != null && jmsType.length() > 0) {
@@ -1049,7 +1046,7 @@
Object key = entry.getKey();
Object value = entry.getValue();
- writer.writeStartElement( "property" );
+ writer.writeStartElement(Constants.SCA10_NS, "property" );
writer.writeAttribute("name", key.toString());
if ( value instanceof String) {
@@ -1113,7 +1110,7 @@
for(Iterator<String> it=operationNames.iterator(); it.hasNext(); ) {
String opName = it.next();
- writer.writeStartElement("operationProperties");
+ writer.writeStartElement(Constants.SCA10_NS,
"operationProperties");
writer.writeAttribute("name", opName);
String nativeOperation = jmsBinding.getNativeOperationName(opName);
@@ -1137,7 +1134,7 @@
if (jmsType != null || jmsCorrelationId != null || jmsDeliveryMode
!= null ||
jmsTimeToLive != null || jmsPriority != null ||
operationProperties != null) {
- writer.writeStartElement(JMSBindingConstants.HEADERS);
+ writer.writeStartElement(Constants.SCA10_NS,
JMSBindingConstants.HEADERS);
if (jmsType != null && jmsType.length() > 0) {
writer.writeAttribute("JMSType", jmsType);
@@ -1193,7 +1190,7 @@
Object key = entry.getKey();
Object value = entry.getValue();
- writer.writeStartElement( "property" );
+ writer.writeStartElement(Constants.SCA10_NS, "property" );
writer.writeAttribute("name", key.toString());
if ( value instanceof String) {
@@ -1222,7 +1219,7 @@
private void writeSubscriptionHeaders( JMSBinding jmsBinding,
XMLStreamWriter writer) throws XMLStreamException {
String jmsSubscriptionHeaders = jmsBinding.getJMSSelector();
if (jmsSubscriptionHeaders != null && jmsSubscriptionHeaders.length()
> 0) {
- writer.writeStartElement("SubscriptionHeaders");
+ writer.writeStartElement(Constants.SCA10_NS,
"SubscriptionHeaders");
writer.writeAttribute("JMSSelector", jmsSubscriptionHeaders);
writer.writeEndElement();
// Strange bug. Without white space, headers end tag improperly
read.
@@ -1245,7 +1242,7 @@
return;
}
- writer.writeStartElement("destination");
+ writer.writeStartElement(Constants.SCA10_NS, "destination");
if ( destinationName != null && destinationName.length() > 0) {
writer.writeAttribute("name", destinationName);
@@ -1283,7 +1280,7 @@
return;
}
- writer.writeStartElement("connectionFactory");
+ writer.writeStartElement(Constants.SCA10_NS, "connectionFactory");
if ( cfName != null && cfName.length() > 0) {
writer.writeAttribute("name", cfName);
@@ -1316,7 +1313,7 @@
return;
}
- writer.writeStartElement("activationSpec");
+ writer.writeStartElement(Constants.SCA10_NS, "activationSpec");
if ( asName != null && asName.length() > 0) {
writer.writeAttribute("name", asName);
@@ -1351,7 +1348,7 @@
return;
}
- writer.writeStartElement("destination");
+ writer.writeStartElement(Constants.SCA10_NS, "destination");
if ( destinationName != null && destinationName.length() > 0) {
writer.writeAttribute("name", destinationName);
@@ -1390,7 +1387,7 @@
return;
}
- writer.writeStartElement("connectionFactory");
+ writer.writeStartElement(Constants.SCA10_NS, "connectionFactory");
if ( cfName != null && cfName.length() > 0) {
writer.writeAttribute("name", cfName);
@@ -1423,7 +1420,7 @@
return;
}
- writer.writeStartElement("activationSpec");
+ writer.writeStartElement(Constants.SCA10_NS, "activationSpec");
if ( asName != null && asName.length() > 0) {
writer.writeAttribute("name", asName);
@@ -1455,7 +1452,7 @@
return;
}
- writer.writeStartElement("resourceAdapter");
+ writer.writeStartElement(Constants.SCA10_NS, "resourceAdapter");
if ( asName != null && asName.length() > 0) {
writer.writeAttribute("name", asName);
