cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1245625 - /cxf/branches/2.3.x-fixes/
Date Fri, 17 Feb 2012 15:48:40 GMT
Author: dkulp
Date: Fri Feb 17 15:48:39 2012
New Revision: 1245625

URL: http://svn.apache.org/viewvc?rev=1245625&view=rev
Log:
Blocking revisions 1236653,1241213,1241214,1241216,1241220,1241646,1241675,1241931,1241933,1242304,1243984,1244131,1244318,1244319,1244320,1244321,1244322,1244323,1244325,1244326,1244329,1244436,1244464,1244479,1244482,1244549,1244550,1244621,1244668,1244722,1244825,1244826,1244945,1245083,1245101,1245104,1245105,1245116,1245578,1245589,1245595,1245596,1245601
via  svn from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

........
  r1236653 | coheigea | 2012-01-27 07:29:26 -0500 (Fri, 27 Jan 2012) | 1 line
  
  Enforcing that only one Timestamp is allowed per security header
........
........
  r1241213 | dkulp | 2012-02-06 17:12:56 -0500 (Mon, 06 Feb 2012) | 16 lines
  
  Merged revisions 1241185 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1241185 | dkulp | 2012-02-06 16:26:25 -0500 (Mon, 06 Feb 2012) | 9 lines
    
    Merged revisions 1238818 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1238818 | dkulp | 2012-01-31 16:28:29 -0500 (Tue, 31 Jan 2012) | 1 line
      
      Update karaf version we use
    ........
  ................
  
........
........
  r1241214 | dkulp | 2012-02-06 17:14:24 -0500 (Mon, 06 Feb 2012) | 16 lines
  
  Merged revisions 1241196 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1241196 | dkulp | 2012-02-06 16:43:02 -0500 (Mon, 06 Feb 2012) | 9 lines
    
    Merged revisions 1241055 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1241055 | dkulp | 2012-02-06 11:03:24 -0500 (Mon, 06 Feb 2012) | 1 line
      
      Update to newer versions of various maven plugins
    ........
  ................
  
........
........
  r1241216 | dkulp | 2012-02-06 17:15:57 -0500 (Mon, 06 Feb 2012) | 9 lines
  
  Recorded merge of revisions 1236651 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1236651 | coheigea | 2012-01-27 07:25:56 -0500 (Fri, 27 Jan 2012) | 1 line
    
    Enforcing that only one Timestamp is allowed per security header
  ........
  
........
........
  r1241220 | dkulp | 2012-02-06 17:20:45 -0500 (Mon, 06 Feb 2012) | 234 lines
  
  Blocked revisions 1236771,1237718,1238048,1240308,1240363,1241187,1241189,1241193-1241194,1241198,1241200
via svnmerge
  
  ................
    r1236771 | sergeyb | 2012-01-27 12:24:31 -0500 (Fri, 27 Jan 2012) | 9 lines
    
    Merged revisions 1236769 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1236769 | sergeyb | 2012-01-27 17:17:43 +0000 (Fri, 27 Jan 2012) | 1 line
      
      Moving the cors code to rs/security/cors subpackage before moving it to the new module
    ........
  ................
    r1237718 | sergeyb | 2012-01-30 10:34:22 -0500 (Mon, 30 Jan 2012) | 9 lines
    
    Merged revisions 1237715 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1237715 | sergeyb | 2012-01-30 15:26:04 +0000 (Mon, 30 Jan 2012) | 1 line
      
      Support for pre-authorized tokens to do with the so called 2-way flow
    ........
  ................
    r1238048 | sergeyb | 2012-01-30 17:24:09 -0500 (Mon, 30 Jan 2012) | 9 lines
    
    Merged revisions 1238046 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1238046 | sergeyb | 2012-01-30 22:20:02 +0000 (Mon, 30 Jan 2012) | 1 line
      
      Minor cleanup in the OAuth code
    ........
  ................
    r1240308 | dkulp | 2012-02-03 14:21:29 -0500 (Fri, 03 Feb 2012) | 40 lines
    
    Blocked revisions 1236626-1236627,1236720,1236762,1236893,1236896,1236902,1237498,1237584
via svnmerge
    
    ........
      r1236626 | cschneider | 2012-01-27 05:32:45 -0500 (Fri, 27 Jan 2012) | 1 line
      
      CXF-4069 Add a new module for just the JAXB Adapter so people using it have minimal
dependencies
    ........
      r1236627 | cschneider | 2012-01-27 05:54:31 -0500 (Fri, 27 Jan 2012) | 1 line
      
      CXF-4069 Add a new module for just the JAXB Adapter so people using it have minimal
dependencies
    ........
      r1236720 | sergeyb | 2012-01-27 10:40:22 -0500 (Fri, 27 Jan 2012) | 1 line
      
      Removing redundant oauth-test module
    ........
      r1236762 | cschneider | 2012-01-27 12:02:22 -0500 (Fri, 27 Jan 2012) | 1 line
      
      CXF-4069 Fix for Java 5
    ........
      r1236893 | dkulp | 2012-01-27 16:20:03 -0500 (Fri, 27 Jan 2012) | 1 line
      
      Add ability to start configuring some conduit settings via config:admin
    ........
      r1236896 | dkulp | 2012-01-27 16:30:58 -0500 (Fri, 27 Jan 2012) | 1 line
      
      Compile on java5
    ........
      r1236902 | sergeyb | 2012-01-27 16:49:40 -0500 (Fri, 27 Jan 2012) | 1 line
      
      Moving the cors code to the new rs/security/cors module
    ........
      r1237498 | sergeyb | 2012-01-29 17:42:31 -0500 (Sun, 29 Jan 2012) | 1 line
      
      [CXF-4076] Removing cxf-rt-bindings-http
    ........
      r1237584 | sergeyb | 2012-01-30 04:53:28 -0500 (Mon, 30 Jan 2012) | 1 line
      
      [CXF-4076] Removing one more test from systests/transports
    ........
  ................
    r1240363 | dkulp | 2012-02-03 16:57:19 -0500 (Fri, 03 Feb 2012) | 9 lines
    
    Merged revisions 1240357 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1240357 | dkulp | 2012-02-03 16:54:45 -0500 (Fri, 03 Feb 2012) | 1 line
      
      [CXF-4068] Make sure wsdlLocation is merged from defaultOptions
    ........
  ................
    r1241187 | dkulp | 2012-02-06 16:29:25 -0500 (Mon, 06 Feb 2012) | 10 lines
    
    Merged revisions 1238842 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1238842 | dkulp | 2012-01-31 17:40:42 -0500 (Tue, 31 Jan 2012) | 2 lines
      
      Fix some minor SONAR issues mostly so I can say I actually accomplished
      something useful today. :-)  (or  :-( )
    ........
  ................
    r1241189 | dkulp | 2012-02-06 16:32:10 -0500 (Mon, 06 Feb 2012) | 9 lines
    
    Merged revisions 1240059 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1240059 | cschneider | 2012-02-03 05:05:04 -0500 (Fri, 03 Feb 2012) | 1 line
      
      CXF-4080 Removing basicAuthSupplier element from conduit schema as it did not work and
was deprecated since some time
    ........
  ................
    r1241193 | dkulp | 2012-02-06 16:36:07 -0500 (Mon, 06 Feb 2012) | 9 lines
    
    Merged revisions 1240200 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1240200 | dkulp | 2012-02-03 09:51:23 -0500 (Fri, 03 Feb 2012) | 1 line
      
      Properly restolve the raw types.
    ........
  ................
    r1241194 | dkulp | 2012-02-06 16:38:13 -0500 (Mon, 06 Feb 2012) | 10 lines
    
    Merged revisions 1240212 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1240212 | dkulp | 2012-02-03 10:23:37 -0500 (Fri, 03 Feb 2012) | 2 lines
      
      Split the namespace handlers into multiple services so that the bundle
      plugin can generate a correct Export-Service header in the manifest
    ........
  ................
    r1241198 | dkulp | 2012-02-06 16:45:01 -0500 (Mon, 06 Feb 2012) | 9 lines
    
    Recorded merge of revisions 1236649 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1236649 | coheigea | 2012-01-27 07:23:11 -0500 (Fri, 27 Jan 2012) | 1 line
      
      Enforcing that only one Timestamp is allowed per security header
    ........
  ................
    r1241200 | dkulp | 2012-02-06 16:46:09 -0500 (Mon, 06 Feb 2012) | 85 lines
    
    Blocked revisions 1238349,1238359,1238819,1238852,1239041,1239141,1239192,1239213-1239214,1239229,1239243,1240054,1240196,1240221,1240243,1240249,1240251,1240348,1240982
via svnmerge
    
    ........
      r1238349 | cschneider | 2012-01-31 04:50:03 -0500 (Tue, 31 Jan 2012) | 1 line
      
      Ignore target
    ........
      r1238359 | cschneider | 2012-01-31 05:17:01 -0500 (Tue, 31 Jan 2012) | 1 line
      
      CXF-4069 Add a new module for JAX DataTypeAdapter and the ToString classes so generated
code does not have to depend on cxf
    ........
      r1238819 | dkulp | 2012-01-31 16:28:45 -0500 (Tue, 31 Jan 2012) | 3 lines
      
      Try to write an initial pax-exam test, but it's failing completely.
      Just committing it so Christian or JB can take a look and help me figure
      out what is going on.
    ........
      r1238852 | sergeyb | 2012-01-31 18:02:47 -0500 (Tue, 31 Jan 2012) | 1 line
      
      [CXF-4079] Moving many optional providers to rt/rs/extensions/providers
    ........
      r1239041 | cschneider | 2012-02-01 05:30:19 -0500 (Wed, 01 Feb 2012) | 1 line
      
      CXF-4081 Move gzip feature to core
    ........
      r1239141 | ningjiang | 2012-02-01 09:12:12 -0500 (Wed, 01 Feb 2012) | 1 line
      
      Fixed the build error of the logbrowser example
    ........
      r1239192 | sergeyb | 2012-02-01 11:14:23 -0500 (Wed, 01 Feb 2012) | 1 line
      
      Fixing CodeGeneratorProviderTest on 1.5
    ........
      r1239213 | dkulp | 2012-02-01 12:16:22 -0500 (Wed, 01 Feb 2012) | 1 line
      
      Update OSGi http-conduit config stuff to support TLS stuff
    ........
      r1239214 | dkulp | 2012-02-01 12:16:32 -0500 (Wed, 01 Feb 2012) | 1 line
      
      Add ProbeBuilder back in.
    ........
      r1239229 | sergeyb | 2012-02-01 12:39:38 -0500 (Wed, 01 Feb 2012) | 1 line
      
      [CXF-4079] Finalizing the package updates for optional providers for now
    ........
      r1239243 | dkulp | 2012-02-01 13:05:06 -0500 (Wed, 01 Feb 2012) | 1 line
      
      Fix checkstyle issues
    ........
      r1240054 | cschneider | 2012-02-03 04:57:16 -0500 (Fri, 03 Feb 2012) | 1 line
      
      CXF-3352 Move clustering support into a separate module
    ........
      r1240196 | dkulp | 2012-02-03 09:48:42 -0500 (Fri, 03 Feb 2012) | 1 line
      
      Remove a bunch of printlns
    ........
      r1240221 | cschneider | 2012-02-03 10:48:34 -0500 (Fri, 03 Feb 2012) | 1 line
      
      CXF-3352 Suppress deprecation warnings in the tests
    ........
      r1240243 | sergeyb | 2012-02-03 11:54:37 -0500 (Fri, 03 Feb 2012) | 1 line
      
      [CXF-4087] Moving SourceGenerator to tools/wadlto, dropping CodeGeneratorProvider
    ........
      r1240249 | sergeyb | 2012-02-03 12:15:03 -0500 (Fri, 03 Feb 2012) | 1 line
      
      [CXF-3352] And dropping the redundant JAX-RS FailoverFeature class
    ........
      r1240251 | dkulp | 2012-02-03 12:24:02 -0500 (Fri, 03 Feb 2012) | 1 line
      
      Remove some unneeded SupressWarnings
    ........
      r1240348 | dkulp | 2012-02-03 16:33:07 -0500 (Fri, 03 Feb 2012) | 4 lines
      
      [CXF-4073] Support for mulitple policy interceptor providers per
      assertion
      
      Modified patch from Andrei Shakirin applied
    ........
      r1240982 | sergeyb | 2012-02-06 06:33:39 -0500 (Mon, 06 Feb 2012) | 1 line
      
      Updating the KEYS file
    ........
  ................
  
........
........
  r1241646 | dkulp | 2012-02-07 16:46:20 -0500 (Tue, 07 Feb 2012) | 17 lines
  
  Merged revisions 1241641 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1241641 | dkulp | 2012-02-07 16:33:39 -0500 (Tue, 07 Feb 2012) | 10 lines
    
    Merged revisions 1241638 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1241638 | dkulp | 2012-02-07 16:31:56 -0500 (Tue, 07 Feb 2012) | 2 lines
      
      Fix an issue where a test wasn't actually using a dynamic port like it
      should.
    ........
  ................
  
........
........
  r1241675 | dkulp | 2012-02-07 17:33:19 -0500 (Tue, 07 Feb 2012) | 38 lines
  
  Blocked revisions 1241417,1241669,1241672 via svnmerge
  
  ................
    r1241417 | sergeyb | 2012-02-07 05:39:25 -0500 (Tue, 07 Feb 2012) | 9 lines
    
    Merged revisions 1241201 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1241201 | sergeyb | 2012-02-06 21:50:14 +0000 (Mon, 06 Feb 2012) | 1 line
      
      Removing Google OAuth repository ref
    ........
  ................
    r1241669 | dkulp | 2012-02-07 17:25:17 -0500 (Tue, 07 Feb 2012) | 11 lines
    
    Recorded merge of revisions 1241639 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1241639 | dkulp | 2012-02-07 16:32:20 -0500 (Tue, 07 Feb 2012) | 3 lines
      
      [CXF-3916] If a response message doesn't have a RelatesTo header, do
      some additional checking to see if it should be marked a partial
      response or not.
    ........
  ................
    r1241672 | dkulp | 2012-02-07 17:25:49 -0500 (Tue, 07 Feb 2012) | 8 lines
    
    Blocked revisions 1241374 via svnmerge
    
    ........
      r1241374 | cschneider | 2012-02-07 03:21:58 -0500 (Tue, 07 Feb 2012) | 1 line
      
      Revert pmd version as build fails now
    ........
  ................
  
........
........
  r1241931 | dkulp | 2012-02-08 10:21:21 -0500 (Wed, 08 Feb 2012) | 17 lines
  
  Merged revisions 1241927 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1241927 | dkulp | 2012-02-08 10:18:59 -0500 (Wed, 08 Feb 2012) | 10 lines
    
    Merged revisions 1241926 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1241926 | dkulp | 2012-02-08 10:16:43 -0500 (Wed, 08 Feb 2012) | 2 lines
      
      Due to MPMD-142, the new version of the PMD plugin doesn't work with
      Maven 2.2.1.  Back out to 2.6 until 2.7.1 is released.
    ........
  ................
  
........
........
  r1241933 | dkulp | 2012-02-08 10:22:10 -0500 (Wed, 08 Feb 2012) | 19 lines
  
  Blocked revisions 1241929 via svnmerge
  
  ................
    r1241929 | dkulp | 2012-02-08 10:19:49 -0500 (Wed, 08 Feb 2012) | 13 lines
    
    Blocked revisions 1237633,1241671 via svnmerge
    
    ........
      r1237633 | sergeyb | 2012-01-30 08:04:31 -0500 (Mon, 30 Jan 2012) | 1 line
      
      Attempting to capture a case when the response code may be corrupted
    ........
      r1241671 | dkulp | 2012-02-07 17:25:48 -0500 (Tue, 07 Feb 2012) | 2 lines
      
      Back to 2.7 PMD plugin.  It's working on the other branches.  May have
      been a temporary issue.
    ........
  ................
  
........
........
  r1242304 | ay | 2012-02-09 07:55:27 -0500 (Thu, 09 Feb 2012) | 9 lines
  
  Merged revisions 1242047 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1242047 | ay | 2012-02-08 20:26:46 +0100 (Wed, 08 Feb 2012) | 1 line
    
    [CXF-4091] add a robust in-only processing option for oneway call
  ........
  
........
........
  r1243984 | sergeyb | 2012-02-14 10:12:41 -0500 (Tue, 14 Feb 2012) | 16 lines
  
  Merged revisions 1243956 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1243956 | sergeyb | 2012-02-14 14:43:35 +0000 (Tue, 14 Feb 2012) | 9 lines
    
    Merged revisions 1243926 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1243926 | sergeyb | 2012-02-14 14:10:18 +0000 (Tue, 14 Feb 2012) | 1 line
      
      [CXF-4107] Defaulting to 'callback' padding if no custom value is provided
    ........
  ................
  
........
........
  r1244131 | sergeyb | 2012-02-14 12:10:37 -0500 (Tue, 14 Feb 2012) | 16 lines
  
  Merged revisions 1244129 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1244129 | sergeyb | 2012-02-14 17:09:14 +0000 (Tue, 14 Feb 2012) | 9 lines
    
    Merged revisions 1244128 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244128 | sergeyb | 2012-02-14 17:07:21 +0000 (Tue, 14 Feb 2012) | 1 line
      
      [CXf-4109] Removing a reference to URI.getHost()
    ........
  ................
  
........
........
  r1244318 | dkulp | 2012-02-14 22:01:01 -0500 (Tue, 14 Feb 2012) | 17 lines
  
  Merged revisions 1242819 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1242819 | ay | 2012-02-10 10:27:22 -0500 (Fri, 10 Feb 2012) | 9 lines
    
    Merged revisions 1242739 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1242739 | ay | 2012-02-10 12:00:24 +0100 (Fri, 10 Feb 2012) | 1 line
      
      [CXF-4096] a robust in-only processing option for non-decoupled WS-A EP
    ........
    
  ........
  
........
........
  r1244319 | dkulp | 2012-02-14 22:02:24 -0500 (Tue, 14 Feb 2012) | 20 lines
  
  Recording revisions 1242808,1242826 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1242808 | coheigea | 2012-02-10 10:04:45 -0500 (Fri, 10 Feb 2012) | 6 lines
    
    [CXF-4052] - Crypto cache issues and the PolicyBasedWSS4JInInterceptor used as a singleton
    
    
    Conflicts:
    
    	rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
  ........
  ........
    r1242826 | coheigea | 2012-02-10 10:44:42 -0500 (Fri, 10 Feb 2012) | 2 lines
    
    [CXF-4092] - Confusing error message "No initiator token id" in AssymetricBindingHandler
     - Patch applied, thanks
  ........
  
........
........
  r1244320 | dkulp | 2012-02-14 22:02:26 -0500 (Tue, 14 Feb 2012) | 96 lines
  
  Blocking revisions 1241936,1241970,1241973,1241995,1242361,1242844,1242849,1242951 via 
svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1241936 | sergeyb | 2012-02-08 10:32:40 -0500 (Wed, 08 Feb 2012) | 9 lines
    
    Merged revisions 1241934 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1241934 | sergeyb | 2012-02-08 15:24:19 +0000 (Wed, 08 Feb 2012) | 1 line
      
      Minor updates to OAuth data classes
    ........
    
  ........
  ........
    r1241970 | sergeyb | 2012-02-08 11:54:18 -0500 (Wed, 08 Feb 2012) | 1 line
    
    Unblocking r1236720
  ........
  ........
    r1241973 | sergeyb | 2012-02-08 11:56:10 -0500 (Wed, 08 Feb 2012) | 9 lines
    
    Merged revisions 1236720 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1236720 | sergeyb | 2012-01-27 15:40:22 +0000 (Fri, 27 Jan 2012) | 1 line
      
      Removing redundant oauth-test module
    ........
    
  ........
  ........
    r1241995 | owulff | 2012-02-08 12:23:54 -0500 (Wed, 08 Feb 2012) | 1 line
    
    [CXF-4093] NameIDFormat of SAML Subject configurable
  ........
  ........
    r1242361 | sergeyb | 2012-02-09 10:34:29 -0500 (Thu, 09 Feb 2012) | 9 lines
    
    Merged revisions 1242359 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1242359 | sergeyb | 2012-02-09 15:31:32 +0000 (Thu, 09 Feb 2012) | 1 line
      
      Changing relativeLogoPath to logoUri in Client
    ........
    
  ........
  ........
    r1242844 | sergeyb | 2012-02-10 11:46:05 -0500 (Fri, 10 Feb 2012) | 13 lines
    
    Merged revisions 1242840,1242842 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1242840 | sergeyb | 2012-02-10 16:26:50 +0000 (Fri, 10 Feb 2012) | 1 line
      
      Updating OAuthProvider to cope better with multiple authorization approval vars 
    ........
      r1242842 | sergeyb | 2012-02-10 16:41:12 +0000 (Fri, 10 Feb 2012) | 1 line
      
      [CXF-4100] Adding a 'default' property to Permission
    ........
    
  ........
  ........
    r1242849 | sergeyb | 2012-02-10 11:51:56 -0500 (Fri, 10 Feb 2012) | 9 lines
    
    Merged revisions 1242847 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1242847 | sergeyb | 2012-02-10 16:50:11 +0000 (Fri, 10 Feb 2012) | 1 line
      
      [CXF-4100] Adding a missing file
    ........
    
  ........
  ........
    r1242951 | sergeyb | 2012-02-10 16:56:43 -0500 (Fri, 10 Feb 2012) | 9 lines
    
    Merged revisions 1242948 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1242948 | sergeyb | 2012-02-10 21:52:03 +0000 (Fri, 10 Feb 2012) | 1 line
      
      [CXF-4100] Checking individual scopes
    ........
    
  ........
  
........
........
  r1244321 | dkulp | 2012-02-14 22:08:04 -0500 (Tue, 14 Feb 2012) | 18 lines
  
  Merged revisions 1244151 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1244151 | dkulp | 2012-02-14 13:33:35 -0500 (Tue, 14 Feb 2012) | 10 lines
    
    Merged revisions 1242895 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1242895 | dkulp | 2012-02-10 14:27:37 -0500 (Fri, 10 Feb 2012) | 2 lines
      
      More updates to system tests to fix the last remaining usage of ports in
      the 8000-9999 range and the 61500 JMS port.
    ........
    
  ........
  
........
........
  r1244322 | dkulp | 2012-02-14 22:09:37 -0500 (Tue, 14 Feb 2012) | 17 lines
  
  Merged revisions 1244152 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1244152 | dkulp | 2012-02-14 13:36:17 -0500 (Tue, 14 Feb 2012) | 9 lines
    
    Merged revisions 1242999 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1242999 | dkulp | 2012-02-10 22:10:09 -0500 (Fri, 10 Feb 2012) | 1 line
      
      Update more of the test suite to use dynamic ports
    ........
    
  ........
  
........
........
  r1244323 | dkulp | 2012-02-14 22:12:55 -0500 (Tue, 14 Feb 2012) | 17 lines
  
  Merged revisions 1244156 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1244156 | dkulp | 2012-02-14 13:41:14 -0500 (Tue, 14 Feb 2012) | 9 lines
    
    Merged revisions 1243631 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1243631 | dkulp | 2012-02-13 13:10:06 -0500 (Mon, 13 Feb 2012) | 1 line
      
      Remove remaining hard coded ports in 7000-9999 range.
    ........
    
  ........
  
........
........
  r1244325 | dkulp | 2012-02-14 22:14:04 -0500 (Tue, 14 Feb 2012) | 19 lines
  
  Merged revisions 1244157 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1244157 | dkulp | 2012-02-14 13:43:25 -0500 (Tue, 14 Feb 2012) | 11 lines
    
    Merged revisions 1243632 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1243632 | dkulp | 2012-02-13 13:10:16 -0500 (Mon, 13 Feb 2012) | 3 lines
      
      Change the dynamically allocated port algorithm to make it more
      predictable and help make sure two servers aren't randomly assigned the
      same port.
    ........
    
  ........
  
........
........
  r1244326 | dkulp | 2012-02-14 22:14:30 -0500 (Tue, 14 Feb 2012) | 18 lines
  
  Merged revisions 1244158 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1244158 | dkulp | 2012-02-14 13:44:24 -0500 (Tue, 14 Feb 2012) | 10 lines
    
    Merged revisions 1244145 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244145 | dkulp | 2012-02-14 13:23:02 -0500 (Tue, 14 Feb 2012) | 2 lines
      
      The serversocket lock doesn't seem to be 100% reliable.  Stick with a
      randomo starting point
    ........
    
  ........
  
........
........
  r1244329 | dkulp | 2012-02-14 22:16:13 -0500 (Tue, 14 Feb 2012) | 187 lines
  
  Blocking revisions 1243202,1243481,1243635,1243991,1244155,1244160,1244161,1244308,1244309,1244315
via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1243202 | dsosnoski | 2012-02-12 01:43:05 -0500 (Sun, 12 Feb 2012) | 1 line
    
    Fix build error with import order
  ........
  ........
    r1243481 | ningjiang | 2012-02-13 06:48:05 -0500 (Mon, 13 Feb 2012) | 9 lines
    
    Merged revisions 1243432 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1243432 | ningjiang | 2012-02-13 16:38:37 +0800 (Mon, 13 Feb 2012) | 1 line
      
      CXF-4098 JMX management supports of the CXF WS-Notification service
    ........
    
  ........
  ........
    r1243635 | asoldano | 2012-02-13 13:19:26 -0500 (Mon, 13 Feb 2012) | 9 lines
    
    Merged revisions 1243620 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1243620 | asoldano | 2012-02-13 18:49:31 +0100 (Mon, 13 Feb 2012) | 2 lines
      
      [CXF-4103] Prevent NPE
    ........
    
  ........
  ........
    r1243991 | sergeyb | 2012-02-14 10:27:17 -0500 (Tue, 14 Feb 2012) | 9 lines
    
    Merged revisions 1243727 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1243727 | sergeyb | 2012-02-13 22:57:19 +0000 (Mon, 13 Feb 2012) | 1 line
      
      [CXF-4102] Updating Logging interceptors to ignore the binary content by default
    ........
    
  ........
  ........
    r1244155 | dkulp | 2012-02-14 13:40:04 -0500 (Tue, 14 Feb 2012) | 9 lines
    
    Merged revisions 1243445 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1243445 | cschneider | 2012-02-13 04:00:25 -0500 (Mon, 13 Feb 2012) | 1 line
      
      Trying to fix build problem on IBM JDK
    ........
    
  ........
  ........
    r1244160 | dkulp | 2012-02-14 13:45:39 -0500 (Tue, 14 Feb 2012) | 34 lines
    
    Recorded merge of revisions 1241937,1241977,1242003,1242009,1242795,1242825,1243792 via
svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1241937 | ay | 2012-02-08 10:32:55 -0500 (Wed, 08 Feb 2012) | 1 line
      
      [CXF-4091] add a robust in-only processing option for oneway call
    ........
      r1241977 | owulff | 2012-02-08 12:07:57 -0500 (Wed, 08 Feb 2012) | 1 line
      
      [CXF-4093] NameIDFormat of SAML Subject configurable
    ........
      r1242003 | ay | 2012-02-08 12:40:59 -0500 (Wed, 08 Feb 2012) | 1 line
      
      build fix for the change caused by CXF-4091
    ........
      r1242009 | ay | 2012-02-08 12:45:53 -0500 (Wed, 08 Feb 2012) | 1 line
      
      jdk5 build fix ... by CXF-4091
    ........
      r1242795 | coheigea | 2012-02-10 09:49:45 -0500 (Fri, 10 Feb 2012) | 1 line
      
      [CXF-4052] - Crypto cache issues and the PolicyBasedWSS4JInInterceptor used as a singleton
    ........
      r1242825 | coheigea | 2012-02-10 10:42:54 -0500 (Fri, 10 Feb 2012) | 2 lines
      
      [CXF-4092] - Confusing error message "No initiator token id" in AssymetricBindingHandler
       - Patch applied, thanks
    ........
      r1243792 | ningjiang | 2012-02-14 02:00:19 -0500 (Tue, 14 Feb 2012) | 1 line
      
      CXF-4105 fixed the mapping issue of Slf4jLogger
    ........
    
  ........
  ........
    r1244161 | dkulp | 2012-02-14 13:46:05 -0500 (Tue, 14 Feb 2012) | 12 lines
    
    Blocked revisions 1242796,1243102 via svnmerge
    
    ........
      r1242796 | dkulp | 2012-02-10 09:49:51 -0500 (Fri, 10 Feb 2012) | 1 line
      
      Prevent an NPE
    ........
      r1243102 | cschneider | 2012-02-11 12:08:52 -0500 (Sat, 11 Feb 2012) | 1 line
      
      CXF-4101 Minimize use of dynamic imports move special jaxb classloading to api
    ........
    
  ........
  ........
    r1244308 | dkulp | 2012-02-14 20:58:45 -0500 (Tue, 14 Feb 2012) | 11 lines
    
    Recording revisions 1244146 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244146 | dkulp | 2012-02-14 13:23:23 -0500 (Tue, 14 Feb 2012) | 3 lines
      
      [CXF-4110] Fix problems of description not being set in servicemodel
      which is leading to @Policy annotations not working.
      
    ........
    
  ........
  ........
    r1244309 | dkulp | 2012-02-14 20:58:47 -0500 (Tue, 14 Feb 2012) | 10 lines
    
    Blocking revisions 1241942 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1241942 | cschneider | 2012-02-08 10:40:07 -0500 (Wed, 08 Feb 2012) | 2 lines
      
      CXF-4090 Depending on http-whiteboard feature instead of the pax web bundles. this fixes
issues when karaf uses a different pax web version
      
    ........
    
  ........
  ........
    r1244315 | dkulp | 2012-02-14 21:06:33 -0500 (Tue, 14 Feb 2012) | 39 lines
    
    Blocking revisions 1244306,1244307,1244310 via  svn from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244306 | dkulp | 2012-02-14 20:57:02 -0500 (Tue, 14 Feb 2012) | 11 lines
      
      Recording revisions 1244146 via  git from
      https://svn.apache.org/repos/asf/cxf/trunk
      
      ........
        r1244146 | dkulp | 2012-02-14 13:23:23 -0500 (Tue, 14 Feb 2012) | 3 lines
        
        [CXF-4110] Fix problems of description not being set in servicemodel
        which is leading to @Policy annotations not working.
        
      ........
      
    ........
    ........
      r1244307 | dkulp | 2012-02-14 20:57:04 -0500 (Tue, 14 Feb 2012) | 10 lines
      
      Blocking revisions 1241942 via  git from
      https://svn.apache.org/repos/asf/cxf/trunk
      
      ........
        r1241942 | cschneider | 2012-02-08 10:40:07 -0500 (Wed, 08 Feb 2012) | 2 lines
        
        CXF-4090 Depending on http-whiteboard feature instead of the pax web bundles. this
fixes issues when karaf uses a different pax web version
        
      ........
      
    ........
    ........
      r1244310 | dkulp | 2012-02-14 21:02:25 -0500 (Tue, 14 Feb 2012) | 2 lines
      
      remove props that I accedentally put here
      
    ........
    
  ........
  
........
........
  r1244436 | sergeyb | 2012-02-15 05:55:32 -0500 (Wed, 15 Feb 2012) | 16 lines
  
  Merged revisions 1244428 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1244428 | sergeyb | 2012-02-15 10:33:40 +0000 (Wed, 15 Feb 2012) | 9 lines
    
    Merged revisions 1244425 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244425 | sergeyb | 2012-02-15 10:22:23 +0000 (Wed, 15 Feb 2012) | 1 line
      
      [CXF-3380] Enabling DataSourceProvider by default
    ........
  ................
  
........
........
  r1244464 | coheigea | 2012-02-15 07:37:34 -0500 (Wed, 15 Feb 2012) | 14 lines
  
  Adding stricter SecurityPolicy parsing
  
  Conflicts:
  
  	rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java
  
  
  Conflicts:
  
  	rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java
  	rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java
  	rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java
  	systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml
  	systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
........
........
  r1244479 | coheigea | 2012-02-15 08:31:23 -0500 (Wed, 15 Feb 2012) | 2 lines
  
  Reverting last commit
  
........
........
  r1244482 | coheigea | 2012-02-15 08:45:44 -0500 (Wed, 15 Feb 2012) | 1 line
  
  Handle SupportingTokens even if there is no TransportToken policy specified
........
........
  r1244549 | dkulp | 2012-02-15 10:51:18 -0500 (Wed, 15 Feb 2012) | 9 lines
  
  Recording revisions 1244481 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1244481 | coheigea | 2012-02-15 08:44:02 -0500 (Wed, 15 Feb 2012) | 1 line
    
    Handle SupportingTokens even if there is no TransportToken policy specified
  ........
  
........
........
  r1244550 | dkulp | 2012-02-15 10:51:20 -0500 (Wed, 15 Feb 2012) | 117 lines
  
  Blocking revisions 1244332,1244333,1244456,1244457,1244470,1244477,1244540,1244541 via 
svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1244332 | dkulp | 2012-02-14 22:48:33 -0500 (Tue, 14 Feb 2012) | 9 lines
    
    Merged revisions 1242831 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1242831 | asoldano | 2012-02-10 10:58:09 -0500 (Fri, 10 Feb 2012) | 2 lines
    
      [CXF-4030] Add option for setting in-memory threshold for dealing with messages caching
in logging interceptors
    
    ........
  ........
  ........
    r1244333 | dkulp | 2012-02-14 22:48:42 -0500 (Tue, 14 Feb 2012) | 10 lines
    
    Recording revisions 1242831 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1242831 | asoldano | 2012-02-10 10:58:09 -0500 (Fri, 10 Feb 2012) | 2 lines
      
      [CXF-4030] Add option for setting in-memory threshold for dealing with messages caching
in logging interceptors
      
    ........
    
  ........
  ........
    r1244456 | coheigea | 2012-02-15 07:19:44 -0500 (Wed, 15 Feb 2012) | 6 lines
    
    Adding stricter SecurityPolicy parsing
    
    
    Conflicts:
    
    	rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java
  ........
  ........
    r1244457 | coheigea | 2012-02-15 07:20:22 -0500 (Wed, 15 Feb 2012) | 1 line
    
    Fixing incorrect HttpsToken assertions in STS wsdls
  ........
  ........
    r1244470 | coheigea | 2012-02-15 08:03:37 -0500 (Wed, 15 Feb 2012) | 1 line
    
    Don't insist on an AlgorithmSuite for WS-SP 1.1
  ........
  ........
    r1244477 | coheigea | 2012-02-15 08:28:08 -0500 (Wed, 15 Feb 2012) | 2 lines
    
    Reverting last two commits
    
  ........
  ........
    r1244540 | dkulp | 2012-02-15 10:34:35 -0500 (Wed, 15 Feb 2012) | 10 lines
    
    Recording revisions 1244529 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244529 | dkulp | 2012-02-15 10:19:16 -0500 (Wed, 15 Feb 2012) | 2 lines
      
      Fix compile failure with non-eclipse compiler
      
    ........
    
  ........
  ........
    r1244541 | dkulp | 2012-02-15 10:34:37 -0500 (Wed, 15 Feb 2012) | 42 lines
    
    Blocking revisions 1244331,1244451,1244452,1244469,1244508,1244530 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244331 | dkulp | 2012-02-14 22:18:35 -0500 (Tue, 14 Feb 2012) | 4 lines
      
      New version of DoMerges that no longer needs svnmerge.py as it handles
      it all internally.   Also works within a git clone instead of svn
      checkout.
      
    ........
    ........
      r1244451 | coheigea | 2012-02-15 06:53:25 -0500 (Wed, 15 Feb 2012) | 2 lines
      
      Adding stricter SecurityPolicy parsing
      
    ........
    ........
      r1244452 | coheigea | 2012-02-15 06:54:02 -0500 (Wed, 15 Feb 2012) | 2 lines
      
      Fixing incorrect HttpsToken assertions in STS wsdls
      
    ........
    ........
      r1244469 | coheigea | 2012-02-15 08:03:06 -0500 (Wed, 15 Feb 2012) | 2 lines
      
      Don't insist on an AlgorithmSuite for WS-SP 1.1
      
    ........
    ........
      r1244508 | dkulp | 2012-02-15 09:44:13 -0500 (Wed, 15 Feb 2012) | 2 lines
      
      Minor updates to work better with git and svn
      
    ........
    ........
      r1244530 | dkulp | 2012-02-15 10:22:35 -0500 (Wed, 15 Feb 2012) | 2 lines
      
      Don't need the +1 as cur contains the right value now
      
    ........
    
  ........
  
........
........
  r1244621 | ay | 2012-02-15 13:10:45 -0500 (Wed, 15 Feb 2012) | 16 lines
  
  Merged revisions 1244615 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1244615 | ay | 2012-02-15 19:06:45 +0100 (Wed, 15 Feb 2012) | 9 lines
    
    Merged revisions 1244611 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244611 | ay | 2012-02-15 19:01:19 +0100 (Wed, 15 Feb 2012) | 1 line
      
      add an option to clear FaultThrowingInterceptor in testutils ControlImpl
    ........
  ................
  
........
........
  r1244668 | dkulp | 2012-02-15 14:24:19 -0500 (Wed, 15 Feb 2012) | 17 lines
  
  Merged revisions 1244663 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1244663 | dkulp | 2012-02-15 14:21:21 -0500 (Wed, 15 Feb 2012) | 9 lines
    
    Merged revisions 1244652 via  svn merge from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244652 | dkulp | 2012-02-15 14:13:05 -0500 (Wed, 15 Feb 2012) | 1 line
      
      [CXF-4094] Put a guard around the closing of the context.
    ........
    
  ........
  
........
........
  r1244722 | ay | 2012-02-15 16:03:08 -0500 (Wed, 15 Feb 2012) | 16 lines
  
  Merged revisions 1244717 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1244717 | ay | 2012-02-15 21:56:25 +0100 (Wed, 15 Feb 2012) | 9 lines
    
    Merged revisions 1244697 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244697 | ay | 2012-02-15 21:39:14 +0100 (Wed, 15 Feb 2012) | 1 line
      
      [CXF-4096] a robust in-only option with WS-A
    ........
  ................
  
........
........
  r1244825 | dkulp | 2012-02-15 20:54:04 -0500 (Wed, 15 Feb 2012) | 17 lines
  
  Merged revisions 1244822 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1244822 | dkulp | 2012-02-15 20:53:10 -0500 (Wed, 15 Feb 2012) | 9 lines
    
    Merged revisions 1244820 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244820 | dkulp | 2012-02-15 20:50:54 -0500 (Wed, 15 Feb 2012) | 2 lines
    
      [CXF-4113] Fix problems where header elements may appear twice
    
    ........
  ........
  
........
........
  r1244826 | dkulp | 2012-02-15 20:55:18 -0500 (Wed, 15 Feb 2012) | 32 lines
  
  Blocking revisions 1244664,1244823 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1244664 | dkulp | 2012-02-15 14:21:25 -0500 (Wed, 15 Feb 2012) | 10 lines
    
    Blocking revisions 1244546 via  svn from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244546 | dkulp | 2012-02-15 10:45:53 -0500 (Wed, 15 Feb 2012) | 2 lines
      
      Change how cherry-pick is called and print the running command in a form that allows
copy/paste for testing
      
    ........
    
  ........
  ........
    r1244823 | dkulp | 2012-02-15 20:53:16 -0500 (Wed, 15 Feb 2012) | 10 lines
    
    Recording revisions 1244820 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244820 | dkulp | 2012-02-15 20:50:54 -0500 (Wed, 15 Feb 2012) | 2 lines
      
      [CXF-4113] Fix problems where header elements may appear twice
      
    ........
    
  ........
  
........
........
  r1244945 | ay | 2012-02-16 06:41:34 -0500 (Thu, 16 Feb 2012) | 16 lines
  
  Merged revisions 1244940 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1244940 | ay | 2012-02-16 12:35:13 +0100 (Thu, 16 Feb 2012) | 9 lines
    
    Merged revisions 1244939 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244939 | ay | 2012-02-16 12:31:11 +0100 (Thu, 16 Feb 2012) | 1 line
      
      improve the test cases for CXF-4096
    ........
  ................
  
........
........
  r1245083 | sergeyb | 2012-02-16 12:04:26 -0500 (Thu, 16 Feb 2012) | 16 lines
  
  Merged revisions 1245071 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1245071 | sergeyb | 2012-02-16 16:40:11 +0000 (Thu, 16 Feb 2012) | 9 lines
    
    Merged revisions 1245070 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1245070 | sergeyb | 2012-02-16 16:31:15 +0000 (Thu, 16 Feb 2012) | 1 line
      
      [CXF-4116] Comparing Pattern string representations as the last step
    ........
  ................
  
........
........
  r1245101 | dkulp | 2012-02-16 12:55:26 -0500 (Thu, 16 Feb 2012) | 2 lines
  
  Restore some inadvertantly lost recorded merges
  
........
........
  r1245104 | dkulp | 2012-02-16 12:59:47 -0500 (Thu, 16 Feb 2012) | 17 lines
  
  Merged revisions 1245090 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1245090 | dkulp | 2012-02-16 12:32:31 -0500 (Thu, 16 Feb 2012) | 9 lines
    
    Merged revisions ﶓ via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244563 | gmazza | 2012-02-15 11:12:50 -0500 (Wed, 15 Feb 2012) | 2 lines
    
      Added @Provider annotation to DataSourceProvider
    
    ........
  ........
  
........
........
  r1245105 | dkulp | 2012-02-16 12:59:57 -0500 (Thu, 16 Feb 2012) | 46 lines
  
  Recording revisions 1245078,1245081,1245091 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1245078 | dkulp | 2012-02-16 11:54:25 -0500 (Thu, 16 Feb 2012) | 11 lines
    
    Recording revisions 1245072 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1245072 | dkulp | 2012-02-16 11:42:05 -0500 (Thu, 16 Feb 2012) | 3 lines
      
      [CXF-4115] Make sure operation name given to provider either matches the
      payload or is null.
      
    ........
    
  ........
  ........
    r1245081 | sergeyb | 2012-02-16 12:01:39 -0500 (Thu, 16 Feb 2012) | 9 lines
    
    Merged revisions 1244821 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244821 | dkulp | 2012-02-16 01:50:59 +0000 (Thu, 16 Feb 2012) | 1 line
      
      Fix failing test
    ........
    
  ........
  ........
    r1245091 | dkulp | 2012-02-16 12:32:36 -0500 (Thu, 16 Feb 2012) | 10 lines
    
    Recording revisions 1244563 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244563 | gmazza | 2012-02-15 11:12:50 -0500 (Wed, 15 Feb 2012) | 2 lines
      
      Added @Provider annotation to DataSourceProvider
      
    ........
    
  ........
  
........
........
  r1245116 | coheigea | 2012-02-16 13:29:58 -0500 (Thu, 16 Feb 2012) | 12 lines
  
  [CXF-4099] - SignedParts, EncryptedParts policy assertions are silently ignored on the client
side if specified alone
   - Patch applied, thanks.
   - I also added in SignedElements, EncryptedElements and ContentEncryptedElements.
  
  Conflicts:
  
  	rt/ws/security/pom.xml
  
  
  Conflicts:
  
  	rt/ws/security/pom.xml
........
........
  r1245578 | ay | 2012-02-17 09:40:37 -0500 (Fri, 17 Feb 2012) | 15 lines
  
  Blocked revisions 1245573 via svnmerge
  
  ................
    r1245573 | ay | 2012-02-17 15:35:36 +0100 (Fri, 17 Feb 2012) | 9 lines
    
    Merged revisions 1245572 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1245572 | ay | 2012-02-17 15:31:34 +0100 (Fri, 17 Feb 2012) | 1 line
      
      [CXF-4023] invalid ProtocolVariant causes NullPointerException in RMSoapInterceptor
    ........
  ................
  
........
........
  r1245589 | dkulp | 2012-02-17 09:55:48 -0500 (Fri, 17 Feb 2012) | 9 lines
  
  Merged revisions 1245365 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1245365 | dsosnoski | 2012-02-17 05:07:21 -0500 (Fri, 17 Feb 2012) | 1 line
    
    Add license to file (schema as given in WS-I Attachment Profile)
  ........
  
........
........
  r1245595 | dkulp | 2012-02-17 10:04:27 -0500 (Fri, 17 Feb 2012) | 16 lines
  
  Recording revisions 1245113 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1245113 | coheigea | 2012-02-16 13:21:21 -0500 (Thu, 16 Feb 2012) | 8 lines
    
    [CXF-4099] - SignedParts, EncryptedParts policy assertions are silently ignored on the
client side if specified alone
     - Patch applied, thanks.
     - I also added in SignedElements, EncryptedElements and ContentEncryptedElements.
    
    
    Conflicts:
    
    	rt/ws/security/pom.xml
  ........
  
........
........
  r1245596 | dkulp | 2012-02-17 10:04:30 -0500 (Fri, 17 Feb 2012) | 94 lines
  
  Blocking revisions 1245568,1245570,1245571 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1245568 | dkulp | 2012-02-17 09:31:02 -0500 (Fri, 17 Feb 2012) | 10 lines
    
    Merged revisions 1245305 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1245305 | dkulp | 2012-02-16 21:58:23 -0500 (Thu, 16 Feb 2012) | 3 lines
    
      [CXF-4106] Re-use the binding, but not the endpoint, if the transports
      don't match.  Allows the mime stuff to be retained.
    
    ........
  ........
  ........
    r1245570 | dkulp | 2012-02-17 09:31:12 -0500 (Fri, 17 Feb 2012) | 37 lines
    
    Recording revisions 1245108,1245305,1245565,1245566,1245567 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1245108 | coheigea | 2012-02-16 13:08:00 -0500 (Thu, 16 Feb 2012) | 4 lines
      
      [CXF-4099] - SignedParts, EncryptedParts policy assertions are silently ignored on the
client side if specified alone
       - Patch applied, thanks.
       - I also added in SignedElements, EncryptedElements and ContentEncryptedElements.
      
    ........
    ........
      r1245305 | dkulp | 2012-02-16 21:58:23 -0500 (Thu, 16 Feb 2012) | 3 lines
      
      [CXF-4106] Re-use the binding, but not the endpoint, if the transports
      don't match.  Allows the mime stuff to be retained.
      
    ........
    ........
      r1245565 | dkulp | 2012-02-17 09:25:52 -0500 (Fri, 17 Feb 2012) | 2 lines
      
      Fix tests for offline build
      
    ........
    ........
      r1245566 | dkulp | 2012-02-17 09:25:56 -0500 (Fri, 17 Feb 2012) | 2 lines
      
      Add license to file (schema as given in WS-I Attachment Profile)
      
    ........
    ........
      r1245567 | dkulp | 2012-02-17 09:25:59 -0500 (Fri, 17 Feb 2012) | 2 lines
      
      New version of PMD fixes the problem we had with 2.7
      
    ........
    
  ........
  ........
    r1245571 | dkulp | 2012-02-17 09:31:13 -0500 (Fri, 17 Feb 2012) | 31 lines
    
    Blocking revisions 1245075,1245093,1245096,1245306 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1245075 | dkulp | 2012-02-16 11:52:13 -0500 (Thu, 16 Feb 2012) | 3 lines
      
      Update to use int for versions and also not do the svn checkout to
      record properties if nothing needs to change.
      
    ........
    ........
      r1245093 | dkulp | 2012-02-16 12:35:06 -0500 (Thu, 16 Feb 2012) | 4 lines
      
      Add ability to specify a single rev to consider
      Fix problem with log versions
      Also don't exit on merge issue, print and allow user to resolve.
      
    ........
    ........
      r1245096 | dkulp | 2012-02-16 12:44:00 -0500 (Thu, 16 Feb 2012) | 2 lines
      
      Fix changes and flush that were not re-asking about the current commit
      
    ........
    ........
      r1245306 | dkulp | 2012-02-16 21:58:32 -0500 (Thu, 16 Feb 2012) | 2 lines
      
      Remove an unused interceptor
      
    ........
    
  ........
  
........
........
  r1245601 | ay | 2012-02-17 10:10:55 -0500 (Fri, 17 Feb 2012) | 16 lines
  
  Merged revisions 1245597 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1245597 | ay | 2012-02-17 16:04:37 +0100 (Fri, 17 Feb 2012) | 9 lines
    
    Merged revisions 1245591 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1245591 | ay | 2012-02-17 15:59:36 +0100 (Fri, 17 Feb 2012) | 1 line
      
      add a robust-inonly test case with wsrm usage
    ........
  ................
  
........

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