cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r830165 - in /cxf/branches/2.1.x-fixes: ./ rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java rt/ws/addr/src/main/resources/schemas/ws-addr-conf.xsd
Date Tue, 27 Oct 2009 13:24:57 GMT
Author: dkulp
Date: Tue Oct 27 13:24:56 2009
New Revision: 830165

URL: http://svn.apache.org/viewvc?rev=830165&view=rev
Log:
Merged revisions 829863 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r829863 | dkulp | 2009-10-26 13:01:30 -0400 (Mon, 26 Oct 2009) | 9 lines
  
  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.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
    cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/resources/schemas/ws-addr-conf.xsd

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=830165&r1=830164&r2=830165&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Tue Oct 27 13:24:56 2009
@@ -129,6 +129,7 @@
      * element is to be advisory
      */
     public void setUsingAddressingAdvisory(boolean advisory) {
+        usingAddressingAdvisory = advisory;
     }
     
     /**

Modified: cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/resources/schemas/ws-addr-conf.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/resources/schemas/ws-addr-conf.xsd?rev=830165&r1=830164&r2=830165&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/resources/schemas/ws-addr-conf.xsd (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/resources/schemas/ws-addr-conf.xsd Tue Oct
27 13:24:56 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>
     



Mime
View raw message