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/01/19 18:29:43 UTC

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

Author: dkulp
Date: Thu Jan 19 17:29:43 2012
New Revision: 1233493

URL: http://svn.apache.org/viewvc?rev=1233493&view=rev
Log:
Blocked revisions 1232102-1232103,1232121,1232145,1232521-1232522,1232579,1232603,1232606,1233011,1233078,1233429,1233437,1233459,1233481,1233483 via svnmerge

................
  r1232102 | dkulp | 2012-01-16 13:28:25 -0500 (Mon, 16 Jan 2012) | 17 lines
  
  Merged revisions 1232094 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1232094 | dkulp | 2012-01-16 13:21:24 -0500 (Mon, 16 Jan 2012) | 10 lines
    
    Merged revisions 1232089 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1232089 | dkulp | 2012-01-16 13:12:04 -0500 (Mon, 16 Jan 2012) | 2 lines
      
      [CXF-4033] Allow interceptors to be added via the annotations using
      Class objects instead of just strings of classnames.
    ........
  ................
................
  r1232103 | dkulp | 2012-01-16 13:28:58 -0500 (Mon, 16 Jan 2012) | 50 lines
  
  Blocked revisions 1232016,1232037,1232050,1232079,1232082-1232083,1232092-1232093 via svnmerge
  
  ................
    r1232016 | cschneider | 2012-01-16 10:05:49 -0500 (Mon, 16 Jan 2012) | 1 line
    
    Checkstyle fixes
  ................
    r1232037 | cschneider | 2012-01-16 10:43:58 -0500 (Mon, 16 Jan 2012) | 1 line
    
    CXF-3983 Backport to 2.5.x
  ................
    r1232050 | cschneider | 2012-01-16 11:22:11 -0500 (Mon, 16 Jan 2012) | 1 line
    
    CXF-3983 Fix for NPE
  ................
    r1232079 | dkulp | 2012-01-16 12:50:24 -0500 (Mon, 16 Jan 2012) | 2 lines
    
    FIx a PMD error
  ................
    r1232082 | dkulp | 2012-01-16 13:03:01 -0500 (Mon, 16 Jan 2012) | 2 lines
    
    Fix checkstyle issue
  ................
    r1232083 | owulff | 2012-01-16 13:03:03 -0500 (Mon, 16 Jan 2012) | 1 line
    
    Method added for ClaimsHandler/ClaimsManager to pass more context data
  ................
    r1232092 | dkulp | 2012-01-16 13:18:30 -0500 (Mon, 16 Jan 2012) | 9 lines
    
    Merged revisions 1231830 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1231830 | ema | 2012-01-15 23:16:50 -0500 (Sun, 15 Jan 2012) | 1 line
      
      Add the overall beanchmar result for all TestRunners
    ........
  ................
    r1232093 | dkulp | 2012-01-16 13:20:05 -0500 (Mon, 16 Jan 2012) | 9 lines
    
    Merged revisions 1232048 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1232048 | cschneider | 2012-01-16 11:19:33 -0500 (Mon, 16 Jan 2012) | 1 line
      
      CXF-3983 Fix for NPE
    ........
  ................
................
  r1232121 | dkulp | 2012-01-16 14:21:40 -0500 (Mon, 16 Jan 2012) | 2 lines
  
  Fix build failure
................
  r1232145 | dkulp | 2012-01-16 15:24:23 -0500 (Mon, 16 Jan 2012) | 2 lines
  
  Fix compile failure
................
  r1232521 | dkulp | 2012-01-17 13:18:15 -0500 (Tue, 17 Jan 2012) | 18 lines
  
  Merged revisions 1232516 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1232516 | dkulp | 2012-01-17 13:11:57 -0500 (Tue, 17 Jan 2012) | 11 lines
    
    Merged revisions 1232498 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1232498 | dkulp | 2012-01-17 12:25:32 -0500 (Tue, 17 Jan 2012) | 3 lines
      
      [CXF-4036] Update JAXBContextInitializer to look for XmlSeeAlso and
      TypeAdapters on classes as well.
      Patch from david ferbas applied
    ........
  ................
................
  r1232522 | dkulp | 2012-01-17 13:19:40 -0500 (Tue, 17 Jan 2012) | 103 lines
  
  Blocked revisions 1232095-1232096,1232485,1232514,1232517 via svnmerge
  
  ................
    r1232095 | dkulp | 2012-01-16 13:23:16 -0500 (Mon, 16 Jan 2012) | 34 lines
    
    Recorded merge of revisions 1228074,1229089,1229107,1229140,1230216,1230985,1232076 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1228074 | cschneider | 2012-01-06 05:44:47 -0500 (Fri, 06 Jan 2012) | 1 line
      
      CXF-4014 Refactoring of OSGi startup
    ........
      r1229089 | cschneider | 2012-01-09 05:37:28 -0500 (Mon, 09 Jan 2012) | 1 line
      
      CXF-4014 Refactor some methods to ManagedWorkQueueList
    ........
      r1229107 | cschneider | 2012-01-09 07:18:00 -0500 (Mon, 09 Jan 2012) | 1 line
      
      CXF-4014 Adding compatibility for old workqueue configs in one file
    ........
      r1229140 | cschneider | 2012-01-09 08:24:24 -0500 (Mon, 09 Jan 2012) | 1 line
      
      CXF-3983 Bugfix
    ........
      r1230216 | dkulp | 2012-01-11 15:06:23 -0500 (Wed, 11 Jan 2012) | 1 line
      
      Fix class name used to create logger
    ........
      r1230985 | coheigea | 2012-01-13 05:52:44 -0500 (Fri, 13 Jan 2012) | 2 lines
      
      Removing unnecessary signature validation check using Id/XPath
       - Since WSS4J moved to use JSR-105 APIs for signature validation all signed Elements are available for direct comparison
    ........
      r1232076 | owulff | 2012-01-16 12:42:34 -0500 (Mon, 16 Jan 2012) | 1 line
      
      Method added for ClaimsHandler/ClaimsManager to pass more context data
    ........
  ................
    r1232096 | dkulp | 2012-01-16 13:24:04 -0500 (Mon, 16 Jan 2012) | 21 lines
    
    Blocked revisions 1228208,1231429,1232052,1232088 via svnmerge
    
    ........
      r1228208 | dkulp | 2012-01-06 09:46:00 -0500 (Fri, 06 Jan 2012) | 2 lines
      
      Fix eclipse warnings
    ........
      r1231429 | dkulp | 2012-01-13 20:05:18 -0500 (Fri, 13 Jan 2012) | 2 lines
      
      Fragments cannot have activator so make api fragment of core
      Add activator in
    ........
      r1232052 | cschneider | 2012-01-16 11:25:50 -0500 (Mon, 16 Jan 2012) | 1 line
      
      CXF-4032 Fixing imports in jaxrs, jaxws, http, ws policy
    ........
      r1232088 | dkulp | 2012-01-16 13:11:44 -0500 (Mon, 16 Jan 2012) | 1 line
      
      Add spring test scope deps to get tests passing
    ........
  ................
    r1232485 | sergeyb | 2012-01-17 12:08:08 -0500 (Tue, 17 Jan 2012) | 9 lines
    
    Merged revisions 1232483 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1232483 | sergeyb | 2012-01-17 17:05:22 +0000 (Tue, 17 Jan 2012) | 1 line
      
      [CXF-4038] Support for XML Signatures on the server to the client path for JAX-RS
    ........
  ................
    r1232514 | dkulp | 2012-01-17 13:04:02 -0500 (Tue, 17 Jan 2012) | 9 lines
    
    Merged revisions 1232496 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1232496 | dkulp | 2012-01-17 12:25:16 -0500 (Tue, 17 Jan 2012) | 1 line
      
      [CXF-4029] If the wsdl isn't a "File", still process it.
    ........
  ................
    r1232517 | dkulp | 2012-01-17 13:12:28 -0500 (Tue, 17 Jan 2012) | 16 lines
    
    Blocked revisions 1232134,1232362,1232366 via svnmerge
    
    ........
      r1232134 | dkulp | 2012-01-16 15:03:53 -0500 (Mon, 16 Jan 2012) | 1 line
      
      fix build failure
    ........
      r1232362 | cschneider | 2012-01-17 04:40:23 -0500 (Tue, 17 Jan 2012) | 1 line
      
      CXF-4032 Fixing imports in jaxrs
    ........
      r1232366 | cschneider | 2012-01-17 04:46:31 -0500 (Tue, 17 Jan 2012) | 1 line
      
      CXF-4032 Removing unused dependency
    ........
  ................
................
  r1232579 | dkulp | 2012-01-17 16:24:44 -0500 (Tue, 17 Jan 2012) | 17 lines
  
  Merged revisions 1232569 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1232569 | dkulp | 2012-01-17 15:49:11 -0500 (Tue, 17 Jan 2012) | 10 lines
    
    Merged revisions 1232564 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1232564 | dkulp | 2012-01-17 15:37:31 -0500 (Tue, 17 Jan 2012) | 2 lines
      
      [CXF-4037] Allow dynamic client to use already parsed and processed
      schemas like the tooling does.
    ........
  ................
................
  r1232603 | dkulp | 2012-01-17 16:55:06 -0500 (Tue, 17 Jan 2012) | 17 lines
  
  Merged revisions 1232593 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1232593 | dkulp | 2012-01-17 16:41:16 -0500 (Tue, 17 Jan 2012) | 10 lines
    
    Merged revisions 1232591 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1232591 | dkulp | 2012-01-17 16:37:01 -0500 (Tue, 17 Jan 2012) | 2 lines
      
      [CXF-4039] If the wsdlLocation isn't a valid URL, don't output the "new
      URL" style lookup in the code.
    ........
  ................
................
  r1232606 | dkulp | 2012-01-17 16:58:09 -0500 (Tue, 17 Jan 2012) | 14 lines
  
  Blocked revisions 1232570 via svnmerge
  
  ................
    r1232570 | dkulp | 2012-01-17 15:51:51 -0500 (Tue, 17 Jan 2012) | 8 lines
    
    Blocked revisions 1232553 via svnmerge
    
    ........
      r1232553 | owulff | 2012-01-17 14:52:00 -0500 (Tue, 17 Jan 2012) | 1 line
      
      Remove deprecated method in ClaimsHandler
    ........
  ................
................
  r1233011 | dkulp | 2012-01-18 14:29:36 -0500 (Wed, 18 Jan 2012) | 17 lines
  
  Merged revisions 1233007 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1233007 | dkulp | 2012-01-18 14:25:46 -0500 (Wed, 18 Jan 2012) | 10 lines
    
    Merged revisions 1233006 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1233006 | dkulp | 2012-01-18 14:19:29 -0500 (Wed, 18 Jan 2012) | 2 lines
      
      [CXF-4042] Only remove the schemaLocations for the schemas that JAXB
      actually generates
    ........
  ................
................
  r1233078 | sergeyb | 2012-01-18 17:06:25 -0500 (Wed, 18 Jan 2012) | 16 lines
  
  Merged revisions 1233076 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1233076 | sergeyb | 2012-01-18 21:54:29 +0000 (Wed, 18 Jan 2012) | 9 lines
    
    Merged revisions 1233075 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1233075 | sergeyb | 2012-01-18 21:49:31 +0000 (Wed, 18 Jan 2012) | 1 line
      
      [CXF-3596] Minor fix to RetryStrategy
    ........
  ................
................
  r1233429 | sergeyb | 2012-01-19 10:24:28 -0500 (Thu, 19 Jan 2012) | 9 lines
  
  Merged revisions 1233425 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1233425 | sergeyb | 2012-01-19 15:20:43 +0000 (Thu, 19 Jan 2012) | 1 line
    
    Fixing another compilation failure
  ........
................
  r1233437 | ningjiang | 2012-01-19 10:41:48 -0500 (Thu, 19 Jan 2012) | 16 lines
  
  Merged revisions 1233435 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1233435 | ningjiang | 2012-01-19 23:33:09 +0800 (Thu, 19 Jan 2012) | 9 lines
    
    Merged revisions 1233401 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1233401 | ningjiang | 2012-01-19 22:31:04 +0800 (Thu, 19 Jan 2012) | 1 line
      
      Fixed the CS errors of samples
    ........
  ................
................
  r1233459 | coheigea | 2012-01-19 11:41:46 -0500 (Thu, 19 Jan 2012) | 2 lines
  
  Fixed some policy alternative issues with WS-Security
   - Added + updated a lot of tests based around this
................
  r1233481 | dkulp | 2012-01-19 12:21:36 -0500 (Thu, 19 Jan 2012) | 22 lines
  
  Recorded merge of revisions 1233457,1233473 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1233457 | coheigea | 2012-01-19 11:38:45 -0500 (Thu, 19 Jan 2012) | 2 lines
    
    Fixed some policy alternative issues with WS-Security
     - Added + updated a lot of tests based around this
  ................
    r1233473 | dkulp | 2012-01-19 12:12:17 -0500 (Thu, 19 Jan 2012) | 10 lines
    
    Recorded merge of revisions 1233454 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1233454 | coheigea | 2012-01-19 11:36:31 -0500 (Thu, 19 Jan 2012) | 2 lines
      
      Fixed some policy alternative issues with WS-Security
       - Added + updated a lot of tests based around this
    ........
  ................
................
  r1233483 | dkulp | 2012-01-19 12:21:59 -0500 (Thu, 19 Jan 2012) | 35 lines
  
  Blocked revisions 1233009,1233047,1233474 via svnmerge
  
  ................
    r1233009 | dkulp | 2012-01-18 14:26:11 -0500 (Wed, 18 Jan 2012) | 8 lines
    
    Blocked revisions 1232609 via svnmerge
    
    ........
      r1232609 | dkulp | 2012-01-17 17:01:59 -0500 (Tue, 17 Jan 2012) | 1 line
      
      Get aegis tests running again
    ........
  ................
    r1233047 | dkulp | 2012-01-18 15:31:09 -0500 (Wed, 18 Jan 2012) | 9 lines
    
    Merged revisions 1233030 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1233030 | dkulp | 2012-01-18 15:02:11 -0500 (Wed, 18 Jan 2012) | 1 line
      
      Add the services jars to the distro
    ........
  ................
    r1233474 | dkulp | 2012-01-19 12:13:25 -0500 (Thu, 19 Jan 2012) | 8 lines
    
    Blocked revisions 1233348 via svnmerge
    
    ........
      r1233348 | cschneider | 2012-01-19 08:07:51 -0500 (Thu, 19 Jan 2012) | 1 line
      
      CXF-4032 Making http conduit and destination independent of ws policy
    ........
  ................
................

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

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