Author: mckierna
Date: Wed Sep 26 02:08:47 2007
New Revision: 579528
URL: http://svn.apache.org/viewvc?rev=579528&view=rev
Log:
no need to check that RM1.0 annon out-in has a sequence offer, since we
actually force an offer in this case
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/MessageValidator.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/MessageValidator.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/MessageValidator.java?rev=579528&r1=579527&r2=579528&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/MessageValidator.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/MessageValidator.java
Wed Sep 26 02:08:47 2007
@@ -95,32 +95,5 @@
// TODO do validation based on states
}
-
- public static void validateOutgoingMessage (RMMsgContext rmMsgContext)
throws SandeshaException {
-
- MessageContext msgContext = rmMsgContext.getMessageContext();
- if (!msgContext.isServerSide()) {
- //validating messages from the client.
-
- //if sync InOut and NoOffer and RM 1.0 an exception
should be thrown
- String mep =
msgContext.getAxisOperation().getMessageExchangePattern();
- String offer = (String)
msgContext.getProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID);
-
- EndpointReference replyTo =
rmMsgContext.getMessageContext().getOptions().getReplyTo();
- boolean anonReplyTo = false;
- if (replyTo==null || replyTo.hasAnonymousAddress())
- anonReplyTo = true;
-
- //For RM 1.0 there must be an offer to get an Anon
response.
- if
(!Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(rmMsgContext.getRMSpecVersion())
&&
- WSDL2Constants.MEP_URI_OUT_IN.equals(mep) &&
- offer==null && anonReplyTo) {
-
- String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.offerRequiredForAnon);
- throw new SandeshaException(message);
-
- }
-
- }
- }
+
}
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java?rev=579528&r1=579527&r2=579528&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
Wed Sep 26 02:08:47 2007
@@ -237,7 +237,6 @@
public final static String noPolling="noPolling";
public final static String noPollingProtocol="noPollingProtocol";
public final static String freeingTransport="freeingTransport";
- public final static String offerRequiredForAnon =
"offerRequiredForAnon";
public final static String
couldNotSendFaultDueToException="couldNotSendFaultDueToException";
}
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=579528&r1=579527&r2=579528&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Wed Sep 26 02:08:47 2007
@@ -91,9 +91,8 @@
MessageContext msgContext = rmMsgCtx.getMessageContext();
ConfigurationContext configContext =
msgContext.getConfigurationContext();
-
- //validating the outgoing message
- MessageValidator.validateOutgoingMessage(rmMsgCtx);
+
+ //Please note: no need to check that RM1.0 annon out-in has a
sequence offer, since we actually force an offer in this case
// setting the Fault callback
SandeshaListener faultCallback = (SandeshaListener)
msgContext.getOptions().getProperty(
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties?rev=579528&r1=579527&r2=579528&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
Wed Sep 26 02:08:47 2007
@@ -224,7 +224,6 @@
invalidElementFoundWithinElement=Found invalid ''{0}'' element within ''{1}''
element.
invokerNotFound=An invoker thread was not found to dispatch messages on the
inbound sequence {0}.
cannotSetPolicyBeanServiceNull=Cannot set the given SandeshaPolicyBean since
the AxisService is not present
-offerRequiredForAnon=If you are going to try sync in-out message exchanges
with RM 1.0, you must do an offer
#------------------
# Security messages
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
