cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1462595 - in /cxf/branches/2.7.x-fixes/rt/core/src/main/resources/META-INF: cxf/org.apache.cxf.bus.factory services/org.apache.cxf.bus.factory
Date Fri, 29 Mar 2013 18:40:25 GMT
Author: dkulp
Date: Fri Mar 29 18:40:24 2013
New Revision: 1462595

URL: http://svn.apache.org/r1462595
Log:
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.7.x-fixes/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory
    cxf/branches/2.7.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory

Modified: cxf/branches/2.7.x-fixes/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory?rev=1462595&r1=1462594&r2=1462595&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory
(original)
+++ cxf/branches/2.7.x-fixes/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory
Fri Mar 29 18:40:24 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.7.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory?rev=1462595&r1=1462594&r2=1462595&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
(original)
+++ cxf/branches/2.7.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
Fri Mar 29 18:40:24 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



Mime
View raw message