Author: antelder
Date: Mon Jun 21 12:53:31 2010
New Revision: 956554
URL: http://svn.apache.org/viewvc?rev=956554&view=rev
Log:
Change all exception throwing to be Monitor errors
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java?rev=956554&r1=956553&r2=956554&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
Mon Jun 21 12:53:31 2010
@@ -305,13 +305,13 @@ public class JMSBindingProcessor extends
if (jmsBinding.getRequestWireFormat() == null)
{
jmsBinding.setRequestWireFormat((WireFormat) extension);
} else {
- throw new ContributionReadException("The
request wireformat has already been defined. " + "Only one request wire format
can be specified.");
+ error(monitor, "WireFormatAlreadyDefined",
reader, extension.toString());
}
} else if (extension instanceof OperationSelector)
{
if (jmsBinding.getOperationSelector() == null)
{
jmsBinding.setOperationSelector((OperationSelector) extension);
} else {
- throw new ContributionReadException("More
than one operation selector has been specified. " + "Only one operation
selector can be specified.");
+ error(monitor, "OpSelectorAlreadyDefined",
reader, extension.toString());
}
} else {
@@ -517,7 +517,7 @@ public class JMSBindingProcessor extends
if (jmsBinding.getResponseWireFormat() ==
null) {
jmsBinding.setResponseWireFormat((WireFormat)extension);
} else {
- throw new ContributionReadException("The
response wireformat has already been defined. " + "Only one response wire
format can be specified.");
+ error(context.getMonitor(),
"ResponseWireformatAlreadyDefined", reader, extension.toString());
}
} else {
error(context.getMonitor(),
"UnexpectedElement", reader, extension.toString());
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties?rev=956554&r1=956553&r2=956554&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
Mon Jun 21 12:53:31 2010
@@ -48,3 +48,6 @@ ConnectionFactoryActivationSpecContradic
ResponseAttrElement = Response connection \"{0}\" and response element \"{1}\"
are mutually exclusive
BindingNotFound = {0} refers to a binding definition {1} which is not found
DuplicateOperationProperties = Must not use both operationProperties attribute
and operationProperties element
+WireFormatAlreadyDefined = The request wireformat has already been defined.
Only one request wire format can be specified.
+OpSelectorAlreadyDefined = More than one operation selector has been
specified. Only one operation selector can be specified.
+ResponseWireformatAlreadyDefined = The response wireformat has already been
defined. Only one response wire format can be specified.
