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 2013/04/02 19:37:43 UTC
svn commit: r1463634 - in
/cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF:
cxf/org.apache.cxf.bus.factory services/org.apache.cxf.bus.factory
Author: dkulp
Date: Tue Apr 2 17:37:30 2013
New Revision: 1463634
URL: http://svn.apache.org/r1463634
Log:
Merged revisions 1462602 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1462602 | dkulp | 2013-03-29 14:45:19 -0400 (Fri, 29 Mar 2013) | 18 lines
Merged revisions 1462595 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1462595 | dkulp | 2013-03-29 14:40:24 -0400 (Fri, 29 Mar 2013) | 10 lines
Merged revisions 1462589 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1462589 | dkulp | 2013-03-29 14:37:17 -0400 (Fri, 29 Mar 2013) | 2 lines
Unify the list of conditions forthe two files (next up, remove the duplicate)
........
........
........
Modified:
cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory
cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory?rev=1463634&r1=1463633&r2=1463634&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory (original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory Tue Apr 2 17:37:30 2013
@@ -1,2 +1,2 @@
org.apache.cxf.bus.spring.SpringBusFactory
-org.springframework.context.ApplicationContext,org.springframework.beans.factory.xml.NamespaceHandlerResolver
\ No newline at end of file
+org.springframework.context.ApplicationContext,org.springframework.beans.BeansException,org.springframework.beans.factory.xml.NamespaceHandlerResolver
\ No newline at end of file
Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory?rev=1463634&r1=1463633&r2=1463634&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory (original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory Tue Apr 2 17:37:30 2013
@@ -1,2 +1,2 @@
org.apache.cxf.bus.spring.SpringBusFactory
-org.springframework.context.ApplicationContext,org.springframework.beans.BeansException
\ No newline at end of file
+org.springframework.context.ApplicationContext,org.springframework.beans.BeansException,org.springframework.beans.factory.xml.NamespaceHandlerResolver