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/07/11 22:48:08 UTC
svn commit: r1502358 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/configuration/spring/
rt/core/src/main/java/org/apache/cxf/bus/managers/
rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/
rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/att...
Author: dkulp
Date: Thu Jul 11 20:48:07 2013
New Revision: 1502358
URL: http://svn.apache.org/r1502358
Log:
Remove MapProvider that is leftover from the ancient spring way of wiring the bus together
Removed:
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/MapProvider.java
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistry.java
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java?rev=1502358&r1=1502357&r2=1502358&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java Thu Jul 11 20:48:07 2013
@@ -39,7 +39,6 @@ import org.apache.cxf.common.i18n.Bundle
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.configuration.ConfiguredBeanLocator;
-import org.apache.cxf.configuration.spring.MapProvider;
import org.apache.cxf.helpers.CastUtils;
@NoJSR250Annotations(unlessNull = "bus")
@@ -60,35 +59,6 @@ public final class BindingFactoryManager
setBus(b);
}
- public BindingFactoryManagerImpl(Map<String, BindingFactory> bindingFactories) {
- super();
- if (!(bindingFactories instanceof ConcurrentHashMap)) {
- bindingFactories = new ConcurrentHashMap<String, BindingFactory>(bindingFactories);
- }
- this.bindingFactories = bindingFactories;
- }
- public BindingFactoryManagerImpl(Map<String, BindingFactory> bindingFactories, Bus b) {
- super();
- if (!(bindingFactories instanceof ConcurrentHashMap)) {
- bindingFactories = new ConcurrentHashMap<String, BindingFactory>(bindingFactories);
- }
- this.bindingFactories = bindingFactories;
- setBus(b);
- }
- public BindingFactoryManagerImpl(MapProvider<String, BindingFactory> bindingFactories) {
- super();
- this.bindingFactories = bindingFactories.createMap();
- }
-
- /**
- * Spring configuration via constructor is slow.
- * This accessor allows initialization via a property.
- * @param bindingFactoriesMapProvider
- */
- public void setMapProvider(MapProvider<String, BindingFactory> bindingFactoriesMapProvider) {
- this.bindingFactories = bindingFactoriesMapProvider.createMap();
- }
-
@Resource
public void setBus(Bus b) {
bus = b;
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java?rev=1502358&r1=1502357&r2=1502358&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java Thu Jul 11 20:48:07 2013
@@ -34,7 +34,6 @@ import org.apache.cxf.BusException;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.injection.NoJSR250Annotations;
-import org.apache.cxf.configuration.spring.MapProvider;
import org.apache.cxf.transport.ConduitInitiator;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.TransportFinder;
@@ -58,33 +57,6 @@ public final class ConduitInitiatorManag
setBus(b);
}
-
- public ConduitInitiatorManagerImpl(MapProvider<String, ConduitInitiator> conduitInitiators) {
- this.conduitInitiators = conduitInitiators.createMap();
- }
- public ConduitInitiatorManagerImpl(MapProvider<String, ConduitInitiator> conduitInitiators,
- Bus b) {
- this.conduitInitiators = conduitInitiators.createMap();
- setBus(b);
- }
-
- public ConduitInitiatorManagerImpl(Map<String, ConduitInitiator> conduitInitiators) {
- this.conduitInitiators = conduitInitiators;
- }
- public ConduitInitiatorManagerImpl(Map<String, ConduitInitiator> conduitInitiators, Bus b) {
- this.conduitInitiators = conduitInitiators;
- setBus(b);
- }
-
- /**
- * Spring is slow to resolve constructors. This accessor allows
- * for initialization via a property.
- * @param mapProvider
- */
- public void setMapProvider(MapProvider<String, ConduitInitiator> mapProvider) {
- this.conduitInitiators = mapProvider.createMap();
- }
-
@Resource
public void setBus(Bus b) {
bus = b;
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java?rev=1502358&r1=1502357&r2=1502358&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java Thu Jul 11 20:48:07 2013
@@ -33,7 +33,6 @@ import org.apache.cxf.BusException;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.injection.NoJSR250Annotations;
-import org.apache.cxf.configuration.spring.MapProvider;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.TransportFinder;
@@ -67,14 +66,7 @@ public final class DestinationFactoryMan
this.destinationFactories = destinationFactories;
setBus(b);
}
- public DestinationFactoryManagerImpl(MapProvider<String, DestinationFactory> destinationFactories) {
- this.destinationFactories = destinationFactories.createMap();
- }
-
- public void setMapProvider(MapProvider<String, DestinationFactory> mapProvider) {
- this.destinationFactories = mapProvider.createMap();
- }
-
+
@Resource
public void setBus(Bus b) {
bus = b;
Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java?rev=1502358&r1=1502357&r2=1502358&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java Thu Jul 11 20:48:07 2013
@@ -33,7 +33,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.configuration.ConfiguredBeanLocator;
-import org.apache.cxf.configuration.spring.MapProvider;
import org.apache.cxf.extension.BusExtension;
import org.apache.cxf.extension.RegistryImpl;
import org.apache.cxf.interceptor.Interceptor;
@@ -62,16 +61,6 @@ public class PolicyInterceptorProviderRe
public PolicyInterceptorProviderRegistryImpl(Map<QName, Set<PolicyInterceptorProvider>> interceptors) {
super(interceptors);
}
- public PolicyInterceptorProviderRegistryImpl(MapProvider<QName,
- Set<PolicyInterceptorProvider>> interceptors) {
- super(interceptors.createMap());
- }
- public PolicyInterceptorProviderRegistryImpl(Bus b,
- MapProvider<QName, Set<PolicyInterceptorProvider>> interceptors) {
-
- super(interceptors.createMap());
- setBus(b);
- }
@Resource
public final void setBus(Bus b) {
Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistry.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistry.java?rev=1502358&r1=1502357&r2=1502358&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistry.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistry.java Thu Jul 11 20:48:07 2013
@@ -32,7 +32,6 @@ import org.apache.cxf.common.i18n.Bundle
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.configuration.ConfiguredBeanLocator;
-import org.apache.cxf.configuration.spring.MapProvider;
import org.apache.cxf.extension.BusExtension;
import org.apache.cxf.extension.RegistryImpl;
import org.apache.cxf.ws.policy.AssertionBuilderRegistry;
@@ -60,9 +59,6 @@ public class DomainExpressionBuilderRegi
public DomainExpressionBuilderRegistry(Map<QName, DomainExpressionBuilder> builders) {
super(builders);
}
- public DomainExpressionBuilderRegistry(MapProvider<QName, DomainExpressionBuilder> builders) {
- super(builders.createMap());
- }
@Resource
public final void setBus(Bus b) {
bus = b;