cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1304520 - /cxf/branches/2.3.x-fixes/
Date Fri, 23 Mar 2012 17:30:50 GMT
Author: dkulp
Date: Fri Mar 23 17:30:49 2012
New Revision: 1304520

URL: http://svn.apache.org/viewvc?rev=1304520&view=rev
Log:
Blocking revisions 1296992,1297373,1297939,1298638,1298895,1298896,1299008,1299009,1299010,1299699,1299737,1299800,1300274,1300344,1300539,1300561,1301560,1301626,1301659,1302804,1302832,1302979,1303073,1303079,1303080,1303240,1303870,1303892,1304372,1304492,1304497
via  svn from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

........
  r1296992 | coheigea | 2012-03-05 05:20:34 -0500 (Mon, 05 Mar 2012) | 1 line
  
  Upgrading to WSS4J 1.6.5
........
........
  r1297373 | ay | 2012-03-06 03:01:34 -0500 (Tue, 06 Mar 2012) | 16 lines
  
  Merged revisions 1297370 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1297370 | ay | 2012-03-06 08:51:02 +0100 (Tue, 06 Mar 2012) | 9 lines
    
    Merged revisions 1297296 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1297296 | ay | 2012-03-06 00:57:14 +0100 (Tue, 06 Mar 2012) | 1 line
      
      [CXF-4164] Robust-InOnly processing with WS-RM must delay updating the sequence until
message delivery
    ........
  ................
  
........
........
  r1297939 | coheigea | 2012-03-07 06:19:21 -0500 (Wed, 07 Mar 2012) | 1 line
  
  [CXF-4166] - CXF does not always respect SecurityPolicy TokenInclusion for the AsymmetricBinding
........
........
  r1298638 | ay | 2012-03-08 17:52:23 -0500 (Thu, 08 Mar 2012) | 23 lines
  
  Blocked revisions 1298637 via svnmerge
  
  ................
    r1298637 | ay | 2012-03-08 23:49:43 +0100 (Thu, 08 Mar 2012) | 17 lines
    
    Merged revisions 1298601,1298608,1298624 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1298601 | ay | 2012-03-08 22:46:32 +0100 (Thu, 08 Mar 2012) | 1 line
      
      [CXF-4170] JMX InstrumentationManagerImpl's properties may not be read correctly in
standalone mode after 2.5.2
    ........
      r1298608 | ay | 2012-03-08 23:03:27 +0100 (Thu, 08 Mar 2012) | 1 line
      
      something went wrong with CXF-4170 fix; temporarily reverting it
    ........
      r1298624 | ay | 2012-03-08 23:26:04 +0100 (Thu, 08 Mar 2012) | 1 line
      
      un-reverting the previous commit for CXF-4170 as it looks okay
    ........
  ................
  
........
........
  r1298895 | coheigea | 2012-03-09 11:03:53 -0500 (Fri, 09 Mar 2012) | 6 lines
  
  [CXF-1636] - Adding support for caching UsernameToken nonces and Timestamps
  
  
  Conflicts:
  
  	parent/pom.xml
........
........
  r1298896 | coheigea | 2012-03-09 11:04:16 -0500 (Fri, 09 Mar 2012) | 1 line
  
  [CXF-1636] - Some updates for the 2.5.x-fixes branch
........
........
  r1299008 | dkulp | 2012-03-09 14:52:59 -0500 (Fri, 09 Mar 2012) | 18 lines
  
  Merged revisions 1299004 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1299004 | dkulp | 2012-03-09 14:50:00 -0500 (Fri, 09 Mar 2012) | 10 lines
    
    Merged revisions 1298998 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1298998 | dkulp | 2012-03-09 14:32:02 -0500 (Fri, 09 Mar 2012) | 3 lines
    
      [CXF-4169] make nested exception causes available at the client
      Patch from Stefan Wachter applied
    
    ........
  ........
  
........
........
  r1299009 | dkulp | 2012-03-09 14:53:31 -0500 (Fri, 09 Mar 2012) | 17 lines
  
  Merged revisions 1299005 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1299005 | dkulp | 2012-03-09 14:50:05 -0500 (Fri, 09 Mar 2012) | 9 lines
    
    Merged revisions 1298999 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1298999 | dkulp | 2012-03-09 14:32:07 -0500 (Fri, 09 Mar 2012) | 2 lines
    
      [CXF-4163] Should not add xsd files with no namespace into JAXB
    
    ........
  ........
  
........
........
  r1299010 | dkulp | 2012-03-09 14:53:41 -0500 (Fri, 09 Mar 2012) | 155 lines
  
  Blocking revisions 1298966,1298967,1298968,1299006 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1298966 | dkulp | 2012-03-09 13:34:32 -0500 (Fri, 09 Mar 2012) | 9 lines
    
    Merged revisions 1298957 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1298957 | dkulp | 2012-03-09 13:18:09 -0500 (Fri, 09 Mar 2012) | 2 lines
    
      [CXF-4140] Make registerPublisher compliant with the spec
    
    ........
  ........
  ........
    r1298967 | dkulp | 2012-03-09 13:34:38 -0500 (Fri, 09 Mar 2012) | 40 lines
    
    Recording revisions 1296995,1297034,1297925,1298871,1298956,1298957 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1296995 | coheigea | 2012-03-05 05:26:15 -0500 (Mon, 05 Mar 2012) | 2 lines
      
      Upgrading to WSS4J 1.6.5
      
    ........
    ........
      r1297034 | coheigea | 2012-03-05 07:46:49 -0500 (Mon, 05 Mar 2012) | 2 lines
      
      [CXF-4160] - Support signing a SAML token using the requested signature and canonicalization
algorithm
      
    ........
    ........
      r1297925 | coheigea | 2012-03-07 05:51:16 -0500 (Wed, 07 Mar 2012) | 2 lines
      
      [CXF-4166] - CXF does not always respect SecurityPolicy TokenInclusion for the AsymmetricBinding
      
    ........
    ........
      r1298871 | coheigea | 2012-03-09 10:25:02 -0500 (Fri, 09 Mar 2012) | 2 lines
      
      [CXF-1636] - Adding support for caching UsernameToken nonces and Timestamps
      
    ........
    ........
      r1298956 | dkulp | 2012-03-09 13:18:03 -0500 (Fri, 09 Mar 2012) | 2 lines
      
      Fix potential NPE
      
    ........
    ........
      r1298957 | dkulp | 2012-03-09 13:18:09 -0500 (Fri, 09 Mar 2012) | 2 lines
      
      [CXF-4140] Make registerPublisher compliant with the spec
      
    ........
    
  ........
  ........
    r1298968 | dkulp | 2012-03-09 13:34:40 -0500 (Fri, 09 Mar 2012) | 69 lines
    
    Blocking revisions 1297072,1297436,1297588,1297971,1297999,1298359,1298470,1298567,1298586,1298801
via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1297072 | sergeyb | 2012-03-05 09:32:40 -0500 (Mon, 05 Mar 2012) | 2 lines
      
      [CXF-3589] Prototyping the skeleton code for supporting saml web sso on the SP side
based on Colm's test
      
    ........
    ........
      r1297436 | coheigea | 2012-03-06 07:11:26 -0500 (Tue, 06 Mar 2012) | 3 lines
      
      [CXF-4161] - Support processing a UseKey Element that uses a SecurityTokenReference
to another token
       - Only merging this to trunk, as it breaks backwards compatibility in the KeyRequirements
class.
      
    ........
    ........
      r1297588 | owulff | 2012-03-06 12:33:04 -0500 (Tue, 06 Mar 2012) | 2 lines
      
      [CXF-3882] Support for Claims transformation in validate or issue RST
      
    ........
    ........
      r1297971 | sergeyb | 2012-03-07 08:52:46 -0500 (Wed, 07 Mar 2012) | 2 lines
      
      [CXF-4112,CXF-4151] A lof of refactoring to do with supporting different grants, preauthorized
tokens, etc
      
    ........
    ........
      r1297999 | coheigea | 2012-03-07 10:55:25 -0500 (Wed, 07 Mar 2012) | 2 lines
      
      [CXF-4168] - Support processing a KeyInfo/KeyValue child of UseKey in a RequestSecurityToken
      
    ........
    ........
      r1298359 | coheigea | 2012-03-08 06:15:17 -0500 (Thu, 08 Mar 2012) | 3 lines
      
      [CXF-4156] - Support SymmetricKeys for Entropy/BinarySecret Elements
       - Part I.
      
    ........
    ........
      r1298470 | sergeyb | 2012-03-08 11:57:36 -0500 (Thu, 08 Mar 2012) | 2 lines
      
      Initial commit for addressing the collision issue
      
    ........
    ........
      r1298567 | dkulp | 2012-03-08 15:40:12 -0500 (Thu, 08 Mar 2012) | 4 lines
      
      When WS-N is used with CXF in OSGi, wire in the jmx management and make sure it uses
      a bundle specific bus instead of the global Bus.  Restore testing with
      the RI which apparently has been broken for a while.
      
    ........
    ........
      r1298586 | dkulp | 2012-03-08 16:15:34 -0500 (Thu, 08 Mar 2012) | 2 lines
      
      Fix build failure
      
    ........
    ........
      r1298801 | coheigea | 2012-03-09 07:11:34 -0500 (Fri, 09 Mar 2012) | 3 lines
      
      [CXF-4156] - Support SymmetricKeys for Entropy/BinarySecret Elements
       - Part II - Support for processing an EncryptedKey child of the client Entropy
      
    ........
    
  ........
  ........
    r1299006 | dkulp | 2012-03-09 14:50:10 -0500 (Fri, 09 Mar 2012) | 17 lines
    
    Recording revisions 1298998,1298999 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1298998 | dkulp | 2012-03-09 14:32:02 -0500 (Fri, 09 Mar 2012) | 3 lines
      
      [CXF-4169] make nested exception causes available at the client
      Patch from Stefan Wachter applied
      
    ........
    ........
      r1298999 | dkulp | 2012-03-09 14:32:07 -0500 (Fri, 09 Mar 2012) | 2 lines
      
      [CXF-4163] Should not add xsd files with no namespace into JAXB
      
    ........
    
  ........
  
........
........
  r1299699 | coheigea | 2012-03-12 10:55:01 -0400 (Mon, 12 Mar 2012) | 1 line
  
  Setting a max TTL on the EhCacheReplayCache
........
........
  r1299737 | sergeyb | 2012-03-12 12:46:30 -0400 (Mon, 12 Mar 2012) | 16 lines
  
  Merged revisions 1299725 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1299725 | sergeyb | 2012-03-12 16:04:13 +0000 (Mon, 12 Mar 2012) | 9 lines
    
    Merged revisions 1299682 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1299682 | sergeyb | 2012-03-12 14:28:31 +0000 (Mon, 12 Mar 2012) | 1 line
      
      [CXF-4178] Fixing ClientProxyImpl to handle Multipart annotations
    ........
  ................
  
........
........
  r1299800 | ay | 2012-03-12 15:23:09 -0400 (Mon, 12 Mar 2012) | 15 lines
  
  Blocked revisions 1299795 via svnmerge
  
  ................
    r1299795 | ay | 2012-03-12 20:13:49 +0100 (Mon, 12 Mar 2012) | 9 lines
    
    Merged revisions 1299707 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1299707 | ay | 2012-03-12 16:17:47 +0100 (Mon, 12 Mar 2012) | 1 line
      
      handle null-EndpointReference in WS-RM Destination and Source for JMX monitor
    ........
  ................
  
........
........
  r1300274 | dkulp | 2012-03-13 14:29:56 -0400 (Tue, 13 Mar 2012) | 18 lines
  
  Merged revisions 1300270 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1300270 | dkulp | 2012-03-13 14:25:59 -0400 (Tue, 13 Mar 2012) | 10 lines
    
    Merged revisions 1300261 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1300261 | dkulp | 2012-03-13 14:04:05 -0400 (Tue, 13 Mar 2012) | 3 lines
    
      Use some reflection magic to allow code compiled with Jetty 7.5 to work
      with Jetty 7.6
    
    ........
  ................
  
........
........
  r1300344 | dkulp | 2012-03-13 16:35:53 -0400 (Tue, 13 Mar 2012) | 16 lines
  
  Merged revisions 1300343 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1300343 | dkulp | 2012-03-13 16:35:00 -0400 (Tue, 13 Mar 2012) | 9 lines
    
    Merged revisions 1300342 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1300342 | dkulp | 2012-03-13 16:34:14 -0400 (Tue, 13 Mar 2012) | 1 line
      
      [CXF-4175] more fixes for Jetty compatibility
    ........
  ................
  
........
........
  r1300539 | dkulp | 2012-03-14 09:34:25 -0400 (Wed, 14 Mar 2012) | 16 lines
  
  Merged revisions 1300536 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1300536 | dkulp | 2012-03-14 09:20:05 -0400 (Wed, 14 Mar 2012) | 9 lines
    
    Merged revisions 1300518 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1300518 | dkulp | 2012-03-14 08:06:48 -0400 (Wed, 14 Mar 2012) | 1 line
      
      Fix typo.  :-)
    ........
  ................
  
........
........
  r1300561 | sergeyb | 2012-03-14 10:32:37 -0400 (Wed, 14 Mar 2012) | 16 lines
  
  Merged revisions 1300560 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1300560 | sergeyb | 2012-03-14 14:27:34 +0000 (Wed, 14 Mar 2012) | 9 lines
    
    Merged revisions 1300555 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1300555 | sergeyb | 2012-03-14 14:22:09 +0000 (Wed, 14 Mar 2012) | 1 line
      
      Adding a typed version of the method posting the object and getting the collection to
WebClient
    ........
  ................
  
........
........
  r1301560 | ningjiang | 2012-03-16 10:46:46 -0400 (Fri, 16 Mar 2012) | 16 lines
  
  Merged revisions 1301549 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1301549 | ningjiang | 2012-03-16 22:38:18 +0800 (Fri, 16 Mar 2012) | 9 lines
    
    Merged revisions 1301539 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1301539 | ningjiang | 2012-03-16 22:18:01 +0800 (Fri, 16 Mar 2012) | 1 line
      
      CXF-4180 LogUtils should default to CXF's Slf4jLogger if it can't find Log4J or JCL
driver
    ........
  ................
  
........
........
  r1301626 | ningjiang | 2012-03-16 12:16:58 -0400 (Fri, 16 Mar 2012) | 1 line
  
  CXF-4180 revert the patch which has some side effects
........
........
  r1301659 | ay | 2012-03-16 13:30:31 -0400 (Fri, 16 Mar 2012) | 16 lines
  
  Merged revisions 1301636 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1301636 | ay | 2012-03-16 17:29:14 +0100 (Fri, 16 Mar 2012) | 9 lines
    
    Merged revisions 1301597
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1301597 | ay | 2012-03-16 15:31:24 +0100 (Fri, 16 Mar 2012) | 1 line
      
      [CXF-4182] make jaxws.provider.interpretNullAsOneway prop configurable using a string
    ........
  ................
  
........
........
  r1302804 | ffang | 2012-03-20 05:11:44 -0400 (Tue, 20 Mar 2012) | 1 line
  
  rt-transports-http module should optionally depend on spring
........
........
  r1302832 | coheigea | 2012-03-20 06:56:44 -0400 (Tue, 20 Mar 2012) | 1 line
  
  Make it possible to use a custom WSS4J Action on its own
........
........
  r1302979 | ay | 2012-03-20 12:27:48 -0400 (Tue, 20 Mar 2012) | 17 lines
  
  Merged revisions 1302966 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1302966 | ay | 2012-03-20 17:14:46 +0100 (Tue, 20 Mar 2012) | 9 lines
    
    Merged revisions 1300485 via  svn merge from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1300485 | ay | 2012-03-14 10:40:00 +0100 (Wed, 14 Mar 2012) | 1 line
      
      improvement to CXF-4164 to utilize robust-mode to avoid persisting messages in ws-rm
    ........
    
  ........
  
........
........
  r1303073 | dkulp | 2012-03-20 14:35:51 -0400 (Tue, 20 Mar 2012) | 9 lines
  
  Merged revisions 1302580 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1302580 | dkulp | 2012-03-19 14:11:32 -0400 (Mon, 19 Mar 2012) | 1 line
    
    Update asm version
  ........
  
........
........
  r1303079 | dkulp | 2012-03-20 14:37:47 -0400 (Tue, 20 Mar 2012) | 4 lines
  
  Recording revisions 1296993,1297929,1298889,1298890,1299692,1302802,1302829 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  
........
........
  r1303080 | dkulp | 2012-03-20 14:37:50 -0400 (Tue, 20 Mar 2012) | 432 lines
  
  Blocking revisions 1296195,1297038,1300233,1300240,1300271,1300272,1300332,1300535,1300542,1301040,1301213,1301440,1301549,1301627,1302578,1302579,1302937,1302938,1303012,1303013,1303014
via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1296195 | sergeyb | 2012-03-02 08:24:04 -0500 (Fri, 02 Mar 2012) | 9 lines
    
    Merged revisions 1296183 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1296183 | sergeyb | 2012-03-02 12:58:48 +0000 (Fri, 02 Mar 2012) | 1 line
      
      [CXF-4142] Checking contextual properties for non-root parts
    ........
    
  ........
  ........
    r1297038 | coheigea | 2012-03-05 07:53:19 -0500 (Mon, 05 Mar 2012) | 1 line
    
    [CXF-4160] - Support signing a SAML token using the requested signature and canonicalization
algorithm
  ........
  ........
    r1300233 | sergeyb | 2012-03-13 12:46:44 -0400 (Tue, 13 Mar 2012) | 1 line
    
    Unblocking r1236902 and r1298470
  ........
  ........
    r1300240 | sergeyb | 2012-03-13 13:09:49 -0400 (Tue, 13 Mar 2012) | 9 lines
    
    Merged revisions 1236902 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1236902 | sergeyb | 2012-01-27 21:49:40 +0000 (Fri, 27 Jan 2012) | 1 line
      
      Moving the cors code to the new rs/security/cors module
    ........
    
  ........
  ........
    r1300271 | dkulp | 2012-03-13 14:26:04 -0400 (Tue, 13 Mar 2012) | 17 lines
    
    Recording revisions 1299691,1300261 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1299691 | coheigea | 2012-03-12 10:47:51 -0400 (Mon, 12 Mar 2012) | 2 lines
      
      Setting a max TTL on the EhCacheReplayCache
      
    ........
    ........
      r1300261 | dkulp | 2012-03-13 14:04:05 -0400 (Tue, 13 Mar 2012) | 3 lines
      
      Use some reflection magic to allow code compiled with Jetty 7.5 to work
      with Jetty 7.6
      
    ........
    
  ........
  ........
    r1300272 | dkulp | 2012-03-13 14:26:05 -0400 (Tue, 13 Mar 2012) | 28 lines
    
    Blocking revisions 1298565,1299524,1299782,1300092 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1298565 | dkulp | 2012-03-08 15:40:02 -0500 (Thu, 08 Mar 2012) | 2 lines
      
      Add a whiteboard feature to allow feature.xml to work with Karaf 2.2.5
      
    ........
    ........
      r1299524 | dkulp | 2012-03-11 22:20:16 -0400 (Sun, 11 Mar 2012) | 2 lines
      
      Enhance SAAJ usage to better work with other SAAJ implementations
      
    ........
    ........
      r1299782 | dkulp | 2012-03-12 14:51:28 -0400 (Mon, 12 Mar 2012) | 2 lines
      
      More updates for working with different SAAJ implementations
      
    ........
    ........
      r1300092 | coheigea | 2012-03-13 08:25:13 -0400 (Tue, 13 Mar 2012) | 2 lines
      
      [CXF-4158] - Added support for renewing SecurityContextTokens
      
    ........
    
  ........
  ........
    r1300332 | dkulp | 2012-03-13 16:16:52 -0400 (Tue, 13 Mar 2012) | 1 line
    
    Fix parent version number
  ........
  ........
    r1300535 | sergeyb | 2012-03-14 09:16:09 -0400 (Wed, 14 Mar 2012) | 21 lines
    
    Merged revisions 1299900,1300084,1300509,1300523 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1299900 | sergeyb | 2012-03-12 22:10:07 +0000 (Mon, 12 Mar 2012) | 1 line
      
      [CXF-4167] Making sure some of the cors properties can be customized if they are not
set on the annotation
    ........
      r1300084 | sergeyb | 2012-03-13 11:51:51 +0000 (Tue, 13 Mar 2012) | 1 line
      
      [CXF-4167] Also removing a couple of redundant annotation properties
    ........
      r1300509 | sergeyb | 2012-03-14 11:23:58 +0000 (Wed, 14 Mar 2012) | 1 line
      
      [CXF-4167] restoring allowAllOrigins for a moment
    ........
      r1300523 | sergeyb | 2012-03-14 12:33:09 +0000 (Wed, 14 Mar 2012) | 1 line
      
      [CXF-4167] Fixing the test and moving the localPreflight property into its own annotation
    ........
    
  ........
  ........
    r1300542 | dkulp | 2012-03-14 09:43:23 -0400 (Wed, 14 Mar 2012) | 9 lines
    
    Merged revisions 1300541 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1300541 | dkulp | 2012-03-14 09:40:10 -0400 (Wed, 14 Mar 2012) | 1 line
      
      Widen the range of Jetty versions that can be used with CXF
    ........
    
  ........
  ........
    r1301040 | coheigea | 2012-03-15 11:20:32 -0400 (Thu, 15 Mar 2012) | 7 lines
    
    Some updates relating to caching security tokens in the STS
    
    
    Conflicts:
    
    	services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SCTRenewer.java
    	services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SCTValidator.java
  ........
  ........
    r1301213 | dkulp | 2012-03-15 17:32:09 -0400 (Thu, 15 Mar 2012) | 58 lines
    
    Blocking revisions 1300594,1300630,1300662,1300673,1300691,1300714,1301005,1301131,1301154,1301158
via  svn from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1300594 | dkulp | 2012-03-14 11:37:19 -0400 (Wed, 14 Mar 2012) | 1 line
      
      pom was obviously copied from http's pom, but osgi info not updated
    ........
    ........
      r1300630 | dkulp | 2012-03-14 12:42:27 -0400 (Wed, 14 Mar 2012) | 1 line
      
      Bunch of OSGi manifest and feature updates
    ........
    ........
      r1300662 | dkulp | 2012-03-14 13:46:05 -0400 (Wed, 14 Mar 2012) | 2 lines
      
      Update versions for various things we use, particularly OSGi bundles to
      use the new bundles that have sources attachable.
    ........
    ........
      r1300673 | dkulp | 2012-03-14 14:19:46 -0400 (Wed, 14 Mar 2012) | 1 line
      
      Fix java 5 compile
    ........
    ........
      r1300691 | dkulp | 2012-03-14 15:24:32 -0400 (Wed, 14 Mar 2012) | 1 line
      
      More osgi updates
    ........
    ........
      r1300714 | dkulp | 2012-03-14 16:39:20 -0400 (Wed, 14 Mar 2012) | 1 line
      
      Back out a version of the jaxb bundle due to a bug that affects Camel
    ........
    ........
      r1301005 | dkulp | 2012-03-15 10:35:22 -0400 (Thu, 15 Mar 2012) | 1 line
      
      Fix typo in sts feature
    ........
    ........
      r1301131 | dkulp | 2012-03-15 14:33:13 -0400 (Thu, 15 Mar 2012) | 3 lines
      
      Update the HTTPTransportActivator stuff to not have to sync on ALL the
      matchers, just on each one individually.   Also, apply the regex stuff
      first, then the specific address based and name based last.
    ........
    ........
      r1301154 | dkulp | 2012-03-15 15:07:46 -0400 (Thu, 15 Mar 2012) | 1 line
      
      Fix java5 compile
    ........
    ........
      r1301158 | dkulp | 2012-03-15 15:21:16 -0400 (Thu, 15 Mar 2012) | 2 lines
      
      Cleanup some deps in hopes that jenkins will generate the same
      Import-Packages that I get locally
    ........
    
  ........
  ........
    r1301440 | coheigea | 2012-03-16 07:33:48 -0400 (Fri, 16 Mar 2012) | 10 lines
    
    [CXF-4062][CXF-4173] - Enabling custom claim parser / Support for ClaimValue element of
federation claims dialect added
     - Patch(es) applied, thanks! I made a few minor modifications
    
    
    Conflicts:
    
    	services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
    	services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
    	services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
    	services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
  ........
  ........
    r1301549 | ningjiang | 2012-03-16 10:38:18 -0400 (Fri, 16 Mar 2012) | 9 lines
    
    Merged revisions 1301539 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1301539 | ningjiang | 2012-03-16 22:18:01 +0800 (Fri, 16 Mar 2012) | 1 line
      
      CXF-4180 LogUtils should default to CXF's Slf4jLogger if it can't find Log4J or JCL
driver
    ........
    
  ........
  ........
    r1301627 | ningjiang | 2012-03-16 12:17:11 -0400 (Fri, 16 Mar 2012) | 1 line
    
    CXF-4180 revert the patch which has some side effects
  ........
  ........
    r1302578 | dkulp | 2012-03-19 14:09:57 -0400 (Mon, 19 Mar 2012) | 4 lines
    
    Recording revisions 1298913,1301018,1301434 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1302579 | dkulp | 2012-03-19 14:09:59 -0400 (Mon, 19 Mar 2012) | 67 lines
    
    Blocking revisions 1300579,1301484,1301510,1301539,1301550,1301708,1301710,1301711,1301714
via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1300579 | coheigea | 2012-03-14 11:01:37 -0400 (Wed, 14 Mar 2012) | 4 lines
      
      [CXF-4157] - Support batch processing via RequestSecurityTokenCollection.
       - Removed old RequestCollectionOperation from the STS Provider
       - Issue/Renew/Validate/Cancel operations now support processing collections
      
    ........
    ........
      r1301484 | dkulp | 2012-03-16 09:16:19 -0400 (Fri, 16 Mar 2012) | 3 lines
      
      Set the prereq for building to Maven 3.0.   Should not affect those
      using CXF.
      
    ........
    ........
      r1301510 | dkulp | 2012-03-16 09:44:01 -0400 (Fri, 16 Mar 2012) | 3 lines
      
      Rename the priority field to "order" to make it clearer and easier to
      explain
      
    ........
    ........
      r1301539 | ningjiang | 2012-03-16 10:18:01 -0400 (Fri, 16 Mar 2012) | 2 lines
      
      CXF-4180 LogUtils should default to CXF's Slf4jLogger if it can't find Log4J or JCL
driver
      
    ........
    ........
      r1301550 | ningjiang | 2012-03-16 10:38:47 -0400 (Fri, 16 Mar 2012) | 2 lines
      
      CXF-4180 Fixed the CS error of my last commit
      
    ........
    ........
      r1301708 | dkulp | 2012-03-16 15:12:02 -0400 (Fri, 16 Mar 2012) | 2 lines
      
      Initial work to get jetty stuff configured from config:admin
      
    ........
    ........
      r1301710 | dkulp | 2012-03-16 15:16:17 -0400 (Fri, 16 Mar 2012) | 5 lines
      
      Revert "CXF-4180 LogUtils should default to CXF's Slf4jLogger if it can't find Log4J
or JCL driver"
      Need to revert so the unit tests will run to test other changes.
      
      This reverts commit d164ba6a68a2cdfba110064c687ac32707029772.
      
    ........
    ........
      r1301711 | dkulp | 2012-03-16 15:16:27 -0400 (Fri, 16 Mar 2012) | 4 lines
      
      Downgrade to 3.3.1 of ASM as code compiled with ASM 4.0 is NOT
      compatible with 3.3.1 and is causing some strange conflicts that need
      more investigation
      
    ........
    ........
      r1301714 | dkulp | 2012-03-16 15:42:20 -0400 (Fri, 16 Mar 2012) | 2 lines
      
      Add in fastinfoset bundle so the fastinfoset stuff works
      
    ........
    
  ........
  ........
    r1302937 | dkulp | 2012-03-20 11:24:41 -0400 (Tue, 20 Mar 2012) | 4 lines
    
    Recording revisions 1302574,1302822 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1302938 | dkulp | 2012-03-20 11:24:42 -0400 (Tue, 20 Mar 2012) | 58 lines
    
    Blocking revisions 1300208,1300226,1300260,1300360,1301516,1302743,1302744,1302745 via
 git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1300208 | sergeyb | 2012-03-13 12:01:30 -0400 (Tue, 13 Mar 2012) | 2 lines
      
      [CXF-4179,CXF-3141] Introducing ContextProviders and moving the search extension to
its own module
      
    ........
    ........
      r1300226 | sergeyb | 2012-03-13 12:38:16 -0400 (Tue, 13 Mar 2012) | 2 lines
      
      [CXF-4179,CXF-3141] Adding a missing file
      
    ........
    ........
      r1300260 | dkulp | 2012-03-13 14:04:01 -0400 (Tue, 13 Mar 2012) | 2 lines
      
      Fix some compile errors and warnings
      
    ........
    ........
      r1300360 | sergeyb | 2012-03-13 17:27:59 -0400 (Tue, 13 Mar 2012) | 2 lines
      
      Fixing the compilation/test issues caused by the search ext move, sorry
      
    ........
    ........
      r1301516 | coheigea | 2012-03-16 09:51:45 -0400 (Fri, 16 Mar 2012) | 4 lines
      
      Updates to the STS caching mechanism.
       - Tokens have a default TTL of 30 minutes now.
       - Removed STSTokenStore interface
      
    ........
    ........
      r1302743 | dkulp | 2012-03-19 21:21:40 -0400 (Mon, 19 Mar 2012) | 4 lines
      
      Don't log the full message for the "records".  Just clutters the svn
      page in JIRA as we already have it recorded there from the original
      merge.
      
    ........
    ........
      r1302744 | dkulp | 2012-03-19 21:21:50 -0400 (Mon, 19 Mar 2012) | 3 lines
      
      [CXF-4184] For JMS TextMessage, keep the payload as String using
      Reader/Writer instead of streams.
      
    ........
    ........
      r1302745 | dkulp | 2012-03-19 21:21:54 -0400 (Mon, 19 Mar 2012) | 3 lines
      
      Bit of an optimization of MessageImpl internals to reduce work for
      content lookups, particularly for non-default types
      
    ........
    
  ........
  ........
    r1303012 | dkulp | 2012-03-20 13:14:36 -0400 (Tue, 20 Mar 2012) | 10 lines
    
    Merged revisions 1302998 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1302998 | dkulp | 2012-03-20 13:01:47 -0400 (Tue, 20 Mar 2012) | 3 lines
    
      [CXF-4123, CXF-4185] When using a global registry (OSGi), the servlet
      should not destroy the registry when refreshed.
    
    ........
  ........
  ........
    r1303013 | dkulp | 2012-03-20 13:14:41 -0400 (Tue, 20 Mar 2012) | 4 lines
    
    Recording revisions 1302997,1302998 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1303014 | dkulp | 2012-03-20 13:14:43 -0400 (Tue, 20 Mar 2012) | 16 lines
    
    Blocking revisions 1302573,1302999 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1302573 | dkulp | 2012-03-19 13:56:35 -0400 (Mon, 19 Mar 2012) | 2 lines
      
      Too much stuff on the console during tests
      
    ........
    ........
      r1302999 | sergeyb | 2012-03-20 13:02:39 -0400 (Tue, 20 Mar 2012) | 2 lines
      
      [CXF-4184] Also updating JAXB provider to check for Reader/Writer instances
      
    ........
    
  ........
  
........
........
  r1303240 | ffang | 2012-03-20 20:39:04 -0400 (Tue, 20 Mar 2012) | 1 line
  
  rollback changes on fixes branches that make cxf-transports-http optionally depend on spring
which can break backward compatibility
........
........
  r1303870 | ay | 2012-03-22 12:14:06 -0400 (Thu, 22 Mar 2012) | 17 lines
  
  Merged revisions 1303305 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1303305 | ay | 2012-03-21 09:15:13 +0100 (Wed, 21 Mar 2012) | 9 lines
    
    Merged revisions 1303303 via  svn merge from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303303 | ay | 2012-03-21 09:09:28 +0100 (Wed, 21 Mar 2012) | 1 line
      
      [CXF-4188] Robust-InOnly processing with WS-RM to perform AtMostOnce check
    ........
    
  ........
  
........
........
  r1303892 | ay | 2012-03-22 13:06:02 -0400 (Thu, 22 Mar 2012) | 17 lines
  
  Merged revisions 1303345 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1303345 | ay | 2012-03-21 11:23:02 +0100 (Wed, 21 Mar 2012) | 9 lines
    
    Merged revisions 1303342 via  svn merge from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303342 | ay | 2012-03-21 11:16:52 +0100 (Wed, 21 Mar 2012) | 1 line
      
      adding another fix and test to CXF-4188
    ........
    
  ........
  
........
........
  r1304372 | ningjiang | 2012-03-23 10:31:55 -0400 (Fri, 23 Mar 2012) | 16 lines
  
  Merged revisions 1304287 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1304287 | ningjiang | 2012-03-23 19:44:10 +0800 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1304248 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1304248 | ningjiang | 2012-03-23 17:46:10 +0800 (Fri, 23 Mar 2012) | 1 line
      
      CXF-4197 Fixed the simple blueprint schema issue
    ........
  ................
  
........
........
  r1304492 | dkulp | 2012-03-23 13:14:47 -0400 (Fri, 23 Mar 2012) | 10 lines
  
  Merged revisions 1303461 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1303461 | dkulp | 2012-03-21 12:33:51 -0400 (Wed, 21 Mar 2012) | 2 lines
    
    Update to bundle versions that have proper sources jars and bundle info and such.
    
  ........
  
........
........
  r1304497 | dkulp | 2012-03-23 13:18:53 -0400 (Fri, 23 Mar 2012) | 436 lines
  
  Blocking revisions 1303229,1303427,1304411,1304412,1304413,1304414,1304415,1304417,1304418,1304419,1304420,1304421,1304422,1304423,1304424,1304425,1304427,1304428,1304429,1304431,1304432,1304444,1304445,1304446,1304487,1304489
via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1303229 | ffang | 2012-03-20 20:21:08 -0400 (Tue, 20 Mar 2012) | 1 line
    
    rollback changes on fixes branches that make cxf-transports-http optionally depend on
spring which can break backward compatibility
  ........
  ........
    r1303427 | coheigea | 2012-03-21 11:09:31 -0400 (Wed, 21 Mar 2012) | 2 lines
    
    Switching to forkmode "once" for the STS core tests
     - This can give a dramatic speedup if you are running the tests without generating entropy
by moving the mouse etc., as forking per test involves re-seeding SecureRandom for each test
  ........
  ........
    r1304411 | dkulp | 2012-03-23 11:14:59 -0400 (Fri, 23 Mar 2012) | 10 lines
    
    Merged revisions 1303123 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303123 | dkulp | 2012-03-20 16:09:09 -0400 (Tue, 20 Mar 2012) | 3 lines
    
      Update corba/bank sample to use maven.   README update will follow
      later.
    
    ........
  ........
  ........
    r1304412 | dkulp | 2012-03-23 11:15:09 -0400 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1303124 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303124 | dkulp | 2012-03-20 16:09:21 -0400 (Tue, 20 Mar 2012) | 2 lines
    
      Update corba/hello-world sample to maven
    
    ........
  ........
  ........
    r1304413 | dkulp | 2012-03-23 11:15:21 -0400 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1303125 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303125 | dkulp | 2012-03-20 16:09:33 -0400 (Tue, 20 Mar 2012) | 2 lines
    
      Update corba/bank-ws-addressing sampleto maven
    
    ........
  ........
  ........
    r1304414 | dkulp | 2012-03-23 11:15:25 -0400 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1303126 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303126 | dkulp | 2012-03-20 16:09:37 -0400 (Tue, 20 Mar 2012) | 2 lines
    
      Remove unused resources dir and add corba modules to build
    
    ........
  ........
  ........
    r1304415 | dkulp | 2012-03-23 11:15:30 -0400 (Fri, 23 Mar 2012) | 1 line
    
    Update version number in poms
  ........
  ........
    r1304417 | dkulp | 2012-03-23 11:15:34 -0400 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1303152 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303152 | dkulp | 2012-03-20 17:05:14 -0400 (Tue, 20 Mar 2012) | 2 lines
    
      Use full path to directories to avoid failures
    
    ........
  ........
  ........
    r1304418 | dkulp | 2012-03-23 11:15:38 -0400 (Fri, 23 Mar 2012) | 10 lines
    
    Merged revisions 1303160 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303160 | dkulp | 2012-03-20 17:21:44 -0400 (Tue, 20 Mar 2012) | 3 lines
    
      With JMS, it helps to close the proxy pre-emptively to allow the JMS
      broker connection to cleanup cleanly.
    
    ........
  ........
  ........
    r1304419 | dkulp | 2012-03-23 11:15:42 -0400 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1303466 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303466 | dkulp | 2012-03-21 13:07:24 -0400 (Wed, 21 Mar 2012) | 2 lines
    
      Skip test in the server/client profiles to avoid conflicts
    
    ........
  ........
  ........
    r1304420 | dkulp | 2012-03-23 11:15:47 -0400 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1303476 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303476 | gmazza | 2012-03-21 13:39:32 -0400 (Wed, 21 Mar 2012) | 2 lines
    
      Closing JMS client so the broker won't report an EOF exception; some updates to READMEs.
    
    ........
  ........
  ........
    r1304421 | dkulp | 2012-03-23 11:15:51 -0400 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1303532 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303532 | dkulp | 2012-03-21 15:46:18 -0400 (Wed, 21 Mar 2012) | 2 lines
    
      Fix pom so -Pclient works
    
    ........
  ........
  ........
    r1304422 | dkulp | 2012-03-23 11:15:56 -0400 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1303559 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303559 | gmazza | 2012-03-21 16:26:10 -0400 (Wed, 21 Mar 2012) | 2 lines
    
      Updated CORBA README's to show new Maven usage.
    
    ........
  ........
  ........
    r1304423 | dkulp | 2012-03-23 11:16:00 -0400 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1303576 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303576 | gmazza | 2012-03-21 17:20:04 -0400 (Wed, 21 Mar 2012) | 2 lines
    
      README file created for java_first_jms sample.
    
    ........
  ........
  ........
    r1304424 | dkulp | 2012-03-23 11:16:04 -0400 (Fri, 23 Mar 2012) | 10 lines
    
    Merged revisions 1303999 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303999 | dkulp | 2012-03-22 15:30:56 -0400 (Thu, 22 Mar 2012) | 3 lines
    
      Use full classname when checking for test ports so multiple "Server"
      classes can have different ports.  Also log the ports in use.
    
    ........
  ........
  ........
    r1304425 | dkulp | 2012-03-23 11:16:10 -0400 (Fri, 23 Mar 2012) | 10 lines
    
    Merged revisions 1304005 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1304005 | dkulp | 2012-03-22 15:37:09 -0400 (Thu, 22 Mar 2012) | 3 lines
    
      There are a minimum number of threads that Jetty needs, but Jetty
      doesn't warn about it.  We will.
    
    ........
  ........
  ........
    r1304427 | dkulp | 2012-03-23 11:16:19 -0400 (Fri, 23 Mar 2012) | 10 lines
    
    Merged revisions 1304370 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1304370 | dkulp | 2012-03-23 10:28:51 -0400 (Fri, 23 Mar 2012) | 3 lines
    
      Make sure the endpoints are stopped for the jms servers so that the
      connections to the broker can cleanly disconnect without errors.
    
    ........
  ........
  ........
    r1304428 | dkulp | 2012-03-23 11:16:27 -0400 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1304373 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1304373 | dkulp | 2012-03-23 10:33:47 -0400 (Fri, 23 Mar 2012) | 2 lines
    
      Close the proxies so the decoupled endpoints can cleanly shutdown
    
    ........
  ........
  ........
    r1304429 | dkulp | 2012-03-23 11:16:31 -0400 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1304374 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1304374 | dkulp | 2012-03-23 10:33:52 -0400 (Fri, 23 Mar 2012) | 2 lines
    
      Cleanup the spring contexts
    
    ........
  ........
  ........
    r1304431 | dkulp | 2012-03-23 11:16:44 -0400 (Fri, 23 Mar 2012) | 4 lines
    
    Recording revisions 1303123,1303124,1303125,1303126,1303152,1303160,1303420,1303466,1303476,1303532,1303559,1303576,1303999,1304005,1304008,1304370,1304373,1304374,1304394
via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1304432 | dkulp | 2012-03-23 11:16:45 -0400 (Fri, 23 Mar 2012) | 107 lines
    
    Blocking revisions 1303151,1303153,1303162,1303336,1303357,1303571,1303726,1303768,1303794,1303837,1304006,1304007,1304053,1304080,1304120,1304168,1304223
via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303151 | dkulp | 2012-03-20 17:05:10 -0400 (Tue, 20 Mar 2012) | 2 lines
      
      Start adding spring deps on samples that now need it.
      
    ........
    ........
      r1303153 | gmazza | 2012-03-20 17:08:46 -0400 (Tue, 20 Mar 2012) | 2 lines
      
      Renamed READMEs to make consists across all samples.
      
    ........
    ........
      r1303162 | dkulp | 2012-03-20 17:30:09 -0400 (Tue, 20 Mar 2012) | 2 lines
      
      Checkstyle fix
      
    ........
    ........
      r1303336 | coheigea | 2012-03-21 05:58:38 -0400 (Wed, 21 Mar 2012) | 2 lines
      
      Updating trunk to use WSS4J 1.6.6-SNAPSHOT
      
    ........
    ........
      r1303357 | sergeyb | 2012-03-21 06:50:35 -0400 (Wed, 21 Mar 2012) | 2 lines
      
      Fixing the jaxrs content_negotiation demo
      
    ........
    ........
      r1303571 | gmazza | 2012-03-21 17:06:37 -0400 (Wed, 21 Mar 2012) | 2 lines
      
      removed unused Ant build file
      
    ........
    ........
      r1303726 | coheigea | 2012-03-22 06:54:29 -0400 (Thu, 22 Mar 2012) | 2 lines
      
      Added a CANCELLED state to ReceivedToken
      
    ........
    ........
      r1303768 | sergeyb | 2012-03-22 09:08:13 -0400 (Thu, 22 Mar 2012) | 2 lines
      
      Updating HTTPTransportActivator to set the TLS properties only if the address starts
from 'https'
      
    ........
    ........
      r1303794 | sergeyb | 2012-03-22 10:16:02 -0400 (Thu, 22 Mar 2012) | 2 lines
      
      Moving security-related bundles from cxf-jaxrs to separate features
      
    ........
    ........
      r1303837 | gmazza | 2012-03-22 11:31:54 -0400 (Thu, 22 Mar 2012) | 2 lines
      
      Updated base and antbuild READMEs
      
    ........
    ........
      r1304006 | dkulp | 2012-03-22 15:37:17 -0400 (Thu, 22 Mar 2012) | 3 lines
      
      Start cleaning up some of the systests to maybe flip to forkmode once at
      some point.
      
    ........
    ........
      r1304007 | dkulp | 2012-03-22 15:37:22 -0400 (Thu, 22 Mar 2012) | 2 lines
      
      Add spring dependency
      
    ........
    ........
      r1304053 | gmazza | 2012-03-22 16:55:58 -0400 (Thu, 22 Mar 2012) | 2 lines
      
      Spring libraries added to support Tomcat deployment on WSDL- and Java-first samples.
      
    ........
    ........
      r1304080 | gmazza | 2012-03-22 17:37:10 -0400 (Thu, 22 Mar 2012) | 2 lines
      
      Clarified sample, made beverages somewhat less gross.
      
    ........
    ........
      r1304120 | gmazza | 2012-03-22 18:54:00 -0400 (Thu, 22 Mar 2012) | 2 lines
      
      Clean up of wsdl_first_https sample.
      
    ........
    ........
      r1304168 | dkulp | 2012-03-22 22:44:18 -0400 (Thu, 22 Mar 2012) | 2 lines
      
      Minor cleanup on jaxes systests.  Avoid some unneeded forking.
      
    ........
    ........
      r1304223 | owulff | 2012-03-23 04:16:59 -0400 (Fri, 23 Mar 2012) | 2 lines
      
      Testcase added for AuthenticationMethod in SAML tokens - requires WSS4J 1.6.6
      
    ........
    
  ........
  ........
    r1304444 | dkulp | 2012-03-23 11:33:46 -0400 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1304440 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1304440 | dkulp | 2012-03-23 11:31:22 -0400 (Fri, 23 Mar 2012) | 2 lines
    
      Fix checkstyle issue
    
    ........
  ........
  ........
    r1304445 | dkulp | 2012-03-23 11:33:52 -0400 (Fri, 23 Mar 2012) | 4 lines
    
    Recording revisions 1304440 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1304446 | dkulp | 2012-03-23 11:33:53 -0400 (Fri, 23 Mar 2012) | 40 lines
    
    Blocking revisions 1303132,1303250,1303443,1304292,1304355,1304393 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1303132 | gmazza | 2012-03-20 16:22:12 -0400 (Tue, 20 Mar 2012) | 2 lines
      
      Updated README files -- removed Java build instructions in favor of Maven-only instructions.
      
    ........
    ........
      r1303250 | dkulp | 2012-03-20 21:38:46 -0400 (Tue, 20 Mar 2012) | 2 lines
      
      Use cglib-nodeps to avoid asm issues
      
    ........
    ........
      r1303443 | coheigea | 2012-03-21 11:30:02 -0400 (Wed, 21 Mar 2012) | 2 lines
      
      Changed the TokenValidatorParameter and Response objects to contain the obtain to validate
/ the object that was validated directly
      
    ........
    ........
      r1304292 | sergeyb | 2012-03-23 07:58:10 -0400 (Fri, 23 Mar 2012) | 2 lines
      
      [CXF-4198] Moving JSONProvider to rt-rs-extension-providers
      
    ........
    ........
      r1304355 | sergeyb | 2012-03-23 10:08:42 -0400 (Fri, 23 Mar 2012) | 2 lines
      
      [CXF-4193] Fixing the log browser demo
      
    ........
    ........
      r1304393 | dkulp | 2012-03-23 10:54:45 -0400 (Fri, 23 Mar 2012) | 2 lines
      
      Remove unused method (causing an eclipse warning)
      
    ........
    
  ........
  ........
    r1304487 | dkulp | 2012-03-23 13:07:56 -0400 (Fri, 23 Mar 2012) | 7 lines
    
    [CXF-4189] Fix problem with ReplyTo=None for req/resp mep
    Patch from Andrei Shakirin applied
    
    
    Conflicts:
    
    	api/src/main/java/org/apache/cxf/ws/addressing/Messages.properties
  ........
  ........
    r1304489 | dkulp | 2012-03-23 13:08:06 -0400 (Fri, 23 Mar 2012) | 4 lines
    
    Recording revisions 1304480,1304481,1304482 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)

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



Mime
View raw message