Author: sergeyb
Date: Mon Nov 7 18:59:51 2011
New Revision: 1198877
URL: http://svn.apache.org/viewvc?rev=1198877&view=rev
Log:
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.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
- copied unchanged from r1198875,
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
- copied unchanged from r1198875,
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 7 18:59:51 2011
@@ -1 +1 @@
-/cxf/trunk:1197048,1198584
+/cxf/trunk:1197048,1198584,1198875
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
