You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/04/06 20:00:17 UTC

svn commit: r1310518 - /cxf/branches/2.3.x-fixes/

Author: dkulp
Date: Fri Apr  6 18:00:17 2012
New Revision: 1310518

URL: http://svn.apache.org/viewvc?rev=1310518&view=rev
Log:
Blocking revisions 1303072,1304550,1304551,1305404,1305789,1306112,1306129,1307053,1307054,1307055,1308302,1309074,1309747,1310397,1310453,1310458,1310459,1310463,1310468,1310469,1310472,1310474 via  svn from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

........
  r1303072 | dkulp | 2012-03-20 14:34:16 -0400 (Tue, 20 Mar 2012) | 18 lines
  
  Merged revisions 1301212 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1301212 | dkulp | 2012-03-15 17:31:56 -0400 (Thu, 15 Mar 2012) | 10 lines
    
    Merged revisions 1301141 via  svn merge from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1301141 | dkulp | 2012-03-15 14:56:03 -0400 (Thu, 15 Mar 2012) | 2 lines
      
      Update to latest bundle plugin to hopefully fix SNAPSHOT jars built on
      jenkins
    ........
    
  ........
  
........
........
  r1304550 | dkulp | 2012-03-23 14:32:32 -0400 (Fri, 23 Mar 2012) | 17 lines
  
  Merged revisions 1304548 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1304548 | dkulp | 2012-03-23 14:31:41 -0400 (Fri, 23 Mar 2012) | 9 lines
    
    Merged revisions 1304535 via  svn merge from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1304535 | dkulp | 2012-03-23 14:10:40 -0400 (Fri, 23 Mar 2012) | 1 line
      
      [CXF-4181] Fix fault qname namespace handling
    ........
    
  ........
  
........
........
  r1304551 | dkulp | 2012-03-23 14:32:37 -0400 (Fri, 23 Mar 2012) | 10 lines
  
  Blocking revisions 1304543 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1304543 | dkulp | 2012-03-23 14:22:52 -0400 (Fri, 23 Mar 2012) | 2 lines
    
    Fix failing test
    
  ........
  
........
........
  r1305404 | ningjiang | 2012-03-26 11:39:07 -0400 (Mon, 26 Mar 2012) | 16 lines
  
  Merged revisions 1305400 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1305400 | ningjiang | 2012-03-26 23:31:14 +0800 (Mon, 26 Mar 2012) | 9 lines
    
    Merged revisions 1305388 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1305388 | ningjiang | 2012-03-26 23:09:33 +0800 (Mon, 26 Mar 2012) | 1 line
      
      CXF-4203 reapply the patch, we still need it
    ........
  ................
  
........
........
  r1305789 | ffang | 2012-03-27 05:28:18 -0400 (Tue, 27 Mar 2012) | 16 lines
  
  Merged revisions 1305786 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1305786 | ffang | 2012-03-27 17:15:12 +0800 (二, 27  3 2012) | 9 lines
    
    Merged revisions 1305775 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1305775 | ffang | 2012-03-27 16:30:32 +0800 (二, 27  3 2012) | 1 line
      
      [CXF-4204]CXF https transport should support to specify the cert alias name
    ........
  ................
  
........
........
  r1306112 | ningjiang | 2012-03-27 22:05:10 -0400 (Tue, 27 Mar 2012) | 16 lines
  
  Merged revisions 1306110 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1306110 | ningjiang | 2012-03-28 09:47:21 +0800 (Wed, 28 Mar 2012) | 9 lines
    
    Merged revisions 1306102 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1306102 | ningjiang | 2012-03-28 09:32:19 +0800 (Wed, 28 Mar 2012) | 1 line
      
      CXF-4211 Set the importing of 'net.sf.ehcache' to be optional
    ........
  ................
  
........
........
  r1306129 | ningjiang | 2012-03-27 22:50:24 -0400 (Tue, 27 Mar 2012) | 1 line
  
  CXF-1636 updated the features file
........
........
  r1307053 | dkulp | 2012-03-29 14:57:37 -0400 (Thu, 29 Mar 2012) | 18 lines
  
  Merged revisions 1307045 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1307045 | dkulp | 2012-03-29 14:50:48 -0400 (Thu, 29 Mar 2012) | 10 lines
    
    Merged revisions 1307039 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1307039 | dkulp | 2012-03-29 14:41:12 -0400 (Thu, 29 Mar 2012) | 3 lines
    
      [CXF-4181] More work with getting the fault details "correct" along with
      fixing some prefix issues with SAAJ implementations.
    
    ........
  ........
  
........
........
  r1307054 | dkulp | 2012-03-29 14:57:55 -0400 (Thu, 29 Mar 2012) | 4 lines
  
  Recording revisions 1306128 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  
........
........
  r1307055 | dkulp | 2012-03-29 14:57:58 -0400 (Thu, 29 Mar 2012) | 112 lines
  
  Blocking revisions 1305409,1307046,1307047 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1305409 | ningjiang | 2012-03-26 11:53:01 -0400 (Mon, 26 Mar 2012) | 1 line
    
    Fixed the corba bank pom version issue
  ........
  ........
    r1307046 | dkulp | 2012-03-29 14:50:54 -0400 (Thu, 29 Mar 2012) | 4 lines
    
    Recording revisions 1305241,1305260,1305275,1307039 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1307047 | dkulp | 2012-03-29 14:50:56 -0400 (Thu, 29 Mar 2012) | 91 lines
    
    Blocking revisions 1304623,1305204,1305583,1305895,1305906,1306003,1306186,1306188,1306457,1306640,1306767,1306795,1306877,1306878 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1304623 | sergeyb | 2012-03-23 17:47:43 -0400 (Fri, 23 Mar 2012) | 2 lines
      
      [CXF-4198] Removing 'ext' package segment to shorten the package names of optional providers
      
    ........
    ........
      r1305204 | dkulp | 2012-03-25 22:53:14 -0400 (Sun, 25 Mar 2012) | 2 lines
      
      [CXF-4154] If the URL protocol changes, grab a new conduit.
      
    ........
    ........
      r1305583 | dkulp | 2012-03-26 16:56:50 -0400 (Mon, 26 Mar 2012) | 4 lines
      
      Move all the start-level things back to the bundle.
      It WORKS on the feature level, but the features schema doesn't allow it
      there and thus it doesn't pass xml validation.
      
    ........
    ........
      r1305895 | dkulp | 2012-03-27 12:37:34 -0400 (Tue, 27 Mar 2012) | 2 lines
      
      [CXF-4210] Add support for extra types to be handled by the ws-n api's
      
    ........
    ........
      r1305906 | dkulp | 2012-03-27 13:13:10 -0400 (Tue, 27 Mar 2012) | 2 lines
      
      [CXF-4210] Add the extra classes to the constructor to simplify things
      
    ........
    ........
      r1306003 | dkulp | 2012-03-27 16:13:29 -0400 (Tue, 27 Mar 2012) | 3 lines
      
      Move over to using the new cxf-xjc-runtime packaged classes for the data
      adapter things.
      
    ........
    ........
      r1306186 | ffang | 2012-03-28 03:04:44 -0400 (Wed, 28 Mar 2012) | 2 lines
      
      [CXF-4204]add certAilas configuration through configAdmin when in OSGi container
      
    ........
    ........
      r1306188 | ffang | 2012-03-28 03:10:54 -0400 (Wed, 28 Mar 2012) | 2 lines
      
      break big createTlsServerParameters method into small method to make checkstyle happy
      
    ........
    ........
      r1306457 | dkulp | 2012-03-28 12:35:29 -0400 (Wed, 28 Mar 2012) | 2 lines
      
      Add the additional modules to all bundle and the distribution.
      
    ........
    ........
      r1306640 | dkulp | 2012-03-28 19:07:32 -0400 (Wed, 28 Mar 2012) | 2 lines
      
      Don't export META-INF as that breaks a bunch of spring-dm things
      
    ........
    ........
      r1306767 | coheigea | 2012-03-29 05:31:00 -0400 (Thu, 29 Mar 2012) | 2 lines
      
      Downgrading to WSS4J 1.6.5 as 1.6.6 won't be released in time for CXF 2.6
      
    ........
    ........
      r1306795 | coheigea | 2012-03-29 08:00:53 -0400 (Thu, 29 Mar 2012) | 2 lines
      
      Introducing an EXPIRED State for ReceivedTokens
      
    ........
    ........
      r1306877 | sergeyb | 2012-03-29 10:18:05 -0400 (Thu, 29 Mar 2012) | 2 lines
      
      [CXF-4154] Minor updates to JAX-RS AbstractClient and failover test
      
    ........
    ........
      r1306878 | sergeyb | 2012-03-29 10:23:10 -0400 (Thu, 29 Mar 2012) | 2 lines
      
      [CXF-4154] Reverting change to JAXRSClientServerBookTest
      
    ........
    
  ........
  
........
........
  r1308302 | ay | 2012-04-02 07:16:13 -0400 (Mon, 02 Apr 2012) | 40 lines
  
  Blocking revisions 1308286,1308287,1308300 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1308286 | ay | 2012-04-02 12:15:08 +0200 (Mon, 02 Apr 2012) | 9 lines
    
    Blocking revisions 1305836 via  svn from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1305836 | ay | 2012-03-27 15:42:47 +0200 (Tue, 27 Mar 2012) | 1 line
      
      unifying the retry interface for CXF-4209
    ........
    
  ........
  ........
    r1308287 | ay | 2012-04-02 12:18:05 +0200 (Mon, 02 Apr 2012) | 14 lines
    
    Blocking revisions 1307604,1307609 via  svn from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1307604 | ay | 2012-03-30 22:50:22 +0200 (Fri, 30 Mar 2012) | 1 line
      
      [CXF-4218] Change RMEndpoint and RMStore so that the sequences are recovered and monitored correctly
    ........
    ........
      r1307609 | ay | 2012-03-30 22:58:41 +0200 (Fri, 30 Mar 2012) | 1 line
      
      [CXF-4218] forgot to take the new systests/ws-rm
    ........
    
  ........
  ........
    r1308300 | ay | 2012-04-02 13:12:21 +0200 (Mon, 02 Apr 2012) | 1 line
    
    CXF-4218 2.5.x workaround to avoid jmx exception
  ........
  
........
........
  r1309074 | ay | 2012-04-03 13:56:55 -0400 (Tue, 03 Apr 2012) | 17 lines
  
  Merged revisions 1309073 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1309073 | ay | 2012-04-03 19:52:14 +0200 (Tue, 03 Apr 2012) | 9 lines
    
    Merged revisions 1309068 via  svn merge from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1309068 | ay | 2012-04-03 19:44:46 +0200 (Tue, 03 Apr 2012) | 1 line
      
      utilize the existing rmstore methods for sequence only updates
    ........
    
  ........
  
........
........
  r1309747 | sergeyb | 2012-04-05 06:57:31 -0400 (Thu, 05 Apr 2012) | 20 lines
  
  Merged revisions 1309732,1309743 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1309732 | sergeyb | 2012-04-05 12:59:04 +0300 (Thu, 05 Apr 2012) | 9 lines
    
    Merged revisions 1309357 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1309357 | sergeyb | 2012-04-04 15:23:00 +0300 (Wed, 04 Apr 2012) | 1 line
      
      [CXF-4225] Updating JAXBElementProvider to support Listener properties
    ........
  ................
    r1309743 | sergeyb | 2012-04-05 13:48:20 +0300 (Thu, 05 Apr 2012) | 1 line
    
    Adding SearchContext to the list of well-known contexts
  ................
  
........
........
  r1310397 | dkulp | 2012-04-06 11:18:38 -0400 (Fri, 06 Apr 2012) | 2 lines
  
  Set svn properties
  
........
........
  r1310453 | dkulp | 2012-04-06 12:33:42 -0400 (Fri, 06 Apr 2012) | 10 lines
  
  Merged revisions 1307318 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1307318 | asoldano | 2012-03-30 04:56:49 -0400 (Fri, 30 Mar 2012) | 2 lines
    
    [CXF-4181] Adding (excluded) test reproducing regression with SOAP12 faults
    
  ........
  
........
........
  r1310458 | dkulp | 2012-04-06 12:35:38 -0400 (Fri, 06 Apr 2012) | 17 lines
  
  Merged revisions 1307441 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1307441 | dkulp | 2012-03-30 10:26:10 -0400 (Fri, 30 Mar 2012) | 9 lines
    
    Merged revisions 1307403 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1307403 | dkulp | 2012-03-30 09:27:33 -0400 (Fri, 30 Mar 2012) | 2 lines
    
      [CXF-4181] Fix for SAAJ + SOAP 1.2 fault...
    
    ........
  ........
  
........
........
  r1310459 | dkulp | 2012-04-06 12:36:26 -0400 (Fri, 06 Apr 2012) | 18 lines
  
  Merged revisions 1307446 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1307446 | dkulp | 2012-03-30 10:36:54 -0400 (Fri, 30 Mar 2012) | 10 lines
    
    Merged revisions 1307438 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1307438 | dkulp | 2012-03-30 10:21:08 -0400 (Fri, 30 Mar 2012) | 3 lines
    
      [CXF-4181] Another fix for SAAJ and fault handling that should allow the
      SAAJInInterceptor to retain all the information about the faults
    
    ........
  ........
  
........
........
  r1310463 | dkulp | 2012-04-06 12:40:12 -0400 (Fri, 06 Apr 2012) | 17 lines
  
  Merged revisions 1310341 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1310341 | dkulp | 2012-04-06 10:29:07 -0400 (Fri, 06 Apr 2012) | 9 lines
    
    Merged revisions 1307510 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1307510 | sergeyb | 2012-03-30 12:28:43 -0400 (Fri, 30 Mar 2012) | 2 lines
    
      Attempting to fix the tests on IBM JDK
    
    ........
  ........
  
........
........
  r1310468 | dkulp | 2012-04-06 12:43:17 -0400 (Fri, 06 Apr 2012) | 17 lines
  
  Merged revisions 1310347 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1310347 | dkulp | 2012-04-06 10:30:04 -0400 (Fri, 06 Apr 2012) | 9 lines
    
    Merged revisions 1310317 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1310317 | dkulp | 2012-04-06 09:33:56 -0400 (Fri, 06 Apr 2012) | 2 lines
    
      Use released bundle for ehcache
    
    ........
  ........
  
........
........
  r1310469 | dkulp | 2012-04-06 12:44:10 -0400 (Fri, 06 Apr 2012) | 17 lines
  
  Merged revisions 1310384 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1310384 | dkulp | 2012-04-06 11:08:35 -0400 (Fri, 06 Apr 2012) | 9 lines
    
    Merged revisions 1310336 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1310336 | dkulp | 2012-04-06 10:19:36 -0400 (Fri, 06 Apr 2012) | 2 lines
    
      Minor updates to WHICH_JARS
    
    ........
  ........
  
........
........
  r1310472 | dkulp | 2012-04-06 12:46:41 -0400 (Fri, 06 Apr 2012) | 371 lines
  
  Blocking revisions 1306812,1307327,1307442,1307443,1307447,1307676,1307677,1307678,1308794,1310092,1310348,1310349,1310358,1310365,1310385,1310386,1310387,1310391,1310407,1310442,1310443,1310449 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1306812 | coheigea | 2012-03-29 08:43:48 -0400 (Thu, 29 Mar 2012) | 1 line
    
    Checking token expiry for UsernameTokens
  ........
  ........
    r1307327 | asoldano | 2012-03-30 05:18:47 -0400 (Fri, 30 Mar 2012) | 8 lines
    
    Blocked revisions 1307325 via svnmerge
    
    ........
      r1307325 | asoldano | 2012-03-30 11:14:45 +0200 (Fri, 30 Mar 2012) | 2 lines
      
      [CXF-4181] Adding (excluded) test reproducing regression with SOAP12 faults
    ........
    
  ........
  ........
    r1307442 | dkulp | 2012-03-30 10:26:15 -0400 (Fri, 30 Mar 2012) | 4 lines
    
    Recording revisions 1307061,1307130,1307403 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1307443 | dkulp | 2012-03-30 10:26:17 -0400 (Fri, 30 Mar 2012) | 10 lines
    
    Blocking revisions 1307112 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1307112 | sergeyb | 2012-03-29 17:17:35 -0400 (Thu, 29 Mar 2012) | 2 lines
      
      [CXF-4215] Moving Claim annotations to the api module
      
    ........
    
  ........
  ........
    r1307447 | dkulp | 2012-03-30 10:37:01 -0400 (Fri, 30 Mar 2012) | 4 lines
    
    Recording revisions 1307438 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1307676 | dkulp | 2012-03-30 21:03:09 -0400 (Fri, 30 Mar 2012) | 10 lines
    
    Merged revisions 1307655 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1307655 | dkulp | 2012-03-30 19:53:37 -0400 (Fri, 30 Mar 2012) | 3 lines
    
      [CXF-4196] Allow and endpoint to expose wsdl using schema imports
      Patch from Jason Pell applied
    
    ........
  ........
  ........
    r1307677 | dkulp | 2012-03-30 21:03:14 -0400 (Fri, 30 Mar 2012) | 9 lines
    
    Merged revisions 1307672 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1307672 | dkulp | 2012-03-30 21:00:45 -0400 (Fri, 30 Mar 2012) | 2 lines
    
      Use the potentially cached element instead of always creating a new DOM
    
    ........
  ........
  ........
    r1307678 | dkulp | 2012-03-30 21:03:20 -0400 (Fri, 30 Mar 2012) | 4 lines
    
    Recording revisions 1307653,1307654,1307655,1307672 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1308794 | sergeyb | 2012-04-03 05:56:29 -0400 (Tue, 03 Apr 2012) | 9 lines
    
    Merged revisions 1308793 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1308793 | sergeyb | 2012-04-03 12:52:14 +0300 (Tue, 03 Apr 2012) | 1 line
      
      [CXF-4220] Updates to WADLGenerator to avoid duplicate slashes in modified schemaLocations and ignore empty schemaLocations
    ........
    
  ........
  ........
    r1310092 | ay | 2012-04-05 17:54:04 -0400 (Thu, 05 Apr 2012) | 38 lines
    
    Merged revisions 1308629 via  svn merge from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1308629 | dkulp | 2012-04-03 02:09:11 +0200 (Tue, 03 Apr 2012) | 30 lines
      
      [CXF-4083] Blueprint support for http-jetty
      Pull from Johan Edstrom with major thanks!
      
      Squashed commit of the following:
      
      commit 85ad9e1874f1963a3297b21aca4058316b0633ff
      Author: Johan Edstrom <je...@savoirtech.com>
      Date:   Mon Apr 2 14:56:21 2012 -0600
      
          Fix bad compile
      
      commit f916d3753ae18ac5e3e26f23d952468cfc614912
      Author: Johan Edstrom <je...@savoirtech.com>
      Date:   Mon Apr 2 14:30:20 2012 -0600
      
          Revert "Remove un-used spring beans"
      
          This reverts commit 1265fd4e1472bf25ef5a1d2b22188b8151fb3194.
      
      commit 1265fd4e1472bf25ef5a1d2b22188b8151fb3194
      Author: Johan Edstrom <je...@savoirtech.com>
      Date:   Mon Apr 2 14:23:20 2012 -0600
      
          Remove un-used spring beans
      
      commit 5b380aab3fd4b2f4a8a001937bcd26d860179072
      Author: Johan Edstrom <je...@savoirtech.com>
      Date:   Mon Apr 2 14:12:27 2012 -0600
      
          httpj:engine-factory
    ........
    
  ........
  ........
    r1310348 | dkulp | 2012-04-06 10:30:09 -0400 (Fri, 06 Apr 2012) | 4 lines
    
    Recording revisions 1307351,1307510,1307557,1309929,1310070,1310146,1310147,1310200,1310317 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1310349 | dkulp | 2012-04-06 10:30:11 -0400 (Fri, 06 Apr 2012) | 134 lines
    
    Blocking revisions 1307445,1307520,1308337,1308438,1308504,1308906,1308908,1308968,1309333,1309334,1309449,1309473,1309739,1309846,1309860,1310009,1310071,1310072,1310276,1310277,1310278 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1307445 | coheigea | 2012-03-30 10:33:05 -0400 (Fri, 30 Mar 2012) | 2 lines
      
      [CXF-4158] - Started on re-using TokenValidators for token renewal
      
    ........
    ........
      r1307520 | sergeyb | 2012-03-30 12:38:00 -0400 (Fri, 30 Mar 2012) | 2 lines
      
      Starting to fix OAuth2 module Java docs, more to come
      
    ........
    ........
      r1308337 | coheigea | 2012-04-02 09:09:53 -0400 (Mon, 02 Apr 2012) | 2 lines
      
      [CXF-4219] - Switch to using EhCache for the SecurityToken caching solution in the cxf-rt-ws-security module
      
    ........
    ........
      r1308438 | dkulp | 2012-04-02 13:40:37 -0400 (Mon, 02 Apr 2012) | 3 lines
      
      Update to XmlSchema 2.0.2-SNAPSHOT so we can get some testing in before
      release it later this week.
      
    ........
    ........
      r1308504 | sergeyb | 2012-04-02 15:43:14 -0400 (Mon, 02 Apr 2012) | 2 lines
      
      More Java docs updates to the oauth2 module
      
    ........
    ........
      r1308906 | coheigea | 2012-04-03 09:44:59 -0400 (Tue, 03 Apr 2012) | 2 lines
      
      [CXF-4219] - Remove EhCache warning message about max cache size
      
    ........
    ........
      r1308908 | coheigea | 2012-04-03 09:45:59 -0400 (Tue, 03 Apr 2012) | 2 lines
      
      [CXF-4219] - Another refactor of TokenStore. Removed AssociatedHash functionality.
      
    ........
    ........
      r1308968 | sergeyb | 2012-04-03 11:04:19 -0400 (Tue, 03 Apr 2012) | 2 lines
      
      Finalizing with Java docs and comments to the oauth2 module for now
      
    ........
    ........
      r1309333 | coheigea | 2012-04-04 07:25:57 -0400 (Wed, 04 Apr 2012) | 2 lines
      
      [CXF-4129] - Added some unit tests for security token caching
      
    ........
    ........
      r1309334 | coheigea | 2012-04-04 07:26:16 -0400 (Wed, 04 Apr 2012) | 3 lines
      
      [CXF-4219] - Fixed a failing test in the STS
       - Also enabled caching of validated SAML and UsernameTokens
      
    ........
    ........
      r1309449 | ay | 2012-04-04 11:15:25 -0400 (Wed, 04 Apr 2012) | 2 lines
      
      change the package name of jsse.TLS config classes (remove spring)
      
    ........
    ........
      r1309473 | coheigea | 2012-04-04 12:03:25 -0400 (Wed, 04 Apr 2012) | 2 lines
      
      [CXF-4158] - Some minor stuff related to token renewing
      
    ........
    ........
      r1309739 | sergeyb | 2012-04-05 06:29:43 -0400 (Thu, 05 Apr 2012) | 2 lines
      
      [CXF-4179] Remove checks for well-known context class names as it won't work with custom contexts
      
    ........
    ........
      r1309846 | coheigea | 2012-04-05 09:31:43 -0400 (Thu, 05 Apr 2012) | 2 lines
      
      [CXF-4158] - Added an initial SAMLTokenRenewer & some tests.
      
    ........
    ........
      r1309860 | sergeyb | 2012-04-05 09:46:06 -0400 (Thu, 05 Apr 2012) | 2 lines
      
      Enabling OAuth 10 feature, thanks to JB
      
    ........
    ........
      r1310009 | dkulp | 2012-04-05 14:53:12 -0400 (Thu, 05 Apr 2012) | 3 lines
      
      Introduce a new @UseAsyncMethod to allow selecting the usage of the
      async variants on the server side when using JAX-WS.
      
    ........
    ........
      r1310071 | dkulp | 2012-04-05 16:58:35 -0400 (Thu, 05 Apr 2012) | 2 lines
      
      Get the async exceptions working
      
    ........
    ........
      r1310072 | dkulp | 2012-04-05 16:58:41 -0400 (Thu, 05 Apr 2012) | 3 lines
      
      Update the jaxws_async sample to also show server side async handling
      and provide a war build to show the same thing in tomcat.
      
    ........
    ........
      r1310276 | coheigea | 2012-04-06 06:57:58 -0400 (Fri, 06 Apr 2012) | 2 lines
      
      Added in some Lifetime unit tests for renewing SAML tokens.
      
    ........
    ........
      r1310277 | coheigea | 2012-04-06 06:58:23 -0400 (Fri, 06 Apr 2012) | 2 lines
      
      Added in some realm tests for renewing tokens
      
    ........
    ........
      r1310278 | coheigea | 2012-04-06 06:58:46 -0400 (Fri, 06 Apr 2012) | 2 lines
      
      Added in functionality to prevent the renewal of a token that is "overly" expired
      
    ........
    
  ........
  ........
    r1310358 | dkulp | 2012-04-06 10:44:18 -0400 (Fri, 06 Apr 2012) | 1 line
    
    fix compile failure
  ........
  ........
    r1310365 | dkulp | 2012-04-06 10:49:32 -0400 (Fri, 06 Apr 2012) | 1 line
    
    Fix version
  ........
  ........
    r1310385 | dkulp | 2012-04-06 11:08:43 -0400 (Fri, 06 Apr 2012) | 10 lines
    
    Merged revisions 1310362 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1310362 | dkulp | 2012-04-06 10:47:07 -0400 (Fri, 06 Apr 2012) | 3 lines
    
      [CXF-4223] Extend fault policy interceptors with POLICY_OVERRIDE
      Patch from Andrei Shakirin applied
    
    ........
  ........
  ........
    r1310386 | dkulp | 2012-04-06 11:08:50 -0400 (Fri, 06 Apr 2012) | 4 lines
    
    Recording revisions 1310336,1310362 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1310387 | dkulp | 2012-04-06 11:08:52 -0400 (Fri, 06 Apr 2012) | 10 lines
    
    Blocking revisions 1310334 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1310334 | dkulp | 2012-04-06 10:19:32 -0400 (Fri, 06 Apr 2012) | 2 lines
      
      Fix checkstyle issue
      
    ........
    
  ........
  ........
    r1310391 | dkulp | 2012-04-06 11:14:07 -0400 (Fri, 06 Apr 2012) | 2 lines
    
    Set svn properties in bunch of places
    
  ........
  ........
    r1310407 | dkulp | 2012-04-06 11:44:47 -0400 (Fri, 06 Apr 2012) | 1 line
    
    Fix compile and test failures
  ........
  ........
    r1310442 | dkulp | 2012-04-06 12:18:30 -0400 (Fri, 06 Apr 2012) | 4 lines
    
    Recording revisions 1310264,1310438 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1310443 | dkulp | 2012-04-06 12:18:33 -0400 (Fri, 06 Apr 2012) | 10 lines
    
    Blocking revisions 1310389 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1310389 | dkulp | 2012-04-06 11:11:22 -0400 (Fri, 06 Apr 2012) | 2 lines
      
      Add svn properties in a bunch of places
      
    ........
    
  ........
  ........
    r1310449 | dkulp | 2012-04-06 12:27:11 -0400 (Fri, 06 Apr 2012) | 1 line
    
    Fix some cr/lf things
  ........
  
........
........
  r1310474 | dkulp | 2012-04-06 12:49:12 -0400 (Fri, 06 Apr 2012) | 57 lines
  
  Blocking revisions 1310340,1310342,1310344,1310346 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1310340 | dkulp | 2012-04-06 10:29:02 -0400 (Fri, 06 Apr 2012) | 9 lines
    
    Merged revisions 1307351 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1307351 | coheigea | 2012-03-30 06:47:43 -0400 (Fri, 30 Mar 2012) | 2 lines
    
      Updating security tests to delete the EhCache replay caches in java.io.tmpdir after the test run
    
    ........
  ........
  ........
    r1310342 | dkulp | 2012-04-06 10:29:42 -0400 (Fri, 06 Apr 2012) | 9 lines
    
    Merged revisions 1307557 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1307557 | dkulp | 2012-03-30 13:56:54 -0400 (Fri, 30 Mar 2012) | 2 lines
    
      Move ws-rm related systest to their own module
    
    ........
  ........
  ........
    r1310344 | dkulp | 2012-04-06 10:29:51 -0400 (Fri, 06 Apr 2012) | 10 lines
    
    Merged revisions 1310070 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1310070 | dkulp | 2012-04-05 16:57:59 -0400 (Thu, 05 Apr 2012) | 3 lines
    
      Adjust some timeouts to hopefully make parallel builds a bit more
      reliable.
    
    ........
  ........
  ........
    r1310346 | dkulp | 2012-04-06 10:30:00 -0400 (Fri, 06 Apr 2012) | 9 lines
    
    Merged revisions 1310147 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1310147 | dkulp | 2012-04-05 21:28:55 -0400 (Thu, 05 Apr 2012) | 2 lines
    
      Fix random failure with -T8 on my box
    
    ........
  ........
  
........

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

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