diff options
Diffstat (limited to 'java/sca')
3 files changed, 12 insertions, 12 deletions
diff --git a/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java b/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java index 4f8fbb6348..22b52faf9a 100644 --- a/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java +++ b/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java @@ -81,7 +81,7 @@ import org.apache.tuscany.sca.policy.PolicyFactory; * <property name="NMTOKEN" type="NMTOKEN">* * </destination>? * - * <connectionFactory name="xs:anyURI" create="string"?> + * <connectionFactory jndiName="xs:anyURI" create="string"?> * <property name="NMTOKEN" type="NMTOKEN">* * </connectionFactory>? * @@ -94,7 +94,7 @@ import org.apache.tuscany.sca.policy.PolicyFactory; * <property name="NMTOKEN" type="NMTOKEN">* * </destination>? * - * <connectionFactory name="xs:anyURI" create="string"?> + * <connectionFactory jndiName="xs:anyURI" create="string"?> * <property name="NMTOKEN" type="NMTOKEN">* * </connectionFactory>? * @@ -433,7 +433,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St } private void parseConnectionFactory(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.setConnectionFactoryName(name); } else { @@ -479,7 +479,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St } private void parseResponseConnectionFactory(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.setResponseConnectionFactoryName(name); } else { @@ -1315,7 +1315,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St /** * Writes connection factory properties if there are any. - * <connectionFactory name="xs:anyURI" create="string"?> + * <connectionFactory jndiName="xs:anyURI" create="string"?> * <property name="NMTOKEN" type="NMTOKEN">* * </connectionFactory>? */ @@ -1328,7 +1328,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St writer.writeStartElement(Constants.SCA11_NS, "connectionFactory"); if ( cfName != null && cfName.length() > 0) { - writer.writeAttribute("name", cfName); + writer.writeAttribute("jndiName", cfName); } String destinationCreate = jmsBinding.getConnectionFactoryCreate(); @@ -1422,7 +1422,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St /** * Writes response connection factory properties if there are any. - * <connectionFactory name="xs:anyURI" create="string"?> + * <connectionFactory jndiName="xs:anyURI" create="string"?> * <property name="NMTOKEN" type="NMTOKEN">* * </connectionFactory>? * @@ -1436,7 +1436,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St writer.writeStartElement(Constants.SCA11_NS, "connectionFactory"); if ( cfName != null && cfName.length() > 0) { - writer.writeAttribute("name", cfName); + writer.writeAttribute("jndiName", cfName); } String destinationCreate = jmsBinding.getResponseConnectionFactoryCreate(); diff --git a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java index 8a25f99479..af985ed247 100644 --- a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java +++ b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java @@ -214,7 +214,7 @@ public class JMSBindingProcessorTestCase extends TestCase { + " <implementation.java class=\"services.HelloWorld\"/>"
+ " <service name=\"HelloWorldService\">"
+ " <binding.jms>"
- + " <connectionFactory name=\"foo\">"
+ + " <connectionFactory jndiName=\"foo\">"
+ " <property name=\"xxx\" type=\"yyy\">"
+ " some value text"
+ " </property>"
@@ -277,7 +277,7 @@ public class JMSBindingProcessorTestCase extends TestCase { + " <service name=\"HelloWorldService\">"
+ " <binding.jms>"
+ " <response>"
- + " <connectionFactory name=\"foo\">"
+ + " <connectionFactory jndiName=\"foo\">"
+ " <property name=\"xxx\" type=\"yyy\">"
+ " some value text"
+ " </property>"
diff --git a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java index f033887e5d..f5eede8f41 100644 --- a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java +++ b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java @@ -60,7 +60,7 @@ public class JMSBindingProcessorWriteTestCase extends TestCase { + " <destination jndiName=\"AAA\">" + " <property name=\"AAAProp\" type=\"string\"/>" + " </destination>" - + " <connectionFactory name=\"ABC\"/>" + + " <connectionFactory jndiName=\"ABC\"/>" + " <response/>" + " <headers/>" + " <resourceAdapter name=\"GHI\"/>" @@ -408,7 +408,7 @@ public class JMSBindingProcessorWriteTestCase extends TestCase { "<destination jndiName=\"AAA\">" + "<property name=\"AAAProp\" type=\"string\"></property>" + "</destination> " + - "<connectionFactory name=\"ABC\" /> "+ + "<connectionFactory jndiName=\"ABC\" /> "+ "<resourceAdapter name=\"GHI\" /> " + "</binding.jms>" + "</service>" + |