Author: mlovett
Date: Tue Jan 9 03:43:10 2007
New Revision: 494381
URL: http://svn.apache.org/viewvc?view=rev&rev=494381
Log:
Ensure we use consistent ws-a spec levels
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java?view=diff&rev=494381&r1=494380&r2=494381
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
Tue Jan 9 03:43:10 2007
@@ -123,7 +123,15 @@
// is already using (if set), and fall back to the level in the
spec if that isn't
// found.
String addressingNamespace = (String)
applicationMsgContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- if(addressingNamespace == null) addressingNamespace =
SpecSpecificConstants.getAddressingNamespace(rmNamespaceValue);
+ Boolean disableAddressing = (Boolean)
applicationMsgContext.getProperty(AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES);
+ if(addressingNamespace == null) {
+ // Addressing may still be enabled, as it defaults to
the final spec. The only time
+ // we follow the RM spec is when addressing has been
explicitly disabled.
+ if(disableAddressing != null &&
disableAddressing.booleanValue())
+ addressingNamespace =
SpecSpecificConstants.getAddressingNamespace(rmNamespaceValue);
+ else
+ addressingNamespace =
AddressingConstants.Final.WSA_NAMESPACE;
+ }
// If acksTo has not been set, then default to anonaymous,
using the correct spec level
String anon =
SpecSpecificConstants.getAddressingAnonymousURI(addressingNamespace);
Modified:
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java?view=diff&rev=494381&r1=494380&r2=494381
==============================================================================
---
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java
(original)
+++
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java
Tue Jan 9 03:43:10 2007
@@ -56,6 +56,11 @@
runAddressingTest(clientOptions);
}
+ public void testAddressingDefault() throws Exception {
+ Options clientOptions = new Options ();
+ runAddressingTest(clientOptions);
+ }
+
public void testAddressingNone() throws Exception {
Options clientOptions = new Options ();
clientOptions.setProperty(AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES,
Boolean.TRUE);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
