diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-10 10:10:21 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-10 10:10:21 +0000 |
commit | 911561433ef1459349da1339f6cfcfd1f7555996 (patch) | |
tree | 4b0348c7e3fa0fe48d794f7616b43daa4fc006ee /java | |
parent | d5a74d99b26bfa26aa888fc45404066d7347c769 (diff) |
More updates to bring up the jms binding from 1.x to 2.x
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@813350 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
7 files changed, 47 insertions, 33 deletions
diff --git a/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java b/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java index 850e6fe251..a359d3b520 100644 --- a/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java +++ b/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java @@ -29,8 +29,11 @@ import java.util.TreeSet; import javax.xml.namespace.QName; import org.apache.tuscany.sca.assembly.BindingRRB; +import org.apache.tuscany.sca.assembly.ConfiguredOperation; import org.apache.tuscany.sca.assembly.OperationSelector; +import org.apache.tuscany.sca.assembly.OperationsConfigurator; import org.apache.tuscany.sca.assembly.WireFormat; +import org.apache.tuscany.sca.policy.ExtensionType; import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.PolicySet; import org.apache.tuscany.sca.policy.PolicySubject; @@ -41,7 +44,9 @@ import org.apache.tuscany.sca.policy.PolicySubject; * @version $Rev$ $Date$ */ -public class JMSBinding implements BindingRRB, PolicySubject, OperationsConfigurator, DefinitionElement { +//public class JMSBinding implements BindingRRB, PolicySubject, OperationsConfigurator, DefinitionElement { +public class JMSBinding implements BindingRRB, PolicySubject, OperationsConfigurator { + QName TYPE = new QName(SCA11_NS, "binding.jms"); @Override public Object clone() throws CloneNotSupportedException { @@ -60,7 +65,6 @@ public class JMSBinding implements BindingRRB, PolicySubject, OperationsConfigur // properties required by IntentAttachPoint private List<Intent> requiredIntents = new ArrayList<Intent>(); - private IntentAttachPointType intentAttachPointType; // properties required to describe configured operations private List<ConfiguredOperation> configuredOperations = new ArrayList<ConfiguredOperation>(); @@ -145,6 +149,7 @@ public class JMSBinding implements BindingRRB, PolicySubject, OperationsConfigur private WireFormat requestWireFormat; private WireFormat responseWireFormat; private OperationSelector operationSelector; + private ExtensionType extensionType; public JMSBinding() { super(); @@ -764,14 +769,10 @@ public class JMSBinding implements BindingRRB, PolicySubject, OperationsConfigur return requiredIntents; } - public IntentAttachPointType getType() { - return intentAttachPointType; + public QName getType() { + return TYPE; } - public void setType(IntentAttachPointType intentAttachPointType) { - this.intentAttachPointType = intentAttachPointType; - } - public Map<String, BindingProperty> getDestinationProperties() { return destinationProperties; } @@ -963,4 +964,11 @@ public class JMSBinding implements BindingRRB, PolicySubject, OperationsConfigur return true; } + public ExtensionType getExtensionType() { + return extensionType; + } + + public void setExtensionType(ExtensionType intentAttachPointType) { + this.extensionType = intentAttachPointType; + } } diff --git a/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java b/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java index a682bbe785..1eac74948e 100644 --- a/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java +++ b/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java @@ -34,9 +34,13 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; +import org.apache.tuscany.sca.assembly.ConfiguredOperation; import org.apache.tuscany.sca.assembly.OperationSelector; +import org.apache.tuscany.sca.assembly.OperationsConfigurator; import org.apache.tuscany.sca.assembly.WireFormat; +import org.apache.tuscany.sca.assembly.xml.ConfiguredOperationProcessor; import org.apache.tuscany.sca.assembly.xml.Constants; +import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor; import org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.OperationSelectorJMSDefault; import org.apache.tuscany.sca.binding.jms.wireformat.jmsdefault.WireFormatJMSDefault; import org.apache.tuscany.sca.binding.jms.wireformat.jmsobject.WireFormatJMSObject; @@ -52,7 +56,6 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; -import org.apache.tuscany.sca.monitor.impl.ProblemImpl; import org.apache.tuscany.sca.policy.PolicyFactory; /** @@ -132,7 +135,7 @@ import org.apache.tuscany.sca.policy.PolicyFactory; public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<JMSBinding> { private PolicyFactory policyFactory; - private PolicyAttachPointProcessor policyProcessor; + private PolicySubjectProcessor policyProcessor; private ConfiguredOperationProcessor configuredOperationProcessor; protected StAXArtifactProcessor<Object> extensionProcessor; private Monitor monitor; @@ -140,7 +143,8 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St private FactoryExtensionPoint modelFactories; // DOB public JMSBindingProcessor(FactoryExtensionPoint modelFactories, StAXArtifactProcessor<Object> extensionProcessor, Monitor monitor) { this.policyFactory = modelFactories.getFactory(PolicyFactory.class); - this.policyProcessor = new PolicyAttachPointProcessor(policyFactory); + this.policyProcessor = new PolicySubjectProcessor(policyFactory); + this.configuredOperationProcessor = new ConfiguredOperationProcessor(modelFactories, this.monitor); this.extensionProcessor = extensionProcessor; @@ -157,7 +161,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St */ private void warning(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "binding-jms-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "binding-jms-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); monitor.problem(problem); } } @@ -172,7 +176,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St */ private void error(String message, Object model, Object... messageParameters) { if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "binding-jms-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + Problem problem = monitor.createProblem(this.getClass().getName(), "binding-jms-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); monitor.problem(problem); } } @@ -919,7 +923,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St public void write(JMSBinding jmsBinding, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException { // Write a <binding.jms> - writeStart(writer, Constants.SCA10_NS, JMSBindingConstants.BINDING_JMS, + writeStart(writer, Constants.SCA11_NS, JMSBindingConstants.BINDING_JMS, new XAttr("requestConnection", jmsBinding.getRequestConnectionName()), new XAttr("responseConnection", jmsBinding.getResponseConnectionName()), new XAttr("operationProperties", jmsBinding.getOperationPropertiesName())); @@ -976,7 +980,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St responseCFName != null || responseASName != null ) { - writer.writeStartElement(Constants.SCA10_NS, "response"); + writer.writeStartElement(Constants.SCA11_NS, "response"); writeResponseDestinationProperties( jmsBinding, writer ); writeResponseConnectionFactoryProperties( jmsBinding, writer ); writeResponseActivationSpecProperties( jmsBinding, writer ); @@ -1020,7 +1024,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St */ private void writeHeaders( JMSBinding jmsBinding, XMLStreamWriter writer) throws XMLStreamException { - writer.writeStartElement(Constants.SCA10_NS, JMSBindingConstants.HEADERS); + writer.writeStartElement(Constants.SCA11_NS, JMSBindingConstants.HEADERS); String jmsType = jmsBinding.getJMSType(); if (jmsType != null && jmsType.length() > 0) { @@ -1077,7 +1081,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St Object key = entry.getKey(); Object value = entry.getValue(); - writer.writeStartElement(Constants.SCA10_NS, "property" ); + writer.writeStartElement(Constants.SCA11_NS, "property" ); writer.writeAttribute("name", key.toString()); if ( value instanceof String) { @@ -1144,7 +1148,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St for(Iterator<String> it=operationNames.iterator(); it.hasNext(); ) { String opName = it.next(); - writer.writeStartElement(Constants.SCA10_NS, "operationProperties"); + writer.writeStartElement(Constants.SCA11_NS, "operationProperties"); writer.writeAttribute("name", opName); String nativeOperation = jmsBinding.getNativeOperationName(opName); @@ -1171,7 +1175,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St jmsDeliveryMode != null || jmsTimeToLive != null || jmsPriority != null) { - writer.writeStartElement(Constants.SCA10_NS, JMSBindingConstants.HEADERS); + writer.writeStartElement(Constants.SCA11_NS, JMSBindingConstants.HEADERS); if (jmsType != null && jmsType.length() > 0) { writer.writeAttribute("JMSType", jmsType); @@ -1228,7 +1232,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St Object key = entry.getKey(); Object value = entry.getValue(); - writer.writeStartElement(Constants.SCA10_NS, "property" ); + writer.writeStartElement(Constants.SCA11_NS, "property" ); if (key != null){ writer.writeAttribute("name", key.toString()); } @@ -1259,7 +1263,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St private void writeSubscriptionHeaders( JMSBinding jmsBinding, XMLStreamWriter writer) throws XMLStreamException { String jmsSubscriptionHeaders = jmsBinding.getJMSSelector(); if (jmsSubscriptionHeaders != null && jmsSubscriptionHeaders.length() > 0) { - writer.writeStartElement(Constants.SCA10_NS, "SubscriptionHeaders"); + writer.writeStartElement(Constants.SCA11_NS, "SubscriptionHeaders"); writer.writeAttribute("JMSSelector", jmsSubscriptionHeaders); writer.writeEndElement(); // Strange bug. Without white space, headers end tag improperly read. @@ -1282,7 +1286,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St return; } - writer.writeStartElement(Constants.SCA10_NS, "destination"); + writer.writeStartElement(Constants.SCA11_NS, "destination"); if ( destinationName != null && destinationName.length() > 0) { writer.writeAttribute("name", destinationName); @@ -1321,7 +1325,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St return; } - writer.writeStartElement(Constants.SCA10_NS, "connectionFactory"); + writer.writeStartElement(Constants.SCA11_NS, "connectionFactory"); if ( cfName != null && cfName.length() > 0) { writer.writeAttribute("name", cfName); @@ -1355,7 +1359,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St return; } - writer.writeStartElement(Constants.SCA10_NS, "activationSpec"); + writer.writeStartElement(Constants.SCA11_NS, "activationSpec"); if ( asName != null && asName.length() > 0) { writer.writeAttribute("name", asName); @@ -1390,7 +1394,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St return; } - writer.writeStartElement(Constants.SCA10_NS, "destination"); + writer.writeStartElement(Constants.SCA11_NS, "destination"); if ( destinationName != null && destinationName.length() > 0) { writer.writeAttribute("name", destinationName); @@ -1429,7 +1433,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St return; } - writer.writeStartElement(Constants.SCA10_NS, "connectionFactory"); + writer.writeStartElement(Constants.SCA11_NS, "connectionFactory"); if ( cfName != null && cfName.length() > 0) { writer.writeAttribute("name", cfName); @@ -1462,7 +1466,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St return; } - writer.writeStartElement(Constants.SCA10_NS, "activationSpec"); + writer.writeStartElement(Constants.SCA11_NS, "activationSpec"); if ( asName != null && asName.length() > 0) { writer.writeAttribute("name", asName); @@ -1494,7 +1498,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St return; } - writer.writeStartElement(Constants.SCA10_NS, "resourceAdapter"); + writer.writeStartElement(Constants.SCA11_NS, "resourceAdapter"); if ( asName != null && asName.length() > 0) { writer.writeAttribute("name", asName); diff --git a/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java b/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java index d7044c48af..7d0234bad0 100644 --- a/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java +++ b/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.binding.jms.wireformat.jmsbytes; import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.assembly.WireFormat; +import org.apache.tuscany.sca.assembly.xml.Constants; /** * Implementation for policies that could be injected as parameter diff --git a/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java b/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java index e885b73574..8319148a19 100644 --- a/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java +++ b/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.binding.jms.wireformat.jmsbytesxml; import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.assembly.WireFormat; +import org.apache.tuscany.sca.assembly.xml.Constants; public class WireFormatJMSBytesXML implements WireFormat { diff --git a/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java b/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java index 6d666935ec..8295d613b7 100644 --- a/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java +++ b/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml; import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.assembly.WireFormat; +import org.apache.tuscany.sca.assembly.xml.Constants; /** * diff --git a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java index d15a0abff0..e486377b2f 100644 --- a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java +++ b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java @@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamReader; import junit.framework.TestCase;
import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.OperationsConfigurator;
import org.apache.tuscany.sca.assembly.WireFormat;
import org.apache.tuscany.sca.binding.jms.wireformat.jmsbytes.WireFormatJMSBytes;
import org.apache.tuscany.sca.binding.jms.wireformat.jmsobject.WireFormatJMSObject;
@@ -402,7 +403,7 @@ public class JMSBindingProcessorTestCase extends TestCase { inputFactory = XMLInputFactory.newInstance();
// Create a monitor
UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
- MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();
+ MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
if (monitorFactory != null) {
monitor = monitorFactory.createMonitor();
utilities.addUtility(monitorFactory);
diff --git a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java index 72e6cef7ad..d7644071c1 100644 --- a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java +++ b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java @@ -77,7 +77,7 @@ public class JMSBindingProcessorWriteTestCase extends TestCase { outputFactory = XMLOutputFactory.newInstance(); // Create a monitor UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl(); + MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); if (monitorFactory != null) { monitor = monitorFactory.createMonitor(); utilities.addUtility(monitorFactory); @@ -92,6 +92,7 @@ public class JMSBindingProcessorWriteTestCase extends TestCase { */ public void testLoadValidComposite() throws Exception { XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.COMPOSITE)); + Object o = staxProcessor.read(reader); Composite composite = (Composite)staxProcessor.read(reader); JMSBinding binding = (JMSBinding)composite.getComponents().get(0).getServices().get(0).getBindings().get(0); assertNotNull(binding); |