cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1198879 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
Date Mon, 07 Nov 2011 19:05:24 GMT
Author: sergeyb
Date: Mon Nov  7 19:05:24 2011
New Revision: 1198879

URL: http://svn.apache.org/viewvc?rev=1198879&view=rev
Log:
Merged revisions 1198877 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1198877 | sergeyb | 2011-11-07 18:59:51 +0000 (Mon, 07 Nov 2011) | 9 lines
  
  Merged revisions 1198875 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1198875 | sergeyb | 2011-11-07 18:56:04 +0000 (Mon, 07 Nov 2011) | 1 line
    
    [CXF-3380] Adding DataSourceProvider
  ........
................

Added:
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
      - copied unchanged from r1198877, cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
      - copied unchanged from r1198877, cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
Modified:
    cxf/branches/2.3.x-fixes/   (props changed)

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov  7 19:05:24 2011
@@ -0,0 +1,2 @@
+/cxf/branches/2.4.x-fixes:1198877
+/cxf/trunk:1198875

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



Mime
View raw message