You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/14 09:49:53 UTC
[48/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
index fe80e42..008a57c 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
@@ -84,17 +84,17 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
FORCE_PRETTY = pretty;
}
private static final String BUS_ID_PROPERTY_NAME = "org.apache.cxf.bus.id";
-
+
protected final Map<Class<?>, Object> extensions;
protected final Set<Class<?>> missingExtensions;
protected String id;
- private BusState state;
+ private BusState state;
private final Collection<Feature> features = new CopyOnWriteArrayList<Feature>();
private final Map<String, Object> properties = new ConcurrentHashMap<String, Object>(16, 0.75f, 4);
-
-
+
+
private final ExtensionManagerImpl extensionManager;
-
+
public ExtensionManagerBus(Map<Class<?>, Object> extensions, Map<String, Object> props,
ClassLoader extensionClassLoader) {
if (extensions == null) {
@@ -104,41 +104,41 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
}
this.extensions = extensions;
this.missingExtensions = new CopyOnWriteArraySet<Class<?>>();
-
-
+
+
state = BusState.INITIAL;
-
+
CXFBusFactory.possiblySetDefaultBus(this);
if (FORCE_LOGGING) {
LoggingFeature feature = new LoggingFeature();
feature.setPrettyLogging(FORCE_PRETTY);
features.add(feature);
- }
+ }
if (null != props) {
properties.putAll(props);
}
-
+
Configurer configurer = (Configurer)extensions.get(Configurer.class);
if (null == configurer) {
configurer = new NullConfigurer();
extensions.put(Configurer.class, configurer);
}
-
+
id = getBusId(properties);
-
+
ResourceManager resourceManager = new DefaultResourceManager();
-
+
properties.put(BUS_ID_PROPERTY_NAME, BUS_PROPERTY_NAME);
properties.put(BUS_PROPERTY_NAME, this);
properties.put(DEFAULT_BUS_ID, this);
-
+
ResourceResolver propertiesResolver = new PropertiesResolver(properties);
resourceManager.addResourceResolver(propertiesResolver);
-
+
ResourceResolver busResolver = new SinglePropertyResolver(BUS_PROPERTY_NAME, this);
resourceManager.addResourceResolver(busResolver);
resourceManager.addResourceResolver(new ObjectTypeResolver(this));
-
+
busResolver = new SinglePropertyResolver(DEFAULT_BUS_ID, this);
resourceManager.addResourceResolver(busResolver);
resourceManager.addResourceResolver(new ObjectTypeResolver(this));
@@ -153,17 +153,17 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
return null;
}
});
-
+
extensions.put(ResourceManager.class, resourceManager);
extensionManager = new ExtensionManagerImpl(new String[0],
extensionClassLoader,
extensions,
- resourceManager,
+ resourceManager,
this);
-
+
setState(BusState.INITIAL);
-
+
if (null == this.getExtension(DestinationFactoryManager.class)) {
new DestinationFactoryManagerImpl(this);
}
@@ -171,16 +171,16 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
if (null == this.getExtension(ConduitInitiatorManager.class)) {
new ConduitInitiatorManagerImpl(this);
}
-
+
if (null == this.getExtension(BindingFactoryManager.class)) {
new BindingFactoryManagerImpl(this);
}
extensionManager.load(new String[] {ExtensionManagerImpl.BUS_EXTENSION_RESOURCE});
extensionManager.activateAllByType(ResourceResolver.class);
-
- extensions.put(ExtensionManager.class, extensionManager);
+
+ extensions.put(ExtensionManager.class, extensionManager);
}
-
+
public ExtensionManagerBus(Map<Class<?>, Object> e, Map<String, Object> properties) {
this(e, properties, Thread.currentThread().getContextClassLoader());
}
@@ -190,12 +190,12 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
public ExtensionManagerBus() {
this(null, null, Thread.currentThread().getContextClassLoader());
}
-
-
+
+
protected final void setState(BusState state) {
this.state = state;
}
-
+
public void setId(String i) {
id = i;
}
@@ -233,7 +233,7 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
}
return null;
}
-
+
public boolean hasExtensionByName(String name) {
for (Class<?> c : extensions.keySet()) {
if (name.equals(c.getName())) {
@@ -249,11 +249,11 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
}
return false;
}
-
+
protected final synchronized ConfiguredBeanLocator createConfiguredBeanLocator() {
ConfiguredBeanLocator loc = (ConfiguredBeanLocator)extensions.get(ConfiguredBeanLocator.class);
if (loc == null) {
- loc = extensionManager;
+ loc = extensionManager;
this.setExtension(loc, ConfiguredBeanLocator.class);
}
return loc;
@@ -269,25 +269,25 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
}
}
- public String getId() {
+ public String getId() {
return null == id ? DEFAULT_BUS_ID + Integer.toString(Math.abs(this.hashCode())) : id;
}
public void initialize() {
setState(BusState.INITIALIZING);
-
+
Collection<? extends BusCreationListener> ls = getExtension(ConfiguredBeanLocator.class)
.getBeansOfType(BusCreationListener.class);
for (BusCreationListener l : ls) {
l.busCreated(this);
}
-
+
doInitializeInternal();
-
+
BusLifeCycleManager lifeCycleManager = this.getExtension(BusLifeCycleManager.class);
if (null != lifeCycleManager) {
lifeCycleManager.initComplete();
- }
+ }
setState(BusState.RUNNING);
}
@@ -297,9 +297,9 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
}
protected void loadAdditionalFeatures() {
-
+
}
-
+
protected void initializeFeatures() {
loadAdditionalFeatures();
if (features != null) {
@@ -316,7 +316,7 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
protected void destroyBeans() {
extensionManager.destroyBeans();
}
-
+
public void shutdown(boolean wait) {
if (state == BusState.SHUTTING_DOWN) {
return;
@@ -363,7 +363,7 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
initializeFeatures();
}
}
-
+
public interface ExtensionFinder {
<T> T findExtension(Class<T> cls);
}
@@ -388,8 +388,8 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
properties.put(s, o);
}
}
-
-
+
+
private static String getBusId(Map<String, Object> properties) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
index 62d1944..fbf268b 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
@@ -47,13 +47,13 @@ import org.apache.cxf.resource.SinglePropertyResolver;
public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLocator {
public static final Logger LOG = LogUtils.getL7dLogger(ExtensionManagerImpl.class);
-
-
+
+
public static final String EXTENSIONMANAGER_PROPERTY_NAME = "extensionManager";
public static final String ACTIVATION_NAMESPACES_PROPERTY_NAME = "activationNamespaces";
public static final String ACTIVATION_NAMESPACES_SETTER_METHOD_NAME = "setActivationNamespaces";
public static final String BUS_EXTENSION_RESOURCE = "META-INF/cxf/bus-extensions.txt";
-
+
private final ClassLoader loader;
private ResourceManager resourceManager;
private Map<String, Extension> all = new ConcurrentHashMap<String, Extension>();
@@ -61,21 +61,21 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
private final Map<Class<?>, Object> activated;
private final Bus bus;
- public ExtensionManagerImpl(ClassLoader cl, Map<Class<?>, Object> initialExtensions,
+ public ExtensionManagerImpl(ClassLoader cl, Map<Class<?>, Object> initialExtensions,
ResourceManager rm, Bus b) {
this(new String[] {BUS_EXTENSION_RESOURCE},
cl, initialExtensions, rm, b);
}
- public ExtensionManagerImpl(String resource,
- ClassLoader cl,
- Map<Class<?>, Object> initialExtensions,
+ public ExtensionManagerImpl(String resource,
+ ClassLoader cl,
+ Map<Class<?>, Object> initialExtensions,
ResourceManager rm,
Bus b) {
this(new String[] {resource}, cl, initialExtensions, rm, b);
- }
- public ExtensionManagerImpl(String resources[],
- ClassLoader cl,
- Map<Class<?>, Object> initialExtensions,
+ }
+ public ExtensionManagerImpl(String resources[],
+ ClassLoader cl,
+ Map<Class<?>, Object> initialExtensions,
ResourceManager rm,
Bus b) {
@@ -97,7 +97,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
}
}
}
-
+
final void load(String resources[]) {
if (resources == null) {
return;
@@ -108,19 +108,19 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
}
} catch (IOException ex) {
throw new ExtensionException(ex);
- }
+ }
}
public void add(Extension ex) {
all.put(ex.getName(), ex);
ordered.add(ex);
}
-
+
public void initialize() {
for (Extension e : ordered) {
if (!e.isDeferred() && e.getLoadedObject() == null) {
loadAndRegister(e);
}
- }
+ }
}
public void removeBeansOfNames(List<String> names) {
@@ -136,7 +136,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
if (e.getLoadedObject() == null) {
loadAndRegister(e);
}
- }
+ }
}
public <T> void activateAllByType(Class<T> type) {
for (Extension e : ordered) {
@@ -148,9 +148,9 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
}
}
}
- }
+ }
}
-
+
public boolean hasBeanOfName(String name) {
return all.containsKey(name);
}
@@ -162,9 +162,9 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
load(resource, loader);
}
final synchronized void load(String resource, ClassLoader l) throws IOException {
-
+
Enumeration<URL> urls = l.getResources(resource);
-
+
while (urls.hasMoreElements()) {
final URL url = urls.nextElement();
InputStream is;
@@ -208,37 +208,37 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
if (null != activated && null != cls && null != activated.get(cls)) {
return;
}
-
+
synchronized (e) {
Object obj = e.load(loader, bus);
if (obj == null) {
return;
}
-
+
if (null != activated) {
Configurer configurer = (Configurer)(activated.get(Configurer.class));
if (null != configurer) {
configurer.configureBean(obj);
}
}
-
+
// let the object know for which namespaces it has been activated
ResourceResolver namespacesResolver = null;
- if (null != e.getNamespaces()) {
- namespacesResolver = new SinglePropertyResolver(ACTIVATION_NAMESPACES_PROPERTY_NAME,
+ if (null != e.getNamespaces()) {
+ namespacesResolver = new SinglePropertyResolver(ACTIVATION_NAMESPACES_PROPERTY_NAME,
e.getNamespaces());
resourceManager.addResourceResolver(namespacesResolver);
}
-
+
// Since we need to support spring2.5 by removing @Resource("activationNamespaces")
// Now we call the setActivationNamespaces method directly here
if (e.getNamespaces() != null && !e.getNamespaces().isEmpty()) {
invokeSetterActivationNSMethod(obj, e.getNamespaces());
}
-
+
ResourceInjector injector = new ResourceInjector(resourceManager);
-
- try {
+
+ try {
injector.inject(obj);
injector.construct(obj);
} finally {
@@ -246,11 +246,11 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
resourceManager.removeResourceResolver(namespacesResolver);
}
}
-
+
if (null != activated) {
if (cls == null) {
cls = obj.getClass();
- }
+ }
activated.put(cls, obj);
}
}
@@ -274,7 +274,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
}
return null;
}
-
+
private void invokeSetterActivationNSMethod(Object target, Object value) {
Class<?> clazz = target.getClass();
String methodName = ACTIVATION_NAMESPACES_SETTER_METHOD_NAME;
@@ -296,7 +296,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
}
}
clazz = clazz.getSuperclass();
- }
+ }
}
public List<String> getBeanNamesOfType(Class<?> type) {
List<String> ret = new LinkedList<String>();
@@ -306,7 +306,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
synchronized (ex) {
ret.add(ex.getName());
}
- }
+ }
}
return ret;
}
@@ -314,7 +314,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
if (name == null) {
return null;
}
- Extension ex = all.get(name);
+ Extension ex = all.get(name);
if (ex != null) {
if (ex.getLoadedObject() == null) {
loadAndRegister(ex);
@@ -336,7 +336,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
if (ext.getLoadedObject() != null) {
ret.add(type.cast(ext.getLoadedObject()));
}
- }
+ }
}
}
for (Extension ex : ordered) {
@@ -350,7 +350,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
if (ex.getLoadedObject() != null) {
ret.add(type.cast(ex.getLoadedObject()));
}
- }
+ }
}
}
}
@@ -360,7 +360,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
boolean loaded = false;
for (Extension ex : ordered) {
Class<?> cls = ex.getClassObject(loader);
- if (cls != null
+ if (cls != null
&& type.isAssignableFrom(cls)) {
synchronized (ex) {
if (listener.loadBean(ex.getName(), cls.asSubclass(type))) {
@@ -391,6 +391,6 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
ResourceInjector injector = new ResourceInjector(resourceManager);
injector.destroy(ex.getLoadedObject());
}
- }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java
index 3c658d3..7b0f800 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java
@@ -26,19 +26,19 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
/**
- * Static registry of extensions that are loaded in addition to the
- * extensions the Bus will automatically detect. Mostly used by
+ * Static registry of extensions that are loaded in addition to the
+ * extensions the Bus will automatically detect. Mostly used by
* the OSGi bundle activator to detect extensions in bundles outside
- * the CXF bundle.
+ * the CXF bundle.
*/
public final class ExtensionRegistry {
- private static ConcurrentMap<String, Extension> extensions
+ private static ConcurrentMap<String, Extension> extensions
= new ConcurrentHashMap<String, Extension>(16, 0.75f, 4);
private ExtensionRegistry() {
//singleton
}
-
+
public static Map<String, Extension> getRegisteredExtensions() {
Map<String, Extension> exts = new HashMap<String, Extension>(extensions.size());
for (Map.Entry<String, Extension> ext : extensions.entrySet()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java b/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
index 0cd5e9d..dea7058 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
@@ -36,12 +36,12 @@ import org.apache.cxf.common.logging.LogUtils;
public class TextExtensionFragmentParser {
private static final Logger LOG = LogUtils.getL7dLogger(TextExtensionFragmentParser.class);
private static Pattern colonPattern = Pattern.compile(":");
-
+
final ClassLoader loader;
public TextExtensionFragmentParser(ClassLoader loader) {
this.loader = loader;
}
-
+
public List<Extension> getExtensions(final URL url) {
InputStream is = null;
try {
@@ -65,7 +65,7 @@ public class TextExtensionFragmentParser {
* Reads extension definitions from a Text file and instantiates them
* The text file has the following syntax
* classname:interfacename:deferred(true|false):optional(true|false)
- *
+ *
* @param is stream to read the extension from
* @return list of Extensions
* @throws IOException
@@ -110,5 +110,5 @@ public class TextExtensionFragmentParser {
}
return ext;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
index 663d9e0..d05398d 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
@@ -43,14 +43,14 @@ import org.apache.cxf.helpers.CastUtils;
@NoJSR250Annotations(unlessNull = "bus")
public final class BindingFactoryManagerImpl implements BindingFactoryManager {
-
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(BindingFactoryManagerImpl.class);
-
+
Map<String, BindingFactory> bindingFactories;
Set<String> failed = new CopyOnWriteArraySet<String>();
Set<String> loaded = new CopyOnWriteArraySet<String>();
Bus bus;
-
+
public BindingFactoryManagerImpl() {
bindingFactories = new ConcurrentHashMap<String, BindingFactory>(8, 0.75f, 4);
}
@@ -58,7 +58,7 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
bindingFactories = new ConcurrentHashMap<String, BindingFactory>(8, 0.75f, 4);
setBus(b);
}
-
+
@Resource
public void setBus(Bus b) {
bus = b;
@@ -66,16 +66,16 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
bus.setExtension(this, BindingFactoryManager.class);
}
}
-
+
public void registerBindingFactory(String name,
BindingFactory factory) {
bindingFactories.put(name, factory);
}
-
+
public void unregisterBindingFactory(String name) {
bindingFactories.remove(name);
}
-
+
public BindingFactory getBindingFactory(final String namespace) throws BusException {
BindingFactory factory = bindingFactories.get(namespace);
if (null == factory) {
@@ -95,18 +95,18 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
}
return factory;
}
-
+
private BindingFactory loadAll(final String namespace) {
- //Try old method of having activationNamespaces configured in.
+ //Try old method of having activationNamespaces configured in.
//It activates all the factories in the list until one matches, thus
//it activates stuff that really aren't needed.
- ConfiguredBeanLocator.BeanLoaderListener<BindingFactory> listener
+ ConfiguredBeanLocator.BeanLoaderListener<BindingFactory> listener
= new ConfiguredBeanLocator.BeanLoaderListener<BindingFactory>() {
public boolean beanLoaded(String name, BindingFactory bean) {
loaded.add(name);
if (!bindingFactories.containsKey(namespace)) {
if (bean instanceof AbstractBindingFactory) {
- for (String ns
+ for (String ns
: ((AbstractBindingFactory)bean).getActivationNamespaces()) {
registerBindingFactory(ns, bean);
}
@@ -121,7 +121,7 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
//ignore
}
}
- }
+ }
return bindingFactories.containsKey(namespace);
}
@@ -137,7 +137,7 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
private BindingFactory loadDefaultNamespace(final String namespace) {
//First attempt will be to examine the factory class
//for a DEFAULT_NAMESPACES field and use it
- ConfiguredBeanLocator.BeanLoaderListener<BindingFactory> listener
+ ConfiguredBeanLocator.BeanLoaderListener<BindingFactory> listener
= new ConfiguredBeanLocator.BeanLoaderListener<BindingFactory>() {
public boolean beanLoaded(String name, BindingFactory bean) {
loaded.add(name);
@@ -159,21 +159,21 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
}
return false;
}
- };
+ };
bus.getExtension(ConfiguredBeanLocator.class)
.loadBeansOfType(BindingFactory.class,
listener);
-
+
return bindingFactories.get(namespace);
}
private BindingFactory loadActivationNamespace(final String namespace) {
final ConfiguredBeanLocator locator = bus.getExtension(ConfiguredBeanLocator.class);
-
+
//Second attempt will be to examine the factory class
- //for a DEFAULT_NAMESPACES field and if it doesn't exist, try
- //using the older activation ns things. This will then load most
+ //for a DEFAULT_NAMESPACES field and if it doesn't exist, try
+ //using the older activation ns things. This will then load most
//of the "older" things
- ConfiguredBeanLocator.BeanLoaderListener<BindingFactory> listener
+ ConfiguredBeanLocator.BeanLoaderListener<BindingFactory> listener
= new ConfiguredBeanLocator.BeanLoaderListener<BindingFactory>() {
public boolean beanLoaded(String name, BindingFactory bean) {
loaded.add(name);
@@ -192,10 +192,10 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
}
return locator.hasConfiguredPropertyValue(name, "activationNamespaces", namespace);
}
- };
+ };
locator.loadBeansOfType(BindingFactory.class,
listener);
-
+
return bindingFactories.get(namespace);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java b/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
index 50c0be0..1be4039 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
@@ -38,7 +38,7 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
private boolean initCalled;
private boolean preShutdownCalled;
private boolean postShutdownCalled;
-
+
public CXFBusLifeCycleManager() {
listeners = new CopyOnWriteArrayList<BusLifeCycleListener>();
}
@@ -46,7 +46,7 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
listeners = new CopyOnWriteArrayList<BusLifeCycleListener>();
setBus(b);
}
-
+
@Resource
public final void setBus(Bus b) {
bus = b;
@@ -54,7 +54,7 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
bus.setExtension(this, BusLifeCycleManager.class);
}
}
-
+
/* (non-Javadoc)
* @see org.apache.cxf.buslifecycle.BusLifeCycleManager#registerLifeCycleListener(
* org.apache.cxf.buslifecycle.BusLifeCycleListener)
@@ -64,7 +64,7 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
if (initCalled) {
listener.initComplete();
}
-
+
}
/* (non-Javadoc)
@@ -72,10 +72,10 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
* org.apache.cxf.buslifecycle.BusLifeCycleListener)
*/
public void unregisterLifeCycleListener(BusLifeCycleListener listener) {
- listeners.remove(listener);
+ listeners.remove(listener);
}
-
-
+
+
public void initComplete() {
if (bus != null) {
bus.getExtension(ConfiguredBeanLocator.class)
@@ -88,9 +88,9 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
listener.initComplete();
}
}
-
+
public void preShutdown() {
- if (!preShutdownCalled) {
+ if (!preShutdownCalled) {
preShutdownCalled = true;
ListIterator<BusLifeCycleListener> li = listeners.listIterator(listeners.size());
while (li.hasPrevious()) {
@@ -98,7 +98,7 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
}
}
}
-
+
public void postShutdown() {
if (!preShutdownCalled) {
preShutdown();
@@ -112,5 +112,5 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java
index b609ffd..c766b2a 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java
@@ -33,14 +33,14 @@ import org.apache.cxf.extension.BusExtension;
@NoJSR250Annotations
public class ClientLifeCycleManagerImpl implements ClientLifeCycleManager, BusExtension {
-
- private CopyOnWriteArrayList<ClientLifeCycleListener> listeners
- = new CopyOnWriteArrayList<ClientLifeCycleListener>();
+
+ private CopyOnWriteArrayList<ClientLifeCycleListener> listeners
+ = new CopyOnWriteArrayList<ClientLifeCycleListener>();
public ClientLifeCycleManagerImpl() {
-
+
}
-
+
public ClientLifeCycleManagerImpl(Bus b) {
Collection<? extends ClientLifeCycleListener> l = b.getExtension(ConfiguredBeanLocator.class)
.getBeansOfType(ClientLifeCycleListener.class);
@@ -48,7 +48,7 @@ public class ClientLifeCycleManagerImpl implements ClientLifeCycleManager, BusEx
listeners.addAll(l);
}
}
-
+
public Class<?> getRegistrationType() {
return ClientLifeCycleManager.class;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
index 073d4bf..0ccfbb3 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
@@ -41,7 +41,7 @@ import org.apache.cxf.transport.TransportFinder;
@NoJSR250Annotations(unlessNull = "bus")
public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManager {
- private static final ResourceBundle BUNDLE
+ private static final ResourceBundle BUNDLE
= BundleUtils.getBundle(ConduitInitiatorManagerImpl.class);
Map<String, ConduitInitiator> conduitInitiators;
@@ -56,7 +56,7 @@ public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManage
conduitInitiators = new ConcurrentHashMap<String, ConduitInitiator>(8, 0.75f, 4);
setBus(b);
}
-
+
@Resource
public void setBus(Bus b) {
bus = b;
@@ -67,7 +67,7 @@ public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManage
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.cxf.bus.ConduitInitiatorManager#registerConduitInitiator(java.lang.String,
* org.apache.cxf.transports.ConduitInitiator)
*/
@@ -77,7 +77,7 @@ public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManage
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.cxf.bus.ConduitInitiatorManager#deregisterConduitInitiator(java.lang.String)
*/
public void deregisterConduitInitiator(String namespace) {
@@ -86,14 +86,14 @@ public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManage
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.cxf.bus.ConduitInitiatorManager#ConduitInitiator(java.lang.String)
*/
/**
* Returns the conduit initiator for the given namespace, constructing it
* (and storing in the cache for future reference) if necessary, using its
* list of factory classname to namespace mappings.
- *
+ *
* @param namespace the namespace.
*/
public ConduitInitiator getConduitInitiator(String namespace) throws BusException {
@@ -122,7 +122,7 @@ public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManage
conduitInitiators,
loaded,
ConduitInitiator.class).findTransportForURI(uri);
-
+
return factory;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
index 57d9165..c348253 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
@@ -40,7 +40,7 @@ import org.apache.cxf.transport.TransportFinder;
@NoJSR250Annotations(unlessNull = "bus")
public final class DestinationFactoryManagerImpl implements DestinationFactoryManager {
- private static final ResourceBundle BUNDLE
+ private static final ResourceBundle BUNDLE
= BundleUtils.getBundle(DestinationFactoryManagerImpl.class);
Map<String, DestinationFactory> destinationFactories;
@@ -66,7 +66,7 @@ public final class DestinationFactoryManagerImpl implements DestinationFactoryMa
this.destinationFactories = destinationFactories;
setBus(b);
}
-
+
@Resource
public void setBus(Bus b) {
bus = b;
@@ -124,13 +124,13 @@ public final class DestinationFactoryManagerImpl implements DestinationFactoryMa
return factory;
}
- public DestinationFactory getDestinationFactoryForUri(String uri) {
+ public DestinationFactory getDestinationFactoryForUri(String uri) {
DestinationFactory factory = new TransportFinder<DestinationFactory>(bus,
destinationFactories,
loaded,
DestinationFactory.class).findTransportForURI(uri);
-
+
return factory;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java
index 204dae0..1e0c83a 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java
@@ -45,26 +45,26 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
private Bus bus;
- private List<EndpointResolver> resolvers
+ private List<EndpointResolver> resolvers
= new CopyOnWriteArrayList<EndpointResolver>();
-
+
public EndpointResolverRegistryImpl() {
-
+
}
public EndpointResolverRegistryImpl(Bus b) {
setBus(b);
}
-
+
/**
* @param b Bus to encapsulate
- */
+ */
public final void setBus(Bus b) {
bus = b;
if (bus != null) {
bus.setExtension(this, EndpointResolverRegistry.class);
}
}
-
+
/**
* Register an endpoint resolver.
*
@@ -73,7 +73,7 @@ public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
public synchronized void register(EndpointResolver resolver) {
resolvers.add(resolver);
}
-
+
/**
* Unregister an endpoint resolver.
*
@@ -91,7 +91,7 @@ public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
* This API is used by any actor that requires a concrete EPR (e.g.
* a transport-level Conduit), and must be called each and every
* time the EPR content is to be accessed (e.g. before each connection
- * establishment attempt).
+ * establishment attempt).
*
* @param logical the abstract EPR to resolve
* @return the resolved concrete EPR if appropriate, null otherwise
@@ -106,17 +106,17 @@ public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
}
return physical;
}
-
+
/**
- * Walk the list of registered EndpointResolvers, so as to force a fresh
- * resolution of the given abstract EPR, discarding any previously cached
+ * Walk the list of registered EndpointResolvers, so as to force a fresh
+ * resolution of the given abstract EPR, discarding any previously cached
* reference.
* <p>
* This API may be used by say the transport-level Conduit when it
* detects a non-transient error on the outgoing connection, or
* by any other actor in the dispatch with the ability to infer
* server-side unavailability.
- *
+ *
* @param logical the previously resolved abstract EPR
* @param physical the concrete EPR to refresh
* @return the renewed concrete EPR if appropriate, null otherwise
@@ -132,11 +132,11 @@ public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
}
return fresh;
}
-
+
/**
- * Walk the list of registered EndpointResolvers, so as to mint a new
+ * Walk the list of registered EndpointResolvers, so as to mint a new
* abstract EPR for a given service name.
- *
+ *
* @param serviceName
* @return the newly minted EPR if appropriate, null otherwise
*/
@@ -150,11 +150,11 @@ public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
}
return logical;
}
-
+
/**
- * Walk the list of registered EndpointResolvers, so as to mint a new
+ * Walk the list of registered EndpointResolvers, so as to mint a new
* abstract EPR for a given physical EPR.
- *
+ *
* @param physical
* @return the newly minted EPR if appropriate, null otherwise
*/
@@ -166,15 +166,15 @@ public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
break;
}
}
- return logical;
+ return logical;
}
-
+
/**
* @return the encapsulated list of registered resolvers
*/
protected List<EndpointResolver> getResolvers() {
return resolvers;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
index 98be695..ccb0fab 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
@@ -31,26 +31,26 @@ import org.apache.cxf.headers.HeaderProcessor;
@NoJSR250Annotations(unlessNull = "bus")
public class HeaderManagerImpl implements HeaderManager {
Map<String, HeaderProcessor> processors = new ConcurrentHashMap<String, HeaderProcessor>(4, 0.75f, 2);
- Bus bus;
-
+ Bus bus;
+
public HeaderManagerImpl() {
}
public HeaderManagerImpl(Bus b) {
setBus(b);
}
-
+
public Bus getBus() {
return bus;
}
-
+
@Resource
- public final void setBus(Bus bus) {
+ public final void setBus(Bus bus) {
this.bus = bus;
if (null != bus) {
bus.setExtension(this, HeaderManager.class);
}
}
-
+
public HeaderProcessor getHeaderProcessor(String namespace) {
if (namespace == null) {
namespace = "";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/PhaseManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/PhaseManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/PhaseManagerImpl.java
index eb467f2..78e60a9 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/PhaseManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/PhaseManagerImpl.java
@@ -112,7 +112,7 @@ public class PhaseManagerImpl implements PhaseManager, BusExtension {
//Make sure ending interceptors are put in positions symmetric
// to their starting interceptors
outPhases.add(new Phase(Phase.SEND_ENDING, ++i * 1000));
-
+
outPhases.add(new Phase(Phase.POST_STREAM_ENDING, ++i * 1000));
outPhases.add(new Phase(Phase.USER_STREAM_ENDING, ++i * 1000));
@@ -123,7 +123,7 @@ public class PhaseManagerImpl implements PhaseManager, BusExtension {
outPhases.add(new Phase(Phase.WRITE_ENDING, ++i * 1000));
outPhases.add(new Phase(Phase.PRE_PROTOCOL_ENDING, ++i * 1000));
-
+
outPhases.add(new Phase(Phase.PRE_STREAM_ENDING, ++i * 1000));
outPhases.add(new Phase(Phase.PREPARE_SEND_ENDING, ++i * 1000));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
index efdd1a5..8180956 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
@@ -33,12 +33,12 @@ import org.apache.cxf.extension.BusExtension;
@NoJSR250Annotations
public class ServerLifeCycleManagerImpl implements ServerLifeCycleManager, BusExtension {
-
- private CopyOnWriteArrayList<ServerLifeCycleListener> listeners =
+
+ private CopyOnWriteArrayList<ServerLifeCycleListener> listeners =
new CopyOnWriteArrayList<ServerLifeCycleListener>();
public ServerLifeCycleManagerImpl() {
-
+
}
public ServerLifeCycleManagerImpl(Bus b) {
Collection<? extends ServerLifeCycleListener> l = b.getExtension(ConfiguredBeanLocator.class)
@@ -51,7 +51,7 @@ public class ServerLifeCycleManagerImpl implements ServerLifeCycleManager, BusEx
return ServerLifeCycleManager.class;
}
-
+
public synchronized void registerListener(ServerLifeCycleListener listener) {
listeners.addIfAbsent(listener);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
index ca6c3aa..7cffcbc 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
@@ -34,11 +34,11 @@ import org.apache.cxf.endpoint.ServerRegistry;
@NoJSR250Annotations(unlessNull = "bus")
public class ServerRegistryImpl implements ServerRegistry, BusLifeCycleListener {
-
+
CopyOnWriteArrayList<Server> serversList;
Bus bus;
BusLifeCycleManager lifeCycleManager;
-
+
public ServerRegistryImpl() {
serversList = new CopyOnWriteArrayList<Server>();
}
@@ -50,10 +50,10 @@ public class ServerRegistryImpl implements ServerRegistry, BusLifeCycleListener
public Bus getBus() {
return bus;
}
-
+
@Resource
- public final void setBus(Bus bus) {
- this.bus = bus;
+ public final void setBus(Bus bus) {
+ this.bus = bus;
if (null != bus) {
bus.setExtension(this, ServerRegistry.class);
lifeCycleManager = bus.getExtension(BusLifeCycleManager.class);
@@ -62,9 +62,9 @@ public class ServerRegistryImpl implements ServerRegistry, BusLifeCycleListener
}
}
}
-
+
public void register(Server server) {
- serversList.addIfAbsent(server);
+ serversList.addIfAbsent(server);
}
public void unregister(Server server) {
@@ -77,18 +77,18 @@ public class ServerRegistryImpl implements ServerRegistry, BusLifeCycleListener
public void initComplete() {
// TODO Auto-generated method stub
-
+
}
@PreDestroy
public void preShutdown() {
// Shutdown the service.
- // To avoid the CurrentModificationException, do not use serversList directly
+ // To avoid the CurrentModificationException, do not use serversList directly
Object[] servers = serversList.toArray();
for (int i = 0; i < servers.length; i++) {
Server server = (Server) servers[i];
server.destroy();
- }
+ }
}
public void postShutdown() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
index f6bab6c..860d708 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
@@ -38,16 +38,16 @@ import org.apache.cxf.endpoint.ServiceContractResolverRegistry;
public class ServiceContractResolverRegistryImpl implements ServiceContractResolverRegistry {
private Bus bus;
- private List<ServiceContractResolver> resolvers
+ private List<ServiceContractResolver> resolvers
= new CopyOnWriteArrayList<ServiceContractResolver>();
public ServiceContractResolverRegistryImpl() {
-
+
}
public ServiceContractResolverRegistryImpl(Bus b) {
setBus(b);
}
-
+
/**
* Sets the bus with which the registry is associated.
@@ -63,7 +63,7 @@ public class ServiceContractResolverRegistryImpl implements ServiceContractResol
/**
* Calls each of the registered <code>ServiceContractResolver</code> instances
- * to resolve the location of the service's contract. It returns the location
+ * to resolve the location of the service's contract. It returns the location
* from the first resolver that matches the QName to a location.
*
* @param qname QName to be resolved into a contract location
@@ -95,7 +95,7 @@ public class ServiceContractResolverRegistryImpl implements ServiceContractResol
* @param resolver the contract resolver to register
*/
public synchronized void register(ServiceContractResolver resolver) {
- resolvers.add(resolver);
+ resolvers.add(resolver);
}
/**
@@ -104,10 +104,10 @@ public class ServiceContractResolverRegistryImpl implements ServiceContractResol
* @param resolver the contract resolver to remove
*/
public synchronized void unregister(ServiceContractResolver resolver) {
- resolvers.remove(resolver);
+ resolvers.remove(resolver);
}
-
+
protected List<ServiceContractResolver> getResolvers() {
return resolvers;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
index f16f626..1e0e3e8 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
@@ -30,28 +30,28 @@ import org.apache.cxf.management.annotation.ManagedResource;
import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
import org.apache.cxf.workqueue.WorkQueueManager;
-@ManagedResource(componentName = "WorkQueue",
- description = "The CXF work queue",
+@ManagedResource(componentName = "WorkQueue",
+ description = "The CXF work queue",
currencyTimeLimit = 15, persistPolicy = "OnUpdate", persistPeriod = 200)
-
-public class WorkQueueImplMBeanWrapper implements ManagedComponent {
+
+public class WorkQueueImplMBeanWrapper implements ManagedComponent {
private static final String TYPE_VALUE = "WorkQueues";
-
+
private AutomaticWorkQueueImpl aWorkQueue;
private WorkQueueManager manager;
-
+
public WorkQueueImplMBeanWrapper(AutomaticWorkQueueImpl wq,
WorkQueueManager mgr) {
aWorkQueue = wq;
manager = mgr;
}
-
+
@ManagedAttribute(description = "The WorkQueueMaxSize",
persistPolicy = "OnUpdate")
public long getWorkQueueMaxSize() {
return aWorkQueue.getMaxSize();
}
-
+
@ManagedAttribute(description = "The WorkQueue Current size",
persistPolicy = "OnUpdate")
public long getWorkQueueSize() {
@@ -59,20 +59,20 @@ public class WorkQueueImplMBeanWrapper implements ManagedComponent {
}
@ManagedAttribute(description = "The largest number of threads")
- public int getLargestPoolSize() {
- return aWorkQueue.getLargestPoolSize();
+ public int getLargestPoolSize() {
+ return aWorkQueue.getLargestPoolSize();
}
@ManagedAttribute(description = "The current number of threads")
- public int getPoolSize() {
- return aWorkQueue.getPoolSize();
+ public int getPoolSize() {
+ return aWorkQueue.getPoolSize();
}
@ManagedAttribute(description = "The number of threads currently busy")
- public int getActiveCount() {
- return aWorkQueue.getActiveCount();
+ public int getActiveCount() {
+ return aWorkQueue.getActiveCount();
}
-
+
@ManagedAttribute(description = "The WorkQueue has nothing to do",
persistPolicy = "OnUpdate")
public boolean isEmpty() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
index 10420be..ec3df12 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
@@ -48,26 +48,26 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
private static final Logger LOG =
LogUtils.getL7dLogger(WorkQueueManagerImpl.class);
- Map<String, AutomaticWorkQueue> namedQueues
+ Map<String, AutomaticWorkQueue> namedQueues
= new ConcurrentHashMap<String, AutomaticWorkQueue>(4, 0.75f, 2);
-
+
boolean inShutdown;
InstrumentationManager imanager;
- Bus bus;
-
+ Bus bus;
+
public WorkQueueManagerImpl() {
-
+
}
public WorkQueueManagerImpl(Bus b) {
setBus(b);
}
-
+
public Bus getBus() {
return bus;
}
-
+
@Resource
- public final void setBus(Bus bus) {
+ public final void setBus(Bus bus) {
this.bus = bus;
if (null != bus) {
bus.setExtension(this, WorkQueueManager.class);
@@ -87,15 +87,15 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
addNamedWorkQueue(awq.getName(), awq);
}
}
-
+
if (!namedQueues.containsKey(DEFAULT_QUEUE_NAME)) {
- AutomaticWorkQueue defaultQueue
+ AutomaticWorkQueue defaultQueue
= locator.getBeanOfType(DEFAULT_WORKQUEUE_BEAN_NAME, AutomaticWorkQueue.class);
if (defaultQueue != null) {
addNamedWorkQueue(DEFAULT_QUEUE_NAME, defaultQueue);
}
}
-
+
bus.getExtension(BusLifeCycleManager.class)
.registerLifeCycleListener(new WQLifecycleListener());
}
@@ -117,9 +117,9 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
if (impl.isShared()) {
synchronized (impl) {
impl.removeSharedUser();
-
- if (impl.getShareCount() == 0
- && imanager != null
+
+ if (impl.getShareCount() == 0
+ && imanager != null
&& imanager.getMBeanServer() != null) {
try {
imanager.unregister(new WorkQueueImplMBeanWrapper(impl, this));
@@ -144,7 +144,7 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
public void run() {
synchronized (this) {
while (!inShutdown) {
- try {
+ try {
wait();
} catch (InterruptedException ex) {
// ignore
@@ -152,7 +152,7 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
}
for (AutomaticWorkQueue q : namedQueues.values()) {
while (!q.isShutdown()) {
- try {
+ try {
wait(100);
} catch (InterruptedException ex) {
// ignore
@@ -163,7 +163,7 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
for (java.util.logging.Handler h : LOG.getHandlers()) {
h.flush();
}
-
+
}
public AutomaticWorkQueue getNamedWorkQueue(String name) {
@@ -175,8 +175,8 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
AutomaticWorkQueueImpl impl = (AutomaticWorkQueueImpl)q;
if (impl.isShared()) {
synchronized (impl) {
- if (impl.getShareCount() == 0
- && imanager != null
+ if (impl.getShareCount() == 0
+ && imanager != null
&& imanager.getMBeanServer() != null) {
try {
imanager.register(new WorkQueueImplMBeanWrapper((AutomaticWorkQueueImpl)q, this));
@@ -195,17 +195,17 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
}
}
}
-
- private AutomaticWorkQueue createAutomaticWorkQueue() {
+
+ private AutomaticWorkQueue createAutomaticWorkQueue() {
AutomaticWorkQueue q = new AutomaticWorkQueueImpl(DEFAULT_QUEUE_NAME);
addNamedWorkQueue(DEFAULT_QUEUE_NAME, q);
return q;
}
-
-
+
+
class WQLifecycleListener implements BusLifeCycleListener {
public void initComplete() {
-
+
}
public void preShutdown() {
shutdown(true);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java
index 6230040..a9d3c9b 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java
@@ -28,27 +28,27 @@ import org.apache.cxf.management.ManagementConstants;
import org.apache.cxf.management.annotation.ManagedOperation;
import org.apache.cxf.management.annotation.ManagedResource;
-@ManagedResource(componentName = "WorkQueueManager",
- description = "The CXF manangement of work queues ",
+@ManagedResource(componentName = "WorkQueueManager",
+ description = "The CXF manangement of work queues ",
currencyTimeLimit = 15, persistPolicy = "OnUpdate", persistPeriod = 200)
-
-public class WorkQueueManagerImplMBeanWrapper implements ManagedComponent {
+
+public class WorkQueueManagerImplMBeanWrapper implements ManagedComponent {
static final String NAME_VALUE = "Bus.WorkQueueManager";
static final String TYPE_VALUE = "WorkQueueManager";
-
+
private WorkQueueManagerImpl wqManager;
private Bus bus;
-
+
public WorkQueueManagerImplMBeanWrapper(WorkQueueManagerImpl wq) {
- wqManager = wq;
+ wqManager = wq;
bus = wq.getBus();
}
-
+
@ManagedOperation(currencyTimeLimit = 30)
public void shutdown(boolean processRemainingWorkItems) {
- wqManager.shutdown(processRemainingWorkItems);
+ wqManager.shutdown(processRemainingWorkItems);
}
-
+
public ObjectName getObjectName() throws JMException {
StringBuilder buffer = new StringBuilder();
@@ -61,5 +61,5 @@ public class WorkQueueManagerImplMBeanWrapper implements ManagedComponent {
//Use default domain name of server
return new ObjectName(buffer.toString());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
index d929f55..a5d23d0 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
@@ -38,21 +38,21 @@ import org.osgi.util.tracker.ServiceTracker;
/**
* Is called in OSGi on start and stop of the cxf bundle.
- * Manages
+ * Manages
* - CXFBundleListener
* - Attaching ManagedWorkqueues to config admin service
* - OsgiBusListener
* - Blueprint namespaces
*/
public class CXFActivator implements BundleActivator {
-
+
private List<Extension> extensions;
private ManagedWorkQueueList workQueues;
private ServiceTracker configAdminTracker;
private CXFExtensionBundleListener cxfBundleListener;
private ServiceRegistration workQueueServiceRegistration;
-
-
+
+
/** {@inheritDoc}*/
public void start(BundleContext context) throws Exception {
@@ -64,17 +64,17 @@ public class CXFActivator implements BundleActivator {
configAdminTracker = new ServiceTracker(context, ConfigurationAdmin.class.getName(), null);
configAdminTracker.open();
workQueues.setConfigAdminTracker(configAdminTracker);
- workQueueServiceRegistration = registerManagedServiceFactory(context, ManagedServiceFactory.class,
+ workQueueServiceRegistration = registerManagedServiceFactory(context, ManagedServiceFactory.class,
workQueues,
ManagedWorkQueueList.FACTORY_PID);
-
+
extensions = new ArrayList<>();
extensions.add(createOsgiBusListenerExtension(context));
extensions.add(createManagedWorkQueueListExtension(workQueues));
ExtensionRegistry.addExtensions(extensions);
BlueprintNameSpaceHandlerFactory factory = new BlueprintNameSpaceHandlerFactory() {
-
+
@Override
public Object createNamespaceHandler() {
return new CXFAPINamespaceHandler();
@@ -93,10 +93,10 @@ public class CXFActivator implements BundleActivator {
private ServiceRegistration registerManagedServiceFactory(BundleContext context,
Class<?> serviceClass,
- Object service,
+ Object service,
String servicePid) {
Properties props = new Properties();
- props.put(Constants.SERVICE_PID, servicePid);
+ props.put(Constants.SERVICE_PID, servicePid);
return context.registerService(serviceClass.getName(), service, props);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java b/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
index 9385d46..05ceabf 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
@@ -44,18 +44,18 @@ import org.osgi.framework.SynchronousBundleListener;
public class CXFExtensionBundleListener implements SynchronousBundleListener {
private static final Logger LOG = LogUtils.getL7dLogger(CXFActivator.class);
private long id;
- private ConcurrentMap<Long, List<OSGiExtension>> extensions
+ private ConcurrentMap<Long, List<OSGiExtension>> extensions
= new ConcurrentHashMap<Long, List<OSGiExtension>>(16, 0.75f, 4);
-
+
public CXFExtensionBundleListener(long bundleId) {
this.id = bundleId;
}
-
+
public void registerExistingBundles(BundleContext context) throws IOException {
for (Bundle bundle : context.getBundles()) {
- if ((bundle.getState() == Bundle.RESOLVED
- || bundle.getState() == Bundle.STARTING
- || bundle.getState() == Bundle.ACTIVE
+ if ((bundle.getState() == Bundle.RESOLVED
+ || bundle.getState() == Bundle.STARTING
+ || bundle.getState() == Bundle.ACTIVE
|| bundle.getState() == Bundle.STOPPING)
&& bundle.getBundleId() != context.getBundle().getBundleId()) {
register(bundle);
@@ -71,7 +71,7 @@ public class CXFExtensionBundleListener implements SynchronousBundleListener {
unregister(event.getBundle().getBundleId());
}
}
-
+
protected void register(final Bundle bundle) {
Enumeration<?> e = bundle.findEntries("META-INF/cxf/", "bus-extensions.txt", false);
while (e != null && e.hasMoreElements()) {
@@ -84,13 +84,13 @@ public class CXFExtensionBundleListener implements SynchronousBundleListener {
if (orig.isEmpty()) {
return false;
}
-
+
List<String> names = new ArrayList<>(orig.size());
for (Extension ext : orig) {
names.add(ext.getName());
}
- LOG.info("Adding the extensions from bundle " + bundle.getSymbolicName()
- + " (" + bundle.getBundleId() + ") " + names);
+ LOG.info("Adding the extensions from bundle " + bundle.getSymbolicName()
+ + " (" + bundle.getBundleId() + ") " + names);
List<OSGiExtension> list = extensions.get(bundle.getBundleId());
if (list == null) {
list = new CopyOnWriteArrayList<OSGiExtension>();
@@ -119,7 +119,7 @@ public class CXFExtensionBundleListener implements SynchronousBundleListener {
unregister(extensions.keySet().iterator().next());
}
}
-
+
public class OSGiExtension extends Extension {
final Bundle bundle;
Object serviceObject;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java b/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
index 6021f31..99ba3c7 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
@@ -40,18 +40,18 @@ import org.osgi.util.tracker.ServiceTracker;
* List of work queues that can be managed using the OSGi configuration admin service
*/
public class ManagedWorkQueueList implements ManagedServiceFactory, PropertyChangeListener {
- public static final String FACTORY_PID = "org.apache.cxf.workqueues";
+ public static final String FACTORY_PID = "org.apache.cxf.workqueues";
private static final Logger LOG = LogUtils.getL7dLogger(ManagedWorkQueueList.class);
-
- private Map<String, AutomaticWorkQueueImpl> queues =
+
+ private Map<String, AutomaticWorkQueueImpl> queues =
new ConcurrentHashMap<String, AutomaticWorkQueueImpl>(4, 0.75f, 2);
private ServiceTracker configAdminTracker;
-
+
public String getName() {
return FACTORY_PID;
}
- public void updated(String pid, @SuppressWarnings("rawtypes") Dictionary props)
+ public void updated(String pid, @SuppressWarnings("rawtypes") Dictionary props)
throws ConfigurationException {
if (pid == null) {
return;
@@ -107,7 +107,7 @@ public class ManagedWorkQueueList implements ManagedServiceFactory, PropertyChan
}
return selectedConfig;
}
-
+
public void addAllToWorkQueueManager(WorkQueueManager manager) {
if (manager != null) {
for (AutomaticWorkQueueImpl wq : queues.values()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java b/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
index ed4d284..23de3d0 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
@@ -47,7 +47,7 @@ public class OSGIBusListener implements BusLifeCycleListener {
public static final String CONTEXT_SYMBOLIC_NAME_PROPERTY = "cxf.context.symbolicname";
public static final String CONTEXT_VERSION_PROPERTY = "cxf.context.version";
public static final String CONTEXT_NAME_PROPERTY = "cxf.bus.id";
-
+
private static final String SERVICE_PROPERTY_PRIVATE = "org.apache.cxf.bus.private.extension";
private static final String SERVICE_PROPERTY_RESTRICTED = "org.apache.cxf.bus.restricted.extension";
private static final String BUS_EXTENSION_BUNDLES_EXCLUDES = "bus.extension.bundles.excludes";
@@ -61,7 +61,7 @@ public class OSGIBusListener implements BusLifeCycleListener {
}
public OSGIBusListener(Bus b, Object args[]) {
bus = b;
- if (args != null && args.length > 0
+ if (args != null && args.length > 0
&& args[0] instanceof BundleContext) {
defaultContext = (BundleContext)args[0];
}
@@ -86,11 +86,11 @@ public class OSGIBusListener implements BusLifeCycleListener {
final ConfiguredBeanLocator cbl = bus.getExtension(ConfiguredBeanLocator.class);
if (cbl instanceof ExtensionManagerImpl) {
// wire in the OSGi things
- bus.setExtension(new OSGiBeanLocator(cbl, defaultContext),
+ bus.setExtension(new OSGiBeanLocator(cbl, defaultContext),
ConfiguredBeanLocator.class);
}
}
-
+
public void initComplete() {
ManagedWorkQueueList wqList = bus.getExtension(ManagedWorkQueueList.class);
if (wqList != null) {
@@ -99,7 +99,7 @@ public class OSGIBusListener implements BusLifeCycleListener {
}
registerBusAsService();
}
-
+
public void preShutdown() {
}
@@ -110,7 +110,7 @@ public class OSGIBusListener implements BusLifeCycleListener {
service = null;
}
}
-
+
private static ServiceReference[] getServiceReferences(BundleContext context, Class<?> serviceClass) {
ServiceReference[] refs = null;
try {
@@ -154,7 +154,7 @@ public class OSGIBusListener implements BusLifeCycleListener {
}
}
}
-
+
private void registerBusFeatures() {
ServiceReference refs[] = getServiceReferences(defaultContext, Feature.class);
for (ServiceReference ref : refs) {
@@ -192,7 +192,7 @@ public class OSGIBusListener implements BusLifeCycleListener {
}
}
// if the excludes-regex is set, the service is excluded when matching that regex.
- return extensionBundlesExcludesPattern != null
+ return extensionBundlesExcludesPattern != null
&& extensionBundlesExcludesPattern.matcher(ref.getBundle().getSymbolicName()).matches();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java b/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
index fda6f80..5fec856 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
@@ -33,17 +33,17 @@ public class OSGiBeanLocator implements ConfiguredBeanLocator {
private static final Logger LOG = LogUtils.getL7dLogger(OSGiBeanLocator.class);
private static final String COMPATIBLE_LOCATOR_PROP = "org.apache.cxf.bus.osgi.locator";
private static final String COMPATIBLE_LOCATOR_PROP_CHECK = COMPATIBLE_LOCATOR_PROP + ".check";
-
+
final ConfiguredBeanLocator cbl;
final BundleContext context;
- private boolean checkCompatibleLocators;
-
+ private boolean checkCompatibleLocators;
+
public OSGiBeanLocator(ConfiguredBeanLocator c, BundleContext ctx) {
cbl = c;
context = ctx;
-
+
Object checkProp = context.getProperty(COMPATIBLE_LOCATOR_PROP_CHECK);
- checkCompatibleLocators = checkProp == null || PropertyUtils.isTrue(checkProp);
+ checkCompatibleLocators = checkProp == null || PropertyUtils.isTrue(checkProp);
}
public <T> T getBeanOfType(String name, Class<T> type) {
return cbl.getBeanOfType(name, type);
@@ -64,8 +64,8 @@ public class OSGiBeanLocator implements ConfiguredBeanLocator {
ServiceReference refs[] = context.getServiceReferences(type.getName(), null);
if (refs != null) {
for (ServiceReference r : refs) {
- if (type == ClassLoader.class
- && checkCompatibleLocators
+ if (type == ClassLoader.class
+ && checkCompatibleLocators
&& !PropertyUtils.isTrue(r.getProperty(COMPATIBLE_LOCATOR_PROP))) {
continue;
}
@@ -74,19 +74,19 @@ public class OSGiBeanLocator implements ConfiguredBeanLocator {
}
} catch (Exception ex) {
//ignore, just don't support the OSGi services
- LOG.info("Tried to find the Bean with type:" + type
- + " from OSGi services and get error: " + ex);
+ LOG.info("Tried to find the Bean with type:" + type
+ + " from OSGi services and get error: " + ex);
}
return list;
}
public <T> boolean loadBeansOfType(Class<T> type, BeanLoaderListener<T> listener) {
return cbl.loadBeansOfType(type, listener);
-
+
}
public boolean hasConfiguredPropertyValue(String beanName, String propertyName, String value) {
return cbl.hasConfiguredPropertyValue(beanName, propertyName, value);
}
-
+
public List<String> getBeanNamesOfType(Class<?> type) {
return cbl.getBeanNamesOfType(type);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java
index 8c721c9..4edcfc1 100644
--- a/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java
@@ -43,7 +43,7 @@ public class ResourceManagerImpl extends DefaultResourceManager implements BusEx
public ResourceManagerImpl(Bus b) {
super();
setBus(b);
- }
+ }
protected void onFirstResolve() {
super.onFirstResolve();
if (bus != null) {
@@ -62,7 +62,7 @@ public class ResourceManagerImpl extends DefaultResourceManager implements BusEx
registeredResolvers.clear();
registeredResolvers.addAll(resolvers);
}
-
+
@Resource
public final void setBus(Bus b) {
if (bus != b) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
index c3de2a3..591760e 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
@@ -60,24 +60,24 @@ import org.springframework.core.io.UrlResource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
public class BusApplicationContext extends ClassPathXmlApplicationContext {
-
+
private static final String DEFAULT_CXF_CFG_FILE = "META-INF/cxf/cxf.xml";
private static final String DEFAULT_CXF_EXT_CFG_FILE = "classpath*:META-INF/cxf/cxf.extension";
private static final Logger LOG = LogUtils.getL7dLogger(BusApplicationContext.class);
-
+
private NamespaceHandlerResolver nsHandlerResolver;
private boolean includeDefaults;
private String[] cfgFiles;
private URL[] cfgFileURLs;
-
+
public BusApplicationContext(String cf, boolean include) {
this(cf, include, null);
}
public BusApplicationContext(String[] cfs, boolean include) {
this(cfs, include, null);
}
-
+
public BusApplicationContext(URL url, boolean include) {
this(url, include, null);
}
@@ -88,14 +88,14 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
public BusApplicationContext(String cf, boolean include, ApplicationContext parent) {
this(new String[] {cf}, include, parent);
}
-
+
public BusApplicationContext(URL url, boolean include, ApplicationContext parent) {
this(new URL[] {url}, include, parent, null);
- }
+ }
public BusApplicationContext(String[] cf, boolean include, ApplicationContext parent) {
this(cf, include, parent, null);
}
- public BusApplicationContext(String[] cf, boolean include,
+ public BusApplicationContext(String[] cf, boolean include,
ApplicationContext parent, NamespaceHandlerResolver res) {
super(new String[0], false, parent);
cfgFiles = cf;
@@ -107,7 +107,7 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
refresh();
return Boolean.TRUE;
}
-
+
});
} catch (PrivilegedActionException e) {
if (e.getException() instanceof RuntimeException) {
@@ -133,7 +133,7 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
refresh();
return Boolean.TRUE;
}
-
+
});
} catch (PrivilegedActionException e) {
if (e.getException() instanceof RuntimeException) {
@@ -141,17 +141,17 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
}
throw new Fault(e);
}
- }
-
+ }
+
@Override
protected Resource[] getConfigResources() {
List<Resource> resources = new ArrayList<>();
-
+
if (includeDefaults) {
try {
PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(Thread
.currentThread().getContextClassLoader());
-
+
Collections.addAll(resources, resolver.getResources(DEFAULT_CXF_CFG_FILE));
Resource[] exts = resolver.getResources(DEFAULT_CXF_EXT_CFG_FILE);
@@ -169,17 +169,17 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
}
} catch (IOException ex) {
- // ignore
- }
+ // ignore
+ }
}
-
+
boolean usingDefault = false;
if (null == cfgFiles) {
String cfgFile = SystemPropertyAction.getPropertyOrNull(Configurer.USER_CFG_FILE_PROPERTY_NAME);
if (cfgFile != null) {
cfgFiles = new String[] {cfgFile};
}
- }
+ }
if (null == cfgFiles) {
cfgFiles = new String[] {Configurer.DEFAULT_USER_CFG_FILE};
usingDefault = true;
@@ -190,7 +190,7 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
public Boolean run() {
return cpr != null && cpr.exists();
}
-
+
});
if (exists) {
resources.add(cpr);
@@ -200,10 +200,10 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
LogUtils.log(LOG, Level.WARNING, "USER_CFG_FILE_NOT_LOADED", cfgFile);
String message = (new Message("USER_CFG_FILE_NOT_LOADED", LOG, cfgFile)).toString();
throw new ApplicationContextException(message);
- }
+ }
}
}
-
+
if (null != cfgFileURLs) {
for (URL cfgFileURL : cfgFileURLs) {
UrlResource ur = new UrlResource(cfgFileURL);
@@ -213,8 +213,8 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
LogUtils.log(LOG, Level.WARNING, "USER_CFG_FILE_URL_NOT_FOUND_MSG", cfgFileURL);
}
}
- }
-
+ }
+
String sysCfgFileUrl = SystemPropertyAction.getPropertyOrNull(Configurer.USER_CFG_FILE_PROPERTY_URL);
if (null != sysCfgFileUrl) {
try {
@@ -223,16 +223,16 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
resources.add(ur);
} else {
LogUtils.log(LOG, Level.WARNING, "USER_CFG_FILE_URL_NOT_FOUND_MSG", sysCfgFileUrl);
- }
- } catch (MalformedURLException e) {
+ }
+ } catch (MalformedURLException e) {
LogUtils.log(LOG, Level.WARNING, "USER_CFG_FILE_URL_ERROR_MSG", sysCfgFileUrl);
}
}
-
+
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Creating application context with resources: " + resources);
}
-
+
if (0 == resources.size()) {
return null;
}
@@ -240,7 +240,7 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
res = resources.toArray(res);
return res;
}
-
+
public static Resource findResource(final String cfgFile) {
try {
return AccessController.doPrivileged(new PrivilegedAction<Resource>() {
@@ -279,7 +279,7 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
return null;
}
}
-
+
@Override
protected void initBeanDefinitionReader(XmlBeanDefinitionReader reader) {
// Spring always creates a new one of these, which takes a fair amount
@@ -289,16 +289,16 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
nsHandlerResolver = new DefaultNamespaceHandlerResolver();
}
reader.setNamespaceHandlerResolver(nsHandlerResolver);
-
+
String mode = getSpringValidationMode();
if (null != mode) {
reader.setValidationModeName(mode);
}
- reader.setNamespaceAware(true);
-
- setEntityResolvers(reader);
+ reader.setNamespaceAware(true);
+
+ setEntityResolvers(reader);
}
-
+
static String getSpringValidationMode() {
return AccessController.doPrivileged(new PrivilegedAction<String>() {
public String run() {
@@ -310,8 +310,8 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
}
});
}
-
-
+
+
void setEntityResolvers(XmlBeanDefinitionReader reader) {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
reader.setEntityResolver(new BusEntityResolver(cl, new BeansDtdResolver(),
@@ -320,10 +320,10 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
@Override
protected void loadBeanDefinitions(DefaultListableBeanFactory beanFactory) throws IOException {
// Create a new XmlBeanDefinitionReader for the given BeanFactory.
- XmlBeanDefinitionReader beanDefinitionReader =
+ XmlBeanDefinitionReader beanDefinitionReader =
new ControlledValidationXmlBeanDefinitionReader(beanFactory);
beanDefinitionReader.setNamespaceHandlerResolver(nsHandlerResolver);
-
+
// Configure the bean definition reader with this context's
// resource loading environment.
beanDefinitionReader.setResourceLoader(this);
@@ -334,5 +334,5 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
initBeanDefinitionReader(beanDefinitionReader);
loadBeanDefinitions(beanDefinitionReader);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
index 434a851..3f56a8c 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
@@ -32,17 +32,17 @@ import org.springframework.context.ApplicationContextAware;
import org.springframework.core.io.Resource;
@NoJSR250Annotations
-public class BusApplicationContextResourceResolver
+public class BusApplicationContextResourceResolver
implements ResourceResolver, ApplicationContextAware {
-
+
ApplicationContext context;
-
+
public BusApplicationContextResourceResolver() {
}
public BusApplicationContextResourceResolver(ApplicationContext c) {
context = c;
}
-
+
public InputStream getAsStream(String name) {
Resource r = context.getResource(name);
@@ -52,7 +52,7 @@ public class BusApplicationContextResourceResolver
} catch (IOException e) {
//ignore and return null
}
- }
+ }
r = context.getResource("/" + name);
if (r != null && r.exists()) {
try {
@@ -60,12 +60,12 @@ public class BusApplicationContextResourceResolver
} catch (IOException e) {
//ignore and return null
}
- }
+ }
return null;
}
public <T> T resolve(String resourceName, Class<T> resourceType) {
-
+
try {
T resource = null;
if (resourceName == null) {
@@ -98,7 +98,7 @@ public class BusApplicationContextResourceResolver
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
- context = applicationContext;
+ context = applicationContext;
}
}