You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by gm...@apache.org on 2011/11/06 08:53:42 UTC

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

Author: gmazza
Date: Sun Nov  6 07:53:41 2011
New Revision: 1198215

URL: http://svn.apache.org/viewvc?rev=1198215&view=rev
Log:
Recorded merge of revisions 1198145,1198151,1198193,1198202 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1198145 | gmazza | 2011-11-06 02:07:30 -0500 (Sun, 06 Nov 2011) | 1 line
  
  Provided WAR deployment option for intro java-first sample
........
  r1198151 | gmazza | 2011-11-06 02:10:05 -0500 (Sun, 06 Nov 2011) | 2 lines
  
  New webapp directory for WAR deployment
........
  r1198193 | gmazza | 2011-11-06 02:37:34 -0500 (Sun, 06 Nov 2011) | 1 line
  
  Adding webapp folder for Java-first sample (updated wrong directory last time)
........
  r1198202 | gmazza | 2011-11-06 02:42:53 -0500 (Sun, 06 Nov 2011) | 1 line
  
  Reverted previous change; updated wrong sample.
........

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

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