cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1337317 - /cxf/branches/2.3.x-fixes/
Date Fri, 11 May 2012 17:52:50 GMT
Author: dkulp
Date: Fri May 11 17:52:49 2012
New Revision: 1337317

URL: http://svn.apache.org/viewvc?rev=1337317&view=rev
Log:
Blocking revisions 1335061,1335535,1335544,1336269,1336270,1336272,1336633,1336676,1336677,1336680,1336774,1337163,1337164,1337313
via  svn from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

........
  r1335061 | ay | 2012-05-07 11:24:13 -0400 (Mon, 07 May 2012) | 17 lines
  
  Merged revisions 1335058 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1335058 | ay | 2012-05-07 17:20:09 +0200 (Mon, 07 May 2012) | 9 lines
    
    Merged revisions 1335055 via  svn merge from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1335055 | ay | 2012-05-07 17:13:32 +0200 (Mon, 07 May 2012) | 1 line
      
      [CXF-4293] Some WS-RM scenarios may not run withn there is no internet connection
    ........
    
  ........
  
........
........
  r1335535 | ay | 2012-05-08 10:03:11 -0400 (Tue, 08 May 2012) | 17 lines
  
  Merged revisions 1335492 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1335492 | ay | 2012-05-08 14:59:30 +0200 (Tue, 08 May 2012) | 9 lines
    
    Merged revisions 1335488 via  svn merge from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1335488 | ay | 2012-05-08 14:51:07 +0200 (Tue, 08 May 2012) | 1 line
      
      [CXF-4297] WS-RM destination should update ack-ranges in RMStore before sending out
ack
    ........
    
  ........
  
........
........
  r1335544 | sergeyb | 2012-05-08 10:14:14 -0400 (Tue, 08 May 2012) | 16 lines
  
  Merged revisions 1335406 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1335406 | sergeyb | 2012-05-08 11:29:39 +0100 (Tue, 08 May 2012) | 9 lines
    
    Merged revisions 1335400 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1335400 | sergeyb | 2012-05-08 11:00:22 +0100 (Tue, 08 May 2012) | 1 line
      
      [CXF-4296] Updating JSONProvider to use a namespaceMap for setting a Marshaller namespace
mapper
    ........
  ................
  
........
........
  r1336269 | dkulp | 2012-05-09 12:13:39 -0400 (Wed, 09 May 2012) | 18 lines
  
  Merged revisions 1336257 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1336257 | dkulp | 2012-05-09 12:07:06 -0400 (Wed, 09 May 2012) | 10 lines
    
    Merged revisions 1332833 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1332833 | dkulp | 2012-05-01 17:15:00 -0400 (Tue, 01 May 2012) | 3 lines
    
      [CXF-4279] Try to make sure the ehcache cache manager gets shutdown when
      we're done with it.
    
    ........
  ........
  
........
........
  r1336270 | dkulp | 2012-05-09 12:14:12 -0400 (Wed, 09 May 2012) | 17 lines
  
  Merged revisions 1336259 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1336259 | dkulp | 2012-05-09 12:07:11 -0400 (Wed, 09 May 2012) | 9 lines
    
    Merged revisions 1332849 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1332849 | dkulp | 2012-05-01 17:45:41 -0400 (Tue, 01 May 2012) | 2 lines
    
      Fix java 5 compile failure
    
    ........
  ........
  
........
........
  r1336272 | dkulp | 2012-05-09 12:14:43 -0400 (Wed, 09 May 2012) | 314 lines
  
  Blocking revisions 1333064,1333405,1333490,1334143,1335468,1335712,1335713,1335737,1335897,1335898,1336221,1336242,1336251,1336253,1336260,1336261,1336262,1336263,1336264,1336265,1336266
via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1333064 | sergeyb | 2012-05-02 10:40:29 -0400 (Wed, 02 May 2012) | 9 lines
    
    Merged revisions 1333058 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1333058 | sergeyb | 2012-05-02 15:28:10 +0100 (Wed, 02 May 2012) | 1 line
      
      [CXF-4283] Checking OAuth10 preauthorized tokens for missing or empty verifiers, thanks
to Jordi T.
    ........
    
  ........
  ........
    r1333405 | coheigea | 2012-05-03 07:19:12 -0400 (Thu, 03 May 2012) | 10 lines
    
    Blocking revisions 1333402 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1333402 | coheigea | 2012-05-03 11:53:53 +0100 (Thu, 03 May 2012) | 2 lines
      
      Some cleanup of the ws-security runtime code
      
    ........
    
  ........
  ........
    r1333490 | coheigea | 2012-05-03 10:59:08 -0400 (Thu, 03 May 2012) | 22 lines
    
    Blocking revisions 1332952,1333102,1333477 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1332952 | coheigea | 2012-05-02 09:26:08 +0100 (Wed, 02 May 2012) | 2 lines
      
      Fixed NotOnOrAfter validation in SubjectConfirmationData
      
    ........
    ........
      r1333102 | coheigea | 2012-05-02 17:31:39 +0100 (Wed, 02 May 2012) | 2 lines
      
      Added unit tests for the SAMLSSOResponseValidator + added it into the RequestAssertionConsumerService
      
    ........
    ........
      r1333477 | coheigea | 2012-05-03 15:29:12 +0100 (Thu, 03 May 2012) | 2 lines
      
      More cleanup
      
    ........
    
  ........
  ........
    r1334143 | dkulp | 2012-05-04 15:53:51 -0400 (Fri, 04 May 2012) | 9 lines
    
    Merged revisions 1334142 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1334142 | dkulp | 2012-05-04 15:53:02 -0400 (Fri, 04 May 2012) | 1 line
      
      Fix possible NPE
    ........
    
  ........
  ........
    r1335468 | sergeyb | 2012-05-08 08:33:17 -0400 (Tue, 08 May 2012) | 9 lines
    
    Merged revisions 1335462 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1335462 | sergeyb | 2012-05-08 13:25:44 +0100 (Tue, 08 May 2012) | 1 line
      
      [CXF-4292] Defaulting to String when WADL Generator can not determine a class name of
the primitive type
    ........
    
  ........
  ........
    r1335712 | dkulp | 2012-05-08 15:35:00 -0400 (Tue, 08 May 2012) | 9 lines
    
    Merged revisions 1335709 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1335709 | dkulp | 2012-05-08 15:34:00 -0400 (Tue, 08 May 2012) | 1 line
      
      Add an NPE guard
    ........
    
  ........
  ........
    r1335713 | dkulp | 2012-05-08 15:36:30 -0400 (Tue, 08 May 2012) | 10 lines
    
    Merged revisions 1335708 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1335708 | dkulp | 2012-05-08 15:33:55 -0400 (Tue, 08 May 2012) | 2 lines
      
      Fix test that fails if the filesystem doesn't support the specific
      encoding
    ........
    
  ........
  ........
    r1335737 | dkulp | 2012-05-08 16:11:05 -0400 (Tue, 08 May 2012) | 9 lines
    
    Merged revisions 1335736 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1335736 | dkulp | 2012-05-08 16:10:15 -0400 (Tue, 08 May 2012) | 1 line
      
      Editor screwed up some formatting.
    ........
    
  ........
  ........
    r1335897 | dkulp | 2012-05-08 22:05:06 -0400 (Tue, 08 May 2012) | 10 lines
    
    Merged revisions 1335892 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1335892 | dkulp | 2012-05-08 21:55:31 -0400 (Tue, 08 May 2012) | 3 lines
    
      [CXF-4298, CXF-3505] Old fix for CXF-3505 not needed anymore as other
      fixes have made sure the streams are closed properly.
    
    ........
  ........
  ........
    r1335898 | dkulp | 2012-05-08 22:05:11 -0400 (Tue, 08 May 2012) | 4 lines
    
    Recording revisions 1335892 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1336221 | sergeyb | 2012-05-09 10:20:06 -0400 (Wed, 09 May 2012) | 9 lines
    
    Merged revisions 1336216 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1336216 | sergeyb | 2012-05-09 15:11:15 +0100 (Wed, 09 May 2012) | 1 line
      
      [CXF-4290] Adding an option to specify a custom loader for creating proxies
    ........
    
  ........
  ........
    r1336242 | coheigea | 2012-05-09 11:31:15 -0400 (Wed, 09 May 2012) | 2 lines
    
    Change fork-mode from "pertest" to "once" for the WS-Security system tests. T
     - This results in a very large speed up in the time it takes to run tests when nothing
else is running. This is because SecureRandom was getting seeded "pertest" and pauses until
it collects enough random data.
  ........
  ........
    r1336251 | sergeyb | 2012-05-09 11:54:33 -0400 (Wed, 09 May 2012) | 9 lines
    
    Merged revisions 1336247 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1336247 | sergeyb | 2012-05-09 16:48:33 +0100 (Wed, 09 May 2012) | 1 line
      
      [CXF-4290] Fixing the cglib proxy and improving the test a bit
    ........
    
  ........
  ........
    r1336253 | coheigea | 2012-05-09 11:59:10 -0400 (Wed, 09 May 2012) | 4 lines
    
    Recording revisions 1336240 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1336260 | dkulp | 2012-05-09 12:07:16 -0400 (Wed, 09 May 2012) | 9 lines
    
    Merged revisions 1334191 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1334191 | dkulp | 2012-05-04 17:33:59 -0400 (Fri, 04 May 2012) | 2 lines
    
      Add some predictability into the WadlGenerator.
    
    ........
  ........
  ........
    r1336261 | dkulp | 2012-05-09 12:07:20 -0400 (Wed, 09 May 2012) | 9 lines
    
    Merged revisions 1335054 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1335054 | dkulp | 2012-05-07 11:13:27 -0400 (Mon, 07 May 2012) | 2 lines
    
      Fix tests that fail if run in different order (required proper cleanups)
    
    ........
  ........
  ........
    r1336262 | dkulp | 2012-05-09 12:07:24 -0400 (Wed, 09 May 2012) | 9 lines
    
    Merged revisions 1335110 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1335110 | dkulp | 2012-05-07 12:39:47 -0400 (Mon, 07 May 2012) | 2 lines
    
      Remove some printlns I left in
    
    ........
  ........
  ........
    r1336263 | dkulp | 2012-05-09 12:07:27 -0400 (Wed, 09 May 2012) | 9 lines
    
    Merged revisions 1335202 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1335202 | dkulp | 2012-05-07 15:09:35 -0400 (Mon, 07 May 2012) | 2 lines
    
      Update to newer eclipse plugin
    
    ........
  ........
  ........
    r1336264 | dkulp | 2012-05-09 12:07:31 -0400 (Wed, 09 May 2012) | 9 lines
    
    Merged revisions 1336002 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1336002 | cschneider | 2012-05-09 04:45:33 -0400 (Wed, 09 May 2012) | 2 lines
    
      CXF-4300 Increasing import range to [2.2,4) to allow the commands to install in karaf
3
    
    ........
  ........
  ........
    r1336265 | dkulp | 2012-05-09 12:07:37 -0400 (Wed, 09 May 2012) | 4 lines
    
    Recording revisions 1332833,1332849,1334191,1334309,1335054,1335110,1335202,1336002 via
 git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1336266 | dkulp | 2012-05-09 12:07:39 -0400 (Wed, 09 May 2012) | 52 lines
    
    Blocking revisions 1333008,1333408,1334891,1334892,1335200,1335735,1335891,1336046 via
 git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1333008 | sergeyb | 2012-05-02 08:06:16 -0400 (Wed, 02 May 2012) | 2 lines
      
      [CXF-3589] Prototyping the code for managing the SP session data
      
    ........
    ........
      r1333408 | sergeyb | 2012-05-03 07:42:58 -0400 (Thu, 03 May 2012) | 2 lines
      
      [CXF-3589] Introducing a common SP handler, limiting cookies to specific apps that initiated
SAMLRequest
      
    ........
    ........
      r1334891 | ffang | 2012-05-07 03:04:14 -0400 (Mon, 07 May 2012) | 2 lines
      
      [CXF-4278]remove ehcache bundle from cxf feature.xml as it's compile time dependency
only since CXF 2.6
      
    ........
    ........
      r1334892 | ffang | 2012-05-07 03:20:13 -0400 (Mon, 07 May 2012) | 2 lines
      
      [CXF-4278]add ehcache bundle back
      
    ........
    ........
      r1335200 | dkulp | 2012-05-07 15:09:31 -0400 (Mon, 07 May 2012) | 2 lines
      
      Add gwt generated code into eclipse so "refresh" works reliably
      
    ........
    ........
      r1335735 | dkulp | 2012-05-08 16:10:11 -0400 (Tue, 08 May 2012) | 2 lines
      
      Just put the gwt stuff on the compile classpath for eclipse
      
    ........
    ........
      r1335891 | dkulp | 2012-05-08 21:55:27 -0400 (Tue, 08 May 2012) | 2 lines
      
      Don't need xalan anymore.
      
    ........
    ........
      r1336046 | coheigea | 2012-05-09 05:55:50 -0400 (Wed, 09 May 2012) | 2 lines
      
      Fix for failing JDK 1.5 build
      
    ........
    
  ........
  
........
........
  r1336633 | ay | 2012-05-10 08:09:23 -0400 (Thu, 10 May 2012) | 40 lines
  
  Blocking revisions 1336574,1336577,1336624,1336626 via  svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1336574 | ay | 2012-05-10 12:02:51 +0200 (Thu, 10 May 2012) | 9 lines
    
    Merged revisions 1336538 via  svn merge from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1336538 | ay | 2012-05-10 10:41:31 +0200 (Thu, 10 May 2012) | 1 line
      
      [CXF-4303] WS-RM fails when GZIP feature is enabled
    ........
    
  ........
  ........
    r1336577 | ay | 2012-05-10 12:10:04 +0200 (Thu, 10 May 2012) | 1 line
    
    build fix for integrating CXF-4303
  ........
  ........
    r1336624 | ay | 2012-05-10 13:54:17 +0200 (Thu, 10 May 2012) | 1 line
    
    fix the 2.5.x test failure due to the wrong interceptor name for CXF-4303
  ........
  ........
    r1336626 | ay | 2012-05-10 13:55:10 +0200 (Thu, 10 May 2012) | 9 lines
    
    Blocking revisions 1336611 via  svn from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1336611 | ay | 2012-05-10 13:37:47 +0200 (Thu, 10 May 2012) | 1 line
      
      removing temporary comments
    ........
    
  ........
  
........
........
  r1336676 | coheigea | 2012-05-10 09:31:33 -0400 (Thu, 10 May 2012) | 13 lines
  
  Merged revisions 1336666 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1336666 | coheigea | 2012-05-10 14:19:39 +0100 (Thu, 10 May 2012) | 7 lines
  
    [CXF-4294] - Fix for race condition in EhCache stores
  
    Conflicts:
  
    	rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
  
  ........
........
........
  r1336677 | coheigea | 2012-05-10 09:31:48 -0400 (Thu, 10 May 2012) | 4 lines
  
  Recording revisions 1336666 via  git from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  
........
........
  r1336680 | coheigea | 2012-05-10 09:33:33 -0400 (Thu, 10 May 2012) | 45 lines
  
  Blocking revisions 1336281,1336605,1336606,1336612,1336674 via  git from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1336281 | coheigea | 2012-05-09 17:21:11 +0100 (Wed, 09 May 2012) | 2 lines
    
    Explicitly shutting down buses in the WS-Security system tests
    
  ........
  ........
    r1336605 | coheigea | 2012-05-10 12:34:26 +0100 (Thu, 10 May 2012) | 10 lines
    
    Merged revisions 1336600 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1336600 | coheigea | 2012-05-10 12:24:27 +0100 (Thu, 10 May 2012) | 2 lines
    
      Did some cleanup of the STS basic systests
    
    ........
    
  ........
  ........
    r1336606 | coheigea | 2012-05-10 12:34:43 +0100 (Thu, 10 May 2012) | 3 lines
    
    Recording revisions 1336600 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
  ........
  ........
    r1336612 | coheigea | 2012-05-10 12:38:53 +0100 (Thu, 10 May 2012) | 3 lines
    
    Recording revisions 1336274 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
  ........
  ........
    r1336674 | coheigea | 2012-05-10 14:29:47 +0100 (Thu, 10 May 2012) | 3 lines
    
    Recording revisions 1336658 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
  ........
  
........
........
  r1336774 | sergeyb | 2012-05-10 12:16:42 -0400 (Thu, 10 May 2012) | 31 lines
  
  Merged revisions 1336749,1336760 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1336749 | sergeyb | 2012-05-10 16:41:27 +0100 (Thu, 10 May 2012) | 13 lines
    
    Merged revisions 1336660,1336747 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1336660 | sergeyb | 2012-05-10 14:07:48 +0100 (Thu, 10 May 2012) | 1 line
      
      [CXF-4306] Trying to handle the mix-up of FormParam and Multipart annotaions
    ........
      r1336747 | sergeyb | 2012-05-10 16:35:06 +0100 (Thu, 10 May 2012) | 1 line
      
      [CXF-4307] Setting a default in Cookie separator to ';'
    ........
  ................
    r1336760 | sergeyb | 2012-05-10 16:54:12 +0100 (Thu, 10 May 2012) | 9 lines
    
    Merged revisions 1336734 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1336734 | sergeyb | 2012-05-10 16:02:22 +0100 (Thu, 10 May 2012) | 1 line
      
      [CXF-4305] Getting SearchContext to enforce that only non-primitive condition types
are supported
    ........
  ................
  
........
........
  r1337163 | coheigea | 2012-05-11 09:54:14 -0400 (Fri, 11 May 2012) | 4 lines
  
  Recording revisions 1337156,1337159,1337160 via  git from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  
........
........
  r1337164 | coheigea | 2012-05-11 09:54:17 -0400 (Fri, 11 May 2012) | 17 lines
  
  Blocking revisions 1337096 via  git from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1337096 | coheigea | 2012-05-11 11:00:50 +0100 (Fri, 11 May 2012) | 9 lines
    
    Systests/advanced refactor + using fork mode "once"
    
    
    Conflicts:
    
    	services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
    	services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
    	services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
    
  ........
  
........
........
  r1337313 | dkulp | 2012-05-11 13:49:24 -0400 (Fri, 11 May 2012) | 118 lines
  
  Blocking revisions 1336595,1337193,1337295,1337297,1337298,1337299,1337302,1337303 via 
svn from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1336595 | asoldano | 2012-05-10 07:21:29 -0400 (Thu, 10 May 2012) | 9 lines
    
    Merged revisions 1336589 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1336589 | asoldano | 2012-05-10 13:11:14 +0200 (Thu, 10 May 2012) | 2 lines
      
      [CXF-4304] Complete WSA support for STS client configuration via EPR
    ........
    
  ........
  ........
    r1337193 | asoldano | 2012-05-11 10:54:53 -0400 (Fri, 11 May 2012) | 9 lines
    
    Merged revisions 1337187 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1337187 | asoldano | 2012-05-11 16:42:00 +0200 (Fri, 11 May 2012) | 2 lines
      
      [CXF-4308] Add option for disabling STS client WS-MEX invocation using WSA EPR address
    ........
    
  ........
  ........
    r1337295 | dkulp | 2012-05-11 13:37:58 -0400 (Fri, 11 May 2012) | 9 lines
    
    Merged revisions 1336705 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1336705 | dkulp | 2012-05-10 10:10:37 -0400 (Thu, 10 May 2012) | 2 lines
    
      Fix ecipse warning
    
    ........
  ........
  ........
    r1337297 | dkulp | 2012-05-11 13:38:08 -0400 (Fri, 11 May 2012) | 10 lines
    
    Merged revisions 1337291 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1337291 | dkulp | 2012-05-11 13:34:03 -0400 (Fri, 11 May 2012) | 3 lines
    
      Fix some random failures where we may need to wait for an additional
      message to get all the acks.
    
    ........
  ........
  ........
    r1337298 | dkulp | 2012-05-11 13:38:13 -0400 (Fri, 11 May 2012) | 4 lines
    
    Recording revisions 1336705,1337214,1337291 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  ........
    r1337299 | dkulp | 2012-05-11 13:38:16 -0400 (Fri, 11 May 2012) | 28 lines
    
    Blocking revisions 1336805,1336807,1336932,1337155 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1336805 | gmazza | 2012-05-10 13:35:02 -0400 (Thu, 10 May 2012) | 2 lines
      
      Added necessary Spring dependencies to output of Maven archetypes
      
    ........
    ........
      r1336807 | gmazza | 2012-05-10 13:37:45 -0400 (Thu, 10 May 2012) | 2 lines
      
      Fixing inadvertent alteration to pom.xml
      
    ........
    ........
      r1336932 | gmazza | 2012-05-10 18:40:08 -0400 (Thu, 10 May 2012) | 2 lines
      
      Added tomcat:run-war option to java-first archetype, removed unneeded cxf-servlet reference
from beans.xml
      
    ........
    ........
      r1337155 | dkulp | 2012-05-11 09:38:48 -0400 (Fri, 11 May 2012) | 2 lines
      
      svn info seems to have changed format slightly (empty line returned)
      
    ........
    
  ........
  ........
    r1337302 | dkulp | 2012-05-11 13:39:57 -0400 (Fri, 11 May 2012) | 9 lines
    
    Merged revisions 1337294 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1337294 | dkulp | 2012-05-11 13:35:31 -0400 (Fri, 11 May 2012) | 2 lines
    
      Remove unneeded property
    
    ........
  ........
  ........
    r1337303 | dkulp | 2012-05-11 13:40:04 -0400 (Fri, 11 May 2012) | 4 lines
    
    Recording revisions 1337292,1337293,1337294 via  git from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    
  ........
  
........

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

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



Mime
View raw message