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/05/04 19:55:03 UTC

svn commit: r1334094 - /cxf/branches/2.4.x-fixes/

Author: dkulp
Date: Fri May  4 17:55:03 2012
New Revision: 1334094

URL: http://svn.apache.org/viewvc?rev=1334094&view=rev
Log:
Blocking revisions 1332725,1332760,1333539,1333540,1333541,1333542,1333638,1334088 via  svn from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1332725 | dkulp | 2012-05-01 12:09:31 -0400 (Tue, 01 May 2012) | 10 lines
  
  Merged revisions 1332718 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1332718 | dkulp | 2012-05-01 12:01:25 -0400 (Tue, 01 May 2012) | 3 lines
  
    [CXF-4002] Remove the @readonly for classesDIr as it seems to break
    certain Sonar setups.   Not sure why and not able to reproduce it.
  
  ........
........
........
  r1332760 | dkulp | 2012-05-01 13:31:14 -0400 (Tue, 01 May 2012) | 1 line
  
  Forgot to resolve a conflict.
........
........
  r1333539 | dkulp | 2012-05-03 12:42:56 -0400 (Thu, 03 May 2012) | 9 lines
  
  Merged revisions 1332966 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1332966 | cschneider | 2012-05-02 05:33:47 -0400 (Wed, 02 May 2012) | 2 lines
  
    Added description for the name of the default work queue
  
  ........
........
........
  r1333540 | dkulp | 2012-05-03 12:43:11 -0400 (Thu, 03 May 2012) | 14 lines
  
  Merged revisions 1333209 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1333209 | dkulp | 2012-05-02 17:09:01 -0400 (Wed, 02 May 2012) | 7 lines
  
    [CXF-2937, CXF-2450] Add an -encoding flag to wsdl2java and wire it into
    JAXB and XMLBeans.
    Update codegen-mojo to pass the endoding maven is using in.  Also update
    the fork mode to properly display output while it's occuring.
    If JAXB doesn't support encoding (2.2.5 or newer needed), warn and
    default to current behavior.
  
  ........
........
........
  r1333541 | dkulp | 2012-05-03 12:43:17 -0400 (Thu, 03 May 2012) | 4 lines
  
  Recording revisions 1332772,1332832,1332850,1332966,1333209 via  git from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  
........
........
  r1333542 | dkulp | 2012-05-03 12:43:19 -0400 (Thu, 03 May 2012) | 10 lines
  
  Blocking revisions 1331376 via  git from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1331376 | sergeyb | 2012-04-27 08:13:55 -0400 (Fri, 27 Apr 2012) | 2 lines
    
    Adding a missing spring-web dependency to the spring_security demo
    
  ........
  
........
........
  r1333638 | dkulp | 2012-05-03 17:42:13 -0400 (Thu, 03 May 2012) | 17 lines
  
  Blocking revisions 1332972,1333608 via  git from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1332972 | cschneider | 2012-05-02 05:54:00 -0400 (Wed, 02 May 2012) | 2 lines
    
    Adding ignores
    
  ........
  ........
    r1333608 | dkulp | 2012-05-03 16:32:43 -0400 (Thu, 03 May 2012) | 3 lines
    
    [CXF-4287] Modify -validate switch to allow completely turning off all
    validation.
    
  ........
  
........
........
  r1334088 | dkulp | 2012-05-04 13:48:44 -0400 (Fri, 04 May 2012) | 4 lines
  
  Recording revisions 1334057,1334084 via  git from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  
........

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

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