Author: dkulp
Date: Mon Oct 26 17:01:30 2009
New Revision: 829863
URL: http://svn.apache.org/viewvc?rev=829863&view=rev
Log:
Merged revisions 829860 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r829860 | dkulp | 2009-10-26 12:54:34 -0400 (Mon, 26 Oct 2009) | 1 line
[CXF-2496] Add addressingRequired attribute to ws-addressing schema
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/resources/schemas/ws-addr-conf.xsd
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=829863&r1=829862&r2=829863&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Mon Oct 26 17:01:30 2009
@@ -130,6 +130,7 @@
* element is to be advisory
*/
public void setUsingAddressingAdvisory(boolean advisory) {
+ usingAddressingAdvisory = advisory;
}
/**
Modified:
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/resources/schemas/ws-addr-conf.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/resources/schemas/ws-addr-conf.xsd?rev=829863&r1=829862&r2=829863&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/resources/schemas/ws-addr-conf.xsd
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/resources/schemas/ws-addr-conf.xsd
Mon Oct 26 17:01:30 2009
@@ -29,6 +29,7 @@
<xs:complexType>
<xs:attribute name="allowDuplicates" type="xs:boolean"/>
<xs:attribute name="usingAddressingAdvisory" type="xs:boolean"/>
+ <xs:attribute name="addressingRequired" type="xs:boolean"/>
</xs:complexType>
</xs:element>
