cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1493169 - in /cxf/trunk: common/wstx-msv-validation/src/main/resources/META-INF/cxf/ common/xerces-xsd-validation/src/main/resources/META-INF/cxf/ rt/bindings/corba/src/main/resources/META-INF/cxf/ rt/bindings/object/src/main/resources/MET...
Date Fri, 14 Jun 2013 17:23:43 GMT
Author: dkulp
Date: Fri Jun 14 17:23:43 2013
New Revision: 1493169

URL: http://svn.apache.org/r1493169
Log:
Remove all the long since deprecated cxf-extension-*.xml files

Removed:
    cxf/trunk/common/wstx-msv-validation/src/main/resources/META-INF/cxf/cxf-extension-wstx-msv-validation.xml
    cxf/trunk/common/xerces-xsd-validation/src/main/resources/META-INF/cxf/cxf-extension-xerces-xsd-validation.xml
    cxf/trunk/common/xerces-xsd-validation/src/main/resources/META-INF/cxf/cxf.extension
    cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/cxf-extension-corba.xml
    cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml
    cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
    cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf-extension-xml.xml
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/OldSpringSupport.java
    cxf/trunk/rt/javascript/javascript-rt/src/main/resources/META-INF/cxf/cxf-extension-javascript-client.xml
    cxf/trunk/rt/management/src/main/resources/META-INF/cxf/cxf-extension-management.xml
    cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
    cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml
    cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml
    cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
    cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/cxf-extension-local.xml
    cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/cxf-extension-addr.xml
    cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/cxf-extension-policy.xml
    cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/cxf-extension-rm.xml
    cxf/trunk/rt/ws/security/src/main/resources/META-INF/cxf/cxf-extension-ws-security.xml
Modified:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java?rev=1493169&r1=1493168&r2=1493169&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java Fri Jun
14 17:23:43 2013
@@ -69,19 +69,9 @@ public class SpringBeanLocator implement
             if (orig instanceof ExtensionManagerImpl) {
                 List<String> names = new ArrayList<String>();
                 for (String s : ctx.getBeanDefinitionNames()) {
-                    ConfigurableApplicationContext ctxt = (ConfigurableApplicationContext)context;
-                    BeanDefinition def = ctxt.getBeanFactory().getBeanDefinition(s);
-                    String cn =  def.getBeanClassName();
-                    if (OldSpringSupport.class.getName().equals(cn)) {
-                        passThroughs.add(s);
-                        for (String s2 : ctx.getAliases(s)) {
-                            passThroughs.add(s2);
-                        }
-                    } else {
-                        names.add(s);
-                        for (String s2 : ctx.getAliases(s)) {
-                            names.add(s2);
-                        }
+                    names.add(s);
+                    for (String s2 : ctx.getAliases(s)) {
+                        names.add(s2);
                     }
                 }
                 



Mime
View raw message