[exo-jcr-commits] exo-jcr SVN: r5633 - in kernel/trunk: exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl and 20 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Feb 14 09:49:12 EST 2012
Author: andrew.plotnikov
Date: 2012-02-14 09:49:09 -0500 (Tue, 14 Feb 2012)
New Revision: 5633
Modified:
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/AbstractExoLogFactory.java
kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/future/FutureCache.java
kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/LoggingCacheListener.java
kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/CommonsXMLConfigurationPlugin.java
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/ListenerService.java
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/QuartzSheduler.java
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/transaction/impl/jotm/TransactionServiceJotmImpl.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainer.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainerContext.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/PortalContainer.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/PropertyConfigurator.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/NoKernelNamespaceSAXFilter.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableComponentAdapter.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationContainer.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationInvoker.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/AddJVMComponentsToRootContainer.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/web/AbstractHttpServlet.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/web/AbstractHttpSessionListener.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/web/PortalContainerFilter.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ConfigurationMarshallerUtil.java
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/java/org/exoplatform/kernel/demos/mc/InjectedBean.java
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/java/org/exoplatform/kernel/demos/mc/InjectingBean.java
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/src/main/java/org/exoplatform/kernel/it/ExternalMCInjectionTest.java
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/src/main/java/org/exoplatform/tests/JUnitInvokerServlet.java
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCIntConfig.java
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCIntegrationImpl.java
Log:
EXOJCR-1760: Fixed the Blocker/Critical violations and the easiest Major ones raised by eXo Quality Level 1.2
Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java
===================================================================
--- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -36,7 +36,7 @@
public class MimeTypeResolver
{
- protected static Log log = ExoLogger.getLogger("org.exoplatform.commons.utils.MimeTypeResolver");
+ protected static final Log LOG = ExoLogger.getLogger("org.exoplatform.commons.utils.MimeTypeResolver");
static {
SecurityHelper.doPrivilegedAction(new PrivilegedAction<Void>()
Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/AbstractExoLogFactory.java
===================================================================
--- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/AbstractExoLogFactory.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/AbstractExoLogFactory.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -35,7 +35,7 @@
{
/** . */
- private final ConcurrentMap<String, Log> loggers = new ConcurrentHashMap<String, Log>();
+ private static final ConcurrentMap<String, Log> LOGGERS = new ConcurrentHashMap<String, Log>();
/**
* Obtain a specified logger.
@@ -54,11 +54,11 @@
{
throw new IllegalArgumentException("The logger name cannot be null");
}
- Log exoLogger = loggers.get(name);
+ Log exoLogger = LOGGERS.get(name);
if (exoLogger == null)
{
exoLogger = getLogger(name);
- Log phantom = loggers.putIfAbsent(name, exoLogger);
+ Log phantom = LOGGERS.putIfAbsent(name, exoLogger);
if (phantom != null)
{
exoLogger = phantom;
Modified: kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/future/FutureCache.java
===================================================================
--- kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/future/FutureCache.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/future/FutureCache.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -47,7 +47,7 @@
private final ConcurrentMap<K, FutureTask<V>> futureEntries;
/** . */
- private static final Log log = ExoLogger.getLogger("exo.kernel.component.cache.FutureCache");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.cache.FutureCache");
public FutureCache(Loader<K, V, C> loader)
@@ -126,11 +126,11 @@
}
catch (ExecutionException e)
{
- log.error("Computing of resource " + key + " threw an exception", e.getCause());
+ LOG.error("Computing of resource " + key + " threw an exception", e.getCause());
}
catch (Exception e)
{
- log.error("Retrieval of resource " + key + " threw an exception", e);
+ LOG.error("Retrieval of resource " + key + " threw an exception", e);
}
finally
{
Modified: kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/LoggingCacheListener.java
===================================================================
--- kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/LoggingCacheListener.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/LoggingCacheListener.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -34,46 +34,46 @@
public class LoggingCacheListener implements CacheListener
{
- Log log = ExoLogger.getLogger("exo.kernel.component.cache.LoggingCacheListener");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.cache.LoggingCacheListener");
public void onClearCache(CacheListenerContext context) throws Exception
{
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug("Cleared region " + context.getCacheInfo().getName());
+ LOG.debug("Cleared region " + context.getCacheInfo().getName());
}
}
public void onExpire(CacheListenerContext context, Serializable key, Object obj) throws Exception
{
- if (log.isTraceEnabled())
+ if (LOG.isTraceEnabled())
{
- log.trace("Expired entry " + key + " on region " + context.getCacheInfo().getName());
+ LOG.trace("Expired entry " + key + " on region " + context.getCacheInfo().getName());
}
}
public void onGet(CacheListenerContext context, Serializable key, Object obj) throws Exception
{
- if (log.isTraceEnabled())
+ if (LOG.isTraceEnabled())
{
- log.trace("Get entry " + key + " on region " + context.getCacheInfo().getName());
+ LOG.trace("Get entry " + key + " on region " + context.getCacheInfo().getName());
}
}
public void onPut(CacheListenerContext context, Serializable key, Object obj) throws Exception
{
- if (log.isTraceEnabled())
+ if (LOG.isTraceEnabled())
{
- log.trace("Put entry " + key + " region " + context.getCacheInfo().getName());
+ LOG.trace("Put entry " + key + " region " + context.getCacheInfo().getName());
}
- if (log.isWarnEnabled())
+ if (LOG.isWarnEnabled())
{
int maxSize = context.getCacheInfo().getMaxSize();
int size = context.getCacheInfo().getSize();
double treshold = maxSize * 0.95;
if (size >= treshold)
{
- log.warn("region " + context.getCacheInfo().getName() + " is 95% full, consider extending maxSize");
+ LOG.warn("region " + context.getCacheInfo().getName() + " is 95% full, consider extending maxSize");
}
}
@@ -81,9 +81,9 @@
public void onRemove(CacheListenerContext context, Serializable key, Object obj) throws Exception
{
- if (log.isTraceEnabled())
+ if (LOG.isTraceEnabled())
{
- log.trace("Removed entry " + key + " region " + context.getCacheInfo().getName());
+ LOG.trace("Removed entry " + key + " region " + context.getCacheInfo().getName());
}
}
}
Modified: kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/CommonsXMLConfigurationPlugin.java
===================================================================
--- kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/CommonsXMLConfigurationPlugin.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/CommonsXMLConfigurationPlugin.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -46,7 +46,7 @@
// protected Catalog defaultCatalog;
- private static Log log = ExoLogger.getLogger("exo.kernel.component.cache.CommonsXMLConfigurationPlugin");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.cache.CommonsXMLConfigurationPlugin");
public CommonsXMLConfigurationPlugin(InitParams params, ConfigurationManager configurationManager) throws Exception
{
@@ -70,7 +70,7 @@
res = configurationManager.getResource(path);
if (res == null)
throw new Exception("Resource not found " + path);
- log.info("Catalog configuration found at " + res);
+ LOG.info("Catalog configuration found at " + res);
final URL fRes = res;
SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Void>()
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/ListenerService.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/ListenerService.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/ListenerService.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -46,7 +46,7 @@
*/
private final Map<String, List<Listener>> listeners_;
- private static final Log log = ExoLogger.getLogger("exo.kernel.component.common.ListenerService");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.common.ListenerService");
/**
* Construct a listener service.
@@ -151,9 +151,9 @@
return;
for (Listener<S, D> listener : list)
{
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug("broadcasting event " + name + " on " + listener.getName());
+ LOG.debug("broadcasting event " + name + " on " + listener.getName());
}
try
@@ -163,8 +163,8 @@
catch (Exception e)
{
// log exception and keep broadcast events
- log.error("Exception on broadcasting events occures: " + e.getMessage(), e.getCause());
- log.info("Exception occures but keep broadcast events.");
+ LOG.error("Exception on broadcasting events occures: " + e.getMessage(), e.getCause());
+ LOG.info("Exception occures but keep broadcast events.");
}
}
}
@@ -197,8 +197,8 @@
catch (Exception e)
{
// log exception and keep broadcast events
- log.error("Exception on broadcasting events occures: " + e.getMessage(), e.getCause());
- log.info("Exception occures but keep broadcast events.");
+ LOG.error("Exception on broadcasting events occures: " + e.getMessage(), e.getCause());
+ LOG.info("Exception occures but keep broadcast events.");
}
}
}
@@ -275,7 +275,7 @@
{
// Do not throw exception. Event is asynchronous so just report error.
// Must say that exception will be ignored even in synchronous events.
- log.error("Exception on broadcasting events occures: " + e.getMessage(), e.getCause());
+ LOG.error("Exception on broadcasting events occures: " + e.getMessage(), e.getCause());
}
}
}
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -69,7 +69,7 @@
public static final String DEFAULT_BINDING_STORE_PATH = PrivilegedSystemHelper.getProperty("java.io.tmpdir")
+ File.separator + "bind-references.xml";
- private static Log LOG = ExoLogger.getLogger("exo.kernel.component.common.InitialContextInitializer");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.common.InitialContextInitializer");
private List<BindReferencePlugin> bindReferencesPlugins;
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -62,7 +62,7 @@
public class JobSchedulerServiceImpl implements JobSchedulerService, Startable
{
- private static final Log log = ExoLogger.getLogger("exo.kernel.component.common.JobSchedulerServiceImpl");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.common.JobSchedulerServiceImpl");
static final String STANDALONE_CONTAINER_NAME = "$Standalone";
private final Scheduler scheduler_;
@@ -409,7 +409,7 @@
}
catch (SchedulerException e)
{
- log.error("Could not suspend the scheduler", e);
+ LOG.error("Could not suspend the scheduler", e);
}
return false;
}
@@ -425,7 +425,7 @@
}
catch (SchedulerException e)
{
- log.error("Could not resume the scheduler", e);
+ LOG.error("Could not resume the scheduler", e);
}
return false;
}
@@ -441,7 +441,7 @@
}
catch (Exception e)
{
- log.warn("Could not remove the GlobalJobListener " + JobEnvironmentConfigListener.NAME, e);
+ LOG.warn("Could not remove the GlobalJobListener " + JobEnvironmentConfigListener.NAME, e);
}
}
@@ -463,7 +463,7 @@
}
catch (Exception ex)
{
- log.warn("Could not interrupt all the current jobs properly", ex);
+ LOG.warn("Could not interrupt all the current jobs properly", ex);
}
}
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/QuartzSheduler.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/QuartzSheduler.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/QuartzSheduler.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -41,7 +41,7 @@
*/
public class QuartzSheduler implements Startable
{
- private static final Log log = ExoLogger.getLogger("exo.kernel.component.common.QuartzSheduler");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.common.QuartzSheduler");
private final Scheduler scheduler_;
@@ -108,7 +108,7 @@
}
catch (SchedulerException ex)
{
- log.warn("Could not shutdown the scheduler", ex);
+ LOG.warn("Could not shutdown the scheduler", ex);
}
}
}
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/transaction/impl/jotm/TransactionServiceJotmImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/transaction/impl/jotm/TransactionServiceJotmImpl.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/transaction/impl/jotm/TransactionServiceJotmImpl.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -46,7 +46,7 @@
public class TransactionServiceJotmImpl extends AbstractTransactionService
{
- protected static Log log = ExoLogger.getLogger("exo.kernel.component.common.TransactionServiceJotmImpl");
+ protected static final Log LOG = ExoLogger.getLogger("exo.kernel.component.common.TransactionServiceJotmImpl");
private final int defaultTimeout;
@@ -112,7 +112,7 @@
}
else
{
- log.info("Use externally initialized JOTM: " + current);
+ LOG.info("Use externally initialized JOTM: " + current);
}
return current;
}
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainer.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainer.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -121,7 +121,7 @@
return Collections.unmodifiableSet(profiles);
}
- static Log log = ExoLogger.getLogger("exo.kernel.container.ExoContainer");
+ protected static final Log LOG = ExoLogger.getLogger("exo.kernel.container.ExoContainer");
private Map<String, ComponentLifecyclePlugin> componentLifecylePlugin_ =
new HashMap<String, ComponentLifecyclePlugin>();
@@ -217,7 +217,7 @@
}
catch (Exception e)
{
- log.warn("An error occurs with the ContainerLifecyclePlugin '" + getPluginName(plugin) + "'", e);
+ LOG.warn("An error occurs with the ContainerLifecyclePlugin '" + getPluginName(plugin) + "'", e);
}
}
}
@@ -300,7 +300,7 @@
}
catch (Exception e)
{
- log.warn("An error occurs with the ContainerLifecyclePlugin '" + getPluginName(plugin) + "'", e);
+ LOG.warn("An error occurs with the ContainerLifecyclePlugin '" + getPluginName(plugin) + "'", e);
}
}
}
@@ -323,7 +323,7 @@
}
catch (Exception e)
{
- log.warn("An error occurs with the ContainerLifecyclePlugin '" + getPluginName(plugin) + "'", e);
+ LOG.warn("An error occurs with the ContainerLifecyclePlugin '" + getPluginName(plugin) + "'", e);
}
}
}
@@ -346,7 +346,7 @@
}
catch (Exception e)
{
- log.warn("An error occurs with the ContainerLifecyclePlugin '" + getPluginName(plugin) + "'", e);
+ LOG.warn("An error occurs with the ContainerLifecyclePlugin '" + getPluginName(plugin) + "'", e);
}
}
}
@@ -378,8 +378,8 @@
public <T> T createComponent(Class<T> clazz, InitParams params) throws Exception
{
- if (log.isDebugEnabled())
- log.debug(clazz.getName() + " " + ((params != null) ? params : "") + " added to " + getContext().getName());
+ if (LOG.isDebugEnabled())
+ LOG.debug(clazz.getName() + " " + ((params != null) ? params : "") + " added to " + getContext().getName());
Constructor<?>[] constructors = new Constructor<?>[0];
try
{
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainerContext.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainerContext.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainerContext.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -45,7 +45,7 @@
private String name;
- private static final Log log = ExoLogger.getLogger("exo.kernel.container.ExoContainerContext");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.ExoContainerContext");
public ExoContainerContext(ExoContainer container)
{
@@ -143,7 +143,7 @@
if (topContainer != null && cont != null)
throw new IllegalStateException("Two top level containers created, but must be only one.");
- log.info("Set the top container in its context");
+ LOG.info("Set the top container in its context");
topContainer = cont;
}
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/PortalContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/PortalContainer.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/PortalContainer.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -317,13 +317,13 @@
Configuration conf = getConfiguration();
if (conf == null)
{
- log.warn("The configuration of the PortalContainer could not be found");
+ LOG.warn("The configuration of the PortalContainer could not be found");
return null;
}
Configuration result = Configuration.merge(((ExoContainer)parent).getConfiguration(), conf);
if (result == null)
{
- log.warn("The configurations could not be merged");
+ LOG.warn("The configurations could not be merged");
return null;
}
return result.toXML();
@@ -494,7 +494,7 @@
{
if (PropertyManager.isDevelopping())
{
- log.warn("The Servlet Context '" + context.getServletContextName() + "' has not been registered"
+ LOG.warn("The Servlet Context '" + context.getServletContextName() + "' has not been registered"
+ " has a dependency of any PortalContainerDefinitions.");
}
return null;
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/PropertyConfigurator.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/PropertyConfigurator.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/PropertyConfigurator.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -60,7 +60,7 @@
{
/** The logger. */
- private final Log log = ExoLogger.getExoLogger(PropertyConfigurator.class);
+ private static final Log LOG = ExoLogger.getExoLogger(PropertyConfigurator.class);
public PropertyConfigurator(ConfigurationManager confManager)
{
@@ -75,20 +75,20 @@
PropertiesParam propertiesParam = params.getPropertiesParam("properties");
if (propertiesParam != null)
{
- log.debug("Going to initialize properties from init param");
+ LOG.debug("Going to initialize properties from init param");
for (Iterator<Property> i = propertiesParam.getPropertyIterator();i.hasNext();)
{
Property property = i.next();
String name = property.getName();
String value = property.getValue();
- log.debug("Adding property from init param " + name + " = " + value);
+ LOG.debug("Adding property from init param " + name + " = " + value);
PropertyManager.setProperty(name, value);
}
}
ValueParam pathParam = params.getValueParam("properties.url");
if (pathParam != null)
{
- log.debug("Using file path " + path + " found from configuration");
+ LOG.debug("Using file path " + path + " found from configuration");
path = pathParam.getValue();
}
}
@@ -97,14 +97,14 @@
String systemPath = PropertyManager.getProperty(PropertyManager.PROPERTIES_URL);
if (systemPath != null)
{
- log.debug("Using file path " + path + " found from system properties");
+ LOG.debug("Using file path " + path + " found from system properties");
path = systemPath;
}
//
if (path != null)
{
- log.debug("Found property file path " + path);
+ LOG.debug("Found property file path " + path);
try
{
URL url = confManager.getURL(path);
@@ -121,7 +121,7 @@
}
catch (Exception e)
{
- log.error("Cannot load property file " + path, e);
+ LOG.error("Cannot load property file " + path, e);
}
}
}
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -112,7 +112,7 @@
profiles.addAll(ExoContainer.getProfiles());
// Lof the active profiles
- log.info("Active profiles " + profiles);
+ LOG.info("Active profiles " + profiles);
//
SecurityHelper.doPrivilegedAction(new PrivilegedAction<Void>()
@@ -240,7 +240,7 @@
{
if (PropertyManager.isDevelopping())
{
- log.info("We assume that the ServletContext '" + context.getServletContextName()
+ LOG.info("We assume that the ServletContext '" + context.getServletContextName()
+ "' is not a portal since no portal container definition with the same name has been"
+ " registered to the component PortalContainerConfig. The related portal container"
+ " will be declared as disabled.");
@@ -301,7 +301,7 @@
if (config.isPortalContainerName(portalContainerName))
{
// Unregister name of portal container that doesn't exist
- log.warn("The portal container '" + portalContainerName + "' doesn't not exist or"
+ LOG.warn("The portal container '" + portalContainerName + "' doesn't not exist or"
+ " it has not yet been registered, please check your PortalContainerDefinitions and "
+ "the loading order.");
config.unregisterPortalContainerName(portalContainerName);
@@ -323,7 +323,7 @@
final String portalContainerName = context.getServletContextName();
try
{
- log.info("Trying to create the portal container '" + portalContainerName + "'");
+ LOG.info("Trying to create the portal container '" + portalContainerName + "'");
PortalContainer pcontainer = new PortalContainer(this, context);
PortalContainer.setInstance(pcontainer);
executeInitTasks(pcontainer, PortalContainerPreInitTask.TYPE);
@@ -339,7 +339,7 @@
}
catch (Exception ex)
{
- log.error("Cannot add configuration conf/portal/configuration.xml. ServletContext: " + context, ex);
+ LOG.error("Cannot add configuration conf/portal/configuration.xml. ServletContext: " + context, ex);
}
// Add configuration that depends on the environment
@@ -359,7 +359,7 @@
}
catch (Exception ex)
{
- log.error("Cannot add configuration " + uri + ". ServletContext: " + context, ex);
+ LOG.error("Cannot add configuration " + uri + ". ServletContext: " + context, ex);
}
// add configs from web apps
@@ -373,7 +373,7 @@
}
catch (Exception ex)
{
- log.error("Cannot add configuration war:/conf/configuration.xml. ServletContext: " + ctx, ex);
+ LOG.error("Cannot add configuration war:/conf/configuration.xml. ServletContext: " + ctx, ex);
}
}
@@ -390,7 +390,7 @@
}
catch (Exception ex)
{
- log.error("Cannot add configuration " + overrideConfig + ". ServletContext: " + context, ex);
+ LOG.error("Cannot add configuration " + overrideConfig + ". ServletContext: " + context, ex);
}
cService.processRemoveConfiguration();
@@ -404,11 +404,11 @@
//
executeInitTasks(pcontainer, PortalContainerPostInitTask.TYPE);
executeInitTasks(pcontainer, PortalContainerPostCreateTask.TYPE);
- log.info("The portal container '" + portalContainerName + "' has been created successfully");
+ LOG.info("The portal container '" + portalContainerName + "' has been created successfully");
}
catch (Exception ex)
{
- log.error("Cannot create the portal container '" + portalContainerName + "' . ServletContext: " + context, ex);
+ LOG.error("Cannot create the portal container '" + portalContainerName + "' . ServletContext: " + context, ex);
}
finally
{
@@ -423,7 +423,7 @@
}
catch (Exception e)
{
- log.warn("An error occured while cleaning the ThreadLocal", e);
+ LOG.warn("An error occured while cleaning the ThreadLocal", e);
}
}
}
@@ -480,7 +480,7 @@
}
catch (Exception e)
{
- log.error("Could not build root container", e);
+ LOG.error("Could not build root container", e);
// The logger is not necessary configured so we have to use the standard
// output stream
LOG.error(e.getLocalizedMessage(), e);
@@ -513,13 +513,13 @@
booting = true;
try
{
- log.info("Building root container");
+ LOG.info("Building root container");
long time = -System.currentTimeMillis();
result = buildRootContainer();
if (result != null)
{
time += System.currentTimeMillis();
- log.info("Root container is built (build time " + time + "ms)");
+ LOG.info("Root container is built (build time " + time + "ms)");
singleton_ = result;
SecurityHelper.doPrivilegedAction(new PrivilegedAction<Void>()
{
@@ -529,11 +529,11 @@
return null;
}
});
- log.info("Root container booted");
+ LOG.info("Root container booted");
}
else
{
- log.error("Failed to boot root container");
+ LOG.error("Failed to boot root container");
}
}
finally
@@ -563,7 +563,7 @@
Configuration config = getConfiguration();
if (config == null)
{
- log.warn("The configuration of the RootContainer could not be found");
+ LOG.warn("The configuration of the RootContainer could not be found");
return null;
}
return config.toXML();
@@ -599,8 +599,8 @@
final PortalContainer container = getPortalContainer(portalContainer);
if (!task.alreadyExists(container))
{
- if (log.isDebugEnabled())
- log.debug("The portal container '" + portalContainer
+ if (LOG.isDebugEnabled())
+ LOG.debug("The portal container '" + portalContainer
+ "' has not yet been initialized, thus the task can be added");
ConcurrentMap<String, Queue<PortalContainerInitTaskContext>> queues = initTasks.get(portalContainer);
if (queues == null)
@@ -639,8 +639,8 @@
}
else
{
- if (log.isDebugEnabled())
- log.debug("The portal container '" + portalContainer
+ if (LOG.isDebugEnabled())
+ LOG.debug("The portal container '" + portalContainer
+ "' has already been initialized, thus we call onAlreadyExists");
PortalContainer oldPortalContainer = PortalContainer.getInstanceIfPresent();
try
@@ -673,8 +673,8 @@
{
return;
}
- if (log.isDebugEnabled())
- log.debug("Start launching the " + type + " tasks of the portal container '" + portalContainer + "'");
+ if (LOG.isDebugEnabled())
+ LOG.debug("Start launching the " + type + " tasks of the portal container '" + portalContainer + "'");
// Keep the old ClassLoader
final ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
PortalContainerInitTaskContext context;
@@ -702,8 +702,8 @@
{
initTasks.remove(portalContainerName);
}
- if (log.isDebugEnabled())
- log.debug("End launching the " + type + " tasks of the portal container '" + portalContainer + "'");
+ if (LOG.isDebugEnabled())
+ LOG.debug("End launching the " + type + " tasks of the portal container '" + portalContainer + "'");
}
static class ShutdownThread extends Thread
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -320,7 +320,7 @@
Configuration config = getConfiguration();
if (config == null)
{
- log.warn("The configuration of the StandaloneContainer could not be found");
+ LOG.warn("The configuration of the StandaloneContainer could not be found");
return null;
}
return config.toXML();
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -51,7 +51,7 @@
{
final static public String WAR_CONF_LOCATION = "/WEB-INF";
- private static final Log log = ExoLogger.getLogger("exo.kernel.container.ConfigurationManagerImpl");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.ConfigurationManagerImpl");
protected Configuration configurations_;
@@ -137,7 +137,7 @@
private void addConfiguration(ServletContext context, URL url) throws Exception
{
if (LOG_DEBUG)
- log.info("Add configuration " + url);
+ LOG.info("Add configuration " + url);
if (url == null)
return;
try
@@ -174,7 +174,7 @@
}
catch (Exception ex)
{
- log.error("Cannot process the configuration " + currentURL.get(), ex);
+ LOG.error("Cannot process the configuration " + currentURL.get(), ex);
}
finally
{
@@ -219,7 +219,7 @@
if (urlObject != null)
{
if (LOG_DEBUG)
- log.info(prefix + "import " + urlObject);
+ LOG.info(prefix + "import " + urlObject);
// Set the URL of imported file
currentURL.set(urlObject);
conf = unmarshaller.unmarshall(urlObject);
@@ -228,7 +228,7 @@
}
else
{
- log.warn("Couldn't process the URL for " + uri + " configuration file ignored ");
+ LOG.warn("Couldn't process the URL for " + uri + " configuration file ignored ");
}
}
}
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/NoKernelNamespaceSAXFilter.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/NoKernelNamespaceSAXFilter.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/NoKernelNamespaceSAXFilter.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -41,7 +41,7 @@
{
/** . */
- private static final Log log = ExoLogger.getExoLogger(NoKernelNamespaceSAXFilter.class);
+ private static final Log LOG = ExoLogger.getExoLogger(NoKernelNamespaceSAXFilter.class);
/** . */
private static final String XSI_URI = "http://www.w3.org/2001/XMLSchema-instance";
@@ -78,14 +78,14 @@
if (Namespaces.isKernelNamespace(uri) || XSI_URI.equals(uri))
{
blackListedPrefixes.add(prefix);
- if (log.isTraceEnabled())
- log.trace("Black listing prefix " + prefix + " with uri " + uri);
+ if (LOG.isTraceEnabled())
+ LOG.trace("Black listing prefix " + prefix + " with uri " + uri);
}
else
{
contentHandler.startPrefixMapping(prefix, uri);
- if (log.isTraceEnabled())
- log.trace("Start prefix mapping " + prefix + " with uri " + uri);
+ if (LOG.isTraceEnabled())
+ LOG.trace("Start prefix mapping " + prefix + " with uri " + uri);
}
}
@@ -93,14 +93,14 @@
{
if (!blackListedPrefixes.remove(prefix))
{
- if (log.isTraceEnabled())
- log.trace("Ending prefix mapping " + prefix);
+ if (LOG.isTraceEnabled())
+ LOG.trace("Ending prefix mapping " + prefix);
contentHandler.endPrefixMapping(prefix);
}
else
{
- if (log.isTraceEnabled())
- log.trace("Removed prefix mapping " + prefix + " from black list ");
+ if (LOG.isTraceEnabled())
+ LOG.trace("Removed prefix mapping " + prefix + " from black list ");
}
}
@@ -113,14 +113,14 @@
if ((attQName.equals("xmlns")) && blackListedPrefixes.contains(""))
{
// Skip
- if (log.isTraceEnabled())
- log.trace("Skipping black listed xmlns attribute");
+ if (LOG.isTraceEnabled())
+ LOG.trace("Skipping black listed xmlns attribute");
}
else if (attQName.startsWith("xmlns:") && blackListedPrefixes.contains(attQName.substring(6)))
{
// Skip
- if (log.isTraceEnabled())
- log.trace("Skipping black listed " + attQName + " attribute");
+ if (LOG.isTraceEnabled())
+ LOG.trace("Skipping black listed " + attQName + " attribute");
}
else
{
@@ -133,14 +133,14 @@
if (XSI_URI.equals(attURI))
{
// Skip
- if (log.isTraceEnabled())
- log.trace("Skipping XSI " + attQName + " attribute");
+ if (LOG.isTraceEnabled())
+ LOG.trace("Skipping XSI " + attQName + " attribute");
continue;
}
else if (Namespaces.isKernelNamespace(attURI))
{
- if (log.isTraceEnabled())
- log.trace("Requalifying prefixed attribute " + attQName + " attribute to " + localName);
+ if (LOG.isTraceEnabled())
+ LOG.trace("Requalifying prefixed attribute " + attQName + " attribute to " + localName);
attURI = null;
attQName = localName;
}
@@ -153,8 +153,8 @@
//
if (Namespaces.isKernelNamespace(uri))
{
- if (log.isTraceEnabled())
- log.trace("Requalifying active profile " + qName + " start element to " + localName);
+ if (LOG.isTraceEnabled())
+ LOG.trace("Requalifying active profile " + qName + " start element to " + localName);
qName = localName;
uri = null;
}
@@ -167,15 +167,15 @@
{
if (Namespaces.isKernelNamespace(uri))
{
- if (log.isTraceEnabled())
- log.trace("Requalifying " + qName + " end element");
+ if (LOG.isTraceEnabled())
+ LOG.trace("Requalifying " + qName + " end element");
qName = localName;
uri = null;
}
//
- if (log.isTraceEnabled())
- log.trace("Propagatting " + qName + " end element");
+ if (LOG.isTraceEnabled())
+ LOG.trace("Propagatting " + qName + " end element");
contentHandler.endElement(uri, localName, qName);
}
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -64,7 +64,7 @@
/**
* The logger
*/
- private static final Log log = ExoLogger.getLogger("exo.kernel.container.PortalContainerConfig");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.PortalContainerConfig");
/**
* The name of the setting corresponding to the portal container name
@@ -237,7 +237,7 @@
else
{
// The nested object is not of the right type, thus it will be ignored
- log.warn("The object parameter 'default.portal.definition' should be of type "
+ LOG.warn("The object parameter 'default.portal.definition' should be of type "
+ PortalContainerDefinition.class);
}
}
@@ -384,7 +384,7 @@
{
if (PropertyManager.isDevelopping())
{
- log.info("The portal container '" + name + "' will be disabled");
+ LOG.info("The portal container '" + name + "' will be disabled");
}
final Set<String> lPortalContainerNames = new HashSet<String>(portalContainerNamesDisabled.size() + 1);
lPortalContainerNames.add(name);
@@ -561,14 +561,14 @@
// the webapp is ignored since it has not been registered in any portal container dependency list
if (PropertyManager.isDevelopping())
{
- log.warn("The context '" + contextName + "' has not been added as " +
+ LOG.warn("The context '" + contextName + "' has not been added as " +
"dependency of any portal containers");
}
return null;
}
if (PropertyManager.isDevelopping())
{
- log.debug("The context '" + contextName + "' has not been added as " +
+ LOG.debug("The context '" + contextName + "' has not been added as " +
"dependency of any portal containers");
}
// by default we will return the default portal container
@@ -702,7 +702,7 @@
String name = def.getName();
if (name == null || (name = name.trim()).length() == 0)
{
- log.warn("A PortalContainerDefinition cannot have an empty name");
+ LOG.warn("A PortalContainerDefinition cannot have an empty name");
continue;
}
else
@@ -997,14 +997,14 @@
url = file.toURI().toURL();
if (ConfigurationManager.LOG_DEBUG)
{
- log.info("The external settings could be found in the directory ${exo-conf}/portal, "
+ LOG.info("The external settings could be found in the directory ${exo-conf}/portal, "
+ "it will be used as external settings of the "
+ (isPath4DefaultPCD ? "default portal container" : "portal container '" + def.getName() + "'"));
}
}
else if (ConfigurationManager.LOG_DEBUG)
{
- log.info("No external settings could be found in the directory ${exo-conf}/portal for the "
+ LOG.info("No external settings could be found in the directory ${exo-conf}/portal for the "
+ (isPath4DefaultPCD ? "default portal container" : "portal container '" + def.getName() + "'"));
}
}
@@ -1014,7 +1014,7 @@
url = cm.getURL(path);
if (ConfigurationManager.LOG_DEBUG)
{
- log.info("Trying to retrieve the external settings from the url '" + url
+ LOG.info("Trying to retrieve the external settings from the url '" + url
+ "', it will be used as external settings of the "
+ (isPath4DefaultPCD ? "default portal container" : "portal container '" + def.getName() + "'"));
}
@@ -1024,7 +1024,7 @@
}
catch (Exception e)
{
- log.error("Cannot load property file " + path, e);
+ LOG.error("Cannot load property file " + path, e);
}
return null;
}
@@ -1092,9 +1092,9 @@
}
catch (Exception e)
{
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug(
+ LOG.debug(
"The static method valueOf(String) cannot be found for the class " + oldValue.getClass(), e);
}
}
@@ -1113,7 +1113,7 @@
}
catch (Exception e)
{
- log.error("Cannot convert the value '" + propertyValue + "' to an Object of type "
+ LOG.error("Cannot convert the value '" + propertyValue + "' to an Object of type "
+ oldValue.getClass(), e);
// we ignore invalid value
continue;
@@ -1202,7 +1202,7 @@
{
if (PropertyManager.isDevelopping())
{
- log.warn("No portal container definition has been registered, the old behavior is" +
+ LOG.warn("No portal container definition has been registered, the old behavior is" +
" then expected so you cannot disable any portal container. The list of" +
" portal containers to disable will be ignored");
}
@@ -1235,7 +1235,7 @@
}
catch (Exception e)
{
- log.warn("Cannot apply the change " + change, e);
+ LOG.warn("Cannot apply the change " + change, e);
}
}
}
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -52,7 +52,7 @@
private volatile Object instance_;
- private Log log = ExoLogger.getLogger("exo.kernel.container.MX4JComponentAdapter");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.MX4JComponentAdapter");
public MX4JComponentAdapter(Object key, Class implementation)
{
@@ -102,7 +102,7 @@
}
exocontainer.addComponentToCtx(getComponentKey(), instance);
if (debug)
- log.debug("==> create component : " + instance_);
+ LOG.debug("==> create component : " + instance_);
if (component != null && component.getComponentPlugins() != null)
{
addComponentPlugin(debug, instance, component.getComponentPlugins(), exocontainer);
@@ -159,7 +159,7 @@
final Method m = getSetMethod(clazz, plugin.getSetMethod(), pluginClass);
if (m == null)
{
- log.error("Cannot find the method '" + plugin.getSetMethod() + "' that has only one parameter of type '"
+ LOG.error("Cannot find the method '" + plugin.getSetMethod() + "' that has only one parameter of type '"
+ pluginClass.getName() + "' in the class '" + clazz.getName() + "'.");
continue;
}
@@ -175,14 +175,15 @@
});
if (debug)
- log.debug("==> add component plugin: " + cplugin);
+ LOG.debug("==> add component plugin: " + cplugin);
cplugin.setName(plugin.getName());
cplugin.setDescription(plugin.getDescription());
}
catch (Exception ex)
{
- log.error("Failed to instanciate plugin " + plugin.getName() + " for component " + component + ": "
+ LOG.error(
+ "Failed to instanciate plugin " + plugin.getName() + " for component " + component + ": "
+ ex.getMessage(), ex);
}
}
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableComponentAdapter.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableComponentAdapter.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableComponentAdapter.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -35,7 +35,7 @@
{
/** . */
- private Log log = ExoLogger.getLogger("exo.kernel.container.ManageableComponentAdapter");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.ManageableComponentAdapter");
/** . */
private ComponentAdapter delegate;
@@ -76,7 +76,7 @@
if (container.managementContext != null)
{
// Registry the instance against the management context
- log.debug("==> add " + instance + " to a mbean server");
+ LOG.debug("==> add " + instance + " to a mbean server");
container.managementContext.register(instance);
// Register if it is a management provider
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationContainer.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationContainer.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -38,7 +38,7 @@
/**
* Logger
*/
- private static Log log = ExoLogger.getLogger("exo.kernel.container.MCIntegrationContainer");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.MCIntegrationContainer");
/**
* Constructor that exposes super constructor.
@@ -99,7 +99,8 @@
}
catch(Exception ignored)
{
- log.debug("MC integration failed - maybe not supported in this environment (component: "
+ LOG.debug(
+ "MC integration failed - maybe not supported in this environment (component: "
+ componentAdapter.getComponentKey() + ")", ignored);
}
}
@@ -122,7 +123,8 @@
}
catch (Exception ignored)
{
- log.warn("MC integration failed - maybe not supported in this environment (component: "
+ LOG.warn(
+ "MC integration failed - maybe not supported in this environment (component: "
+ componentAdapter.getComponentKey() + ")", ignored);
}
return false;
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationInvoker.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationInvoker.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationInvoker.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -25,9 +25,10 @@
import org.exoplatform.services.log.Log;
import org.picocontainer.ComponentAdapter;
-import javax.servlet.ServletContext;
import java.lang.reflect.Method;
+import javax.servlet.ServletContext;
+
/**
* This class performs a loosely coupled integration to mc-integration logic.
* MC integration provides the ability to inject JBoss MC configured beans into
@@ -43,7 +44,7 @@
/**
* Logger
*/
- private static Log log = ExoLogger.getLogger("exo.kernel.container.MCIntegrationInvoker");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.MCIntegrationInvoker");
/**
* Reference to actual implementation of mc-integration - the one with hard dependencies on JBoss MC Kernel.
@@ -127,7 +128,7 @@
catch (ClassNotFoundException ignored)
{
permFailure = true;
- log.debug("MC integration not available in this environment (missing class: "
+ LOG.debug("MC integration not available in this environment (missing class: "
+ ignored.getMessage() + ")");
return null;
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/AddJVMComponentsToRootContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/AddJVMComponentsToRootContainer.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/AddJVMComponentsToRootContainer.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -34,7 +34,7 @@
public class AddJVMComponentsToRootContainer extends BaseContainerLifecyclePlugin
{
- private static final Log log = ExoLogger.getLogger("exo.kernel.container.AddJVMComponentsToRootContainer");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.AddJVMComponentsToRootContainer");
public void initContainer(ExoContainer container)
{
@@ -57,9 +57,9 @@
{
if (mxComponent != null)
{
- log.debug("Attempt to register mx component " + mxComponent);
+ LOG.debug("Attempt to register mx component " + mxComponent);
container.registerComponentInstance(mxComponent);
- log.debug("Mx component " + mxComponent + " registered");
+ LOG.debug("Mx component " + mxComponent + " registered");
}
}
@@ -67,9 +67,9 @@
{
if (mxComponent != null)
{
- log.debug("Attempt to register mx component " + mxComponent + " with key " + mxKey);
+ LOG.debug("Attempt to register mx component " + mxComponent + " with key " + mxKey);
container.registerComponentInstance(mxKey, mxComponent);
- log.debug("Mx component " + mxComponent + " registered");
+ LOG.debug("Mx component " + mxComponent + " registered");
}
}
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/web/AbstractHttpServlet.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/web/AbstractHttpServlet.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/web/AbstractHttpServlet.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -46,7 +46,7 @@
/**
* The logger
*/
- private static final Log log = ExoLogger.getLogger("exo.kernel.container.AbstractHttpServlet");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.AbstractHttpServlet");
/**
* Serial Version ID.
@@ -194,7 +194,7 @@
{
if (PropertyManager.isDevelopping())
{
- log.info("The portal environment could not be set for the webapp '"
+ LOG.info("The portal environment could not be set for the webapp '"
+ config.getServletContext().getServletContextName()
+ "' because this servlet context has not been defined as a "
+ "dependency of any portal container or it is a disabled portal"
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/web/AbstractHttpSessionListener.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/web/AbstractHttpSessionListener.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/web/AbstractHttpSessionListener.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -40,7 +40,7 @@
/**
* The logger
*/
- private static final Log log = ExoLogger.getLogger("exo.kernel.container.AbstractHttpSessionListener");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.AbstractHttpSessionListener");
/**
* @see javax.servlet.http.HttpSessionListener#sessionCreated(javax.servlet.http.HttpSessionEvent)
@@ -82,7 +82,7 @@
{
if (PropertyManager.isDevelopping())
{
- log.info("The portal environment could not be set for the webapp '" + ctxName
+ LOG.info("The portal environment could not be set for the webapp '" + ctxName
+ "' because this servlet context has not been defined as a "
+ "dependency of any portal container or it is a disabled portal"
+ " container, the sessionCreated event will be ignored");
@@ -152,7 +152,7 @@
{
if (PropertyManager.isDevelopping())
{
- log.info("The portal environment could not be set for the webapp '" + ctxName
+ LOG.info("The portal environment could not be set for the webapp '" + ctxName
+ "' because this servlet context has not been defined as a "
+ "dependency of any portal container or it is a disabled portal"
+ " container, the sessionDestroyed event will be ignored");
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/web/PortalContainerFilter.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/web/PortalContainerFilter.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/web/PortalContainerFilter.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -44,7 +44,7 @@
/**
* The logger
*/
- private static final Log log = ExoLogger.getLogger("exo.kernel.container.PortalContainerFilter");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.PortalContainerFilter");
/**
* @see javax.servlet.Filter#destroy()
@@ -81,7 +81,7 @@
{
if (PropertyManager.isDevelopping())
{
- log.info("The portal container corresponding to the webapp '" + servletContextName
+ LOG.info("The portal container corresponding to the webapp '" + servletContextName
+ "' is disabled, thus the request is cancelled: target URI was "
+ ((HttpServletRequest)request).getRequestURI());
}
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ConfigurationMarshallerUtil.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ConfigurationMarshallerUtil.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ConfigurationMarshallerUtil.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -38,7 +38,7 @@
/**
* The logger
*/
- private static final Log log = ExoLogger.getLogger("exo.kernel.container.ConfigurationMarshallerUtil");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.ConfigurationMarshallerUtil");
/**
* This method adds the given {@link URL} as comment to XML content.
@@ -51,7 +51,7 @@
}
catch (IOException e)
{
- log.warn("Could not add the source into the XML document", e);
+ LOG.warn("Could not add the source into the XML document", e);
}
}
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCIntConfig.java
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCIntConfig.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCIntConfig.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -78,7 +78,7 @@
/**
* Logger.
*/
- private static final Log log = ExoLogger.getLogger("exo.kernel.mc-int.MCIntConfig");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.mc-int.MCIntConfig");
/**
* Configuration for <em>beans</em> specified with <em>name</em>.
@@ -126,7 +126,7 @@
}
if (data != null)
{
- log.warn("Overriding existing mc-int-beans configuration for bean: " + data.data
+ LOG.warn("Overriding existing mc-int-beans configuration for bean: " + data.data
+ " from " + data.deployment.getName() + " with one from " + deployment.getName());
}
addConf(new DeploymentData(deployment, mdata));
@@ -221,10 +221,10 @@
*/
private KernelDeployment parseConfigURL(UnmarshallerFactory factory, MutableSchemaResolver resolver, URL url)
{
- final boolean trace = log.isTraceEnabled();
+ final boolean trace = LOG.isTraceEnabled();
if (trace)
{
- log.trace("Parsing " + url);
+ LOG.trace("Parsing " + url);
}
long start = System.currentTimeMillis();
@@ -248,7 +248,7 @@
if (trace)
{
long now = System.currentTimeMillis();
- log.trace("Parsing " + url + " took " + (now - start) + " milliseconds");
+ LOG.trace("Parsing " + url + " took " + (now - start) + " milliseconds");
}
return deployment;
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCIntegrationImpl.java
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCIntegrationImpl.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCIntegrationImpl.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -32,10 +32,11 @@
import org.jboss.mc.servlet.vdf.api.VDFThreadLocalUtils;
import org.picocontainer.ComponentAdapter;
-import javax.servlet.ServletContext;
import java.lang.annotation.Annotation;
import java.util.Set;
+import javax.servlet.ServletContext;
+
/**
* Implementation of MCIntegration that contains hard dependencies on JBoss Microcontainer.
*
@@ -49,7 +50,7 @@
/**
* Logger
*/
- private static Log log = ExoLogger.getLogger("exo.kernel.mc-int.MCIntegrationImpl");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.mc-int.MCIntegrationImpl");
/**
* A singleton MCIntegration implementation
@@ -103,7 +104,7 @@
}
else
{
- log.warn("GateIn - MC integration not available");
+ LOG.warn("GateIn - MC integration not available");
return null;
}
}
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/java/org/exoplatform/kernel/demos/mc/InjectedBean.java
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/java/org/exoplatform/kernel/demos/mc/InjectedBean.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/java/org/exoplatform/kernel/demos/mc/InjectedBean.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -31,7 +31,7 @@
*/
public class InjectedBean
{
- private static final Log log = ExoLogger.getLogger("exo.kernel.mc-int-demo.InjectedBean");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.mc-int-demo.InjectedBean");
public static final String SOME_PROPERTY_VALUE = "[This is some property value]";
@@ -39,7 +39,7 @@
public InjectedBean()
{
- log.info("InjectedBean instantiated :: " + this);
+ LOG.info("InjectedBean instantiated :: " + this);
}
public String getSomeString()
@@ -49,7 +49,7 @@
public void start()
{
- log.info("Method start() called on InjectedBean");
+ LOG.info("Method start() called on InjectedBean");
}
public String getAnotherProperty()
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/java/org/exoplatform/kernel/demos/mc/InjectingBean.java
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/java/org/exoplatform/kernel/demos/mc/InjectingBean.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/java/org/exoplatform/kernel/demos/mc/InjectingBean.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -57,7 +57,7 @@
/**
* Logger
*/
- private static final Log log = ExoLogger.getLogger("exo.kernel.mc-int-demo.InjectingBean");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.mc-int-demo.InjectingBean");
/**
* Field to be injected through setter method by mc kernel.
@@ -113,7 +113,7 @@
*/
public InjectingBean()
{
- log.info("Injecting bean instantiated");
+ LOG.info("Injecting bean instantiated");
}
/**
@@ -133,7 +133,7 @@
public void setBean(InjectedBean bean)
{
this.bean = bean;
- log.info("Received InjectedBean: " + bean);
+ LOG.info("Received InjectedBean: " + bean);
}
/**
@@ -153,7 +153,7 @@
public void setConfigurator(KernelConfigurator configurator)
{
this.configurator = configurator;
- log.info("InjectingBean Received KernelConfigurator: " + configurator);
+ LOG.info("InjectingBean Received KernelConfigurator: " + configurator);
}
/**
@@ -205,7 +205,7 @@
)
public void setBindings(Map<Class<?>, Object> bindings)
{
- log.info("Received a map with bindings: " + bindings);
+ LOG.info("Received a map with bindings: " + bindings);
this.bindingsMap = bindings;
}
@@ -225,7 +225,7 @@
@Inject(bean = "InjectedBean", property = "someString")
public void setSomeStringProperty(String value)
{
- log.info("Received SomeStringProperty value: " + value);
+ LOG.info("Received SomeStringProperty value: " + value);
this.stringValue = value;
}
@@ -234,7 +234,7 @@
*/
public void start()
{
- log.warn("start() called (injectedBean is set to: " + injectedBean + ", transactionManager is setTo: " + tm + ")");
+ LOG.warn("start() called (injectedBean is set to: " + injectedBean + ", transactionManager is setTo: " + tm + ")");
this.startCount++;
}
@@ -243,7 +243,7 @@
*/
public void stop()
{
- log.info("stop() called");
+ LOG.info("stop() called");
}
/**
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/src/main/java/org/exoplatform/kernel/it/ExternalMCInjectionTest.java
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/src/main/java/org/exoplatform/kernel/it/ExternalMCInjectionTest.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/src/main/java/org/exoplatform/kernel/it/ExternalMCInjectionTest.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -31,15 +31,16 @@
import org.junit.Assert;
import org.junit.Test;
-import javax.transaction.TransactionManager;
import java.util.Map;
+import javax.transaction.TransactionManager;
+
/**
* @author <a href="mailto:mstrukel at redhat.com">Marko Strukelj</a>
*/
public class ExternalMCInjectionTest
{
- protected Log log = ExoLogger.getLogger("exo.kernel.mc-int-tests.ExternalMCInjectionTest");
+ protected static final Log LOG = ExoLogger.getLogger("exo.kernel.mc-int-tests.ExternalMCInjectionTest");
protected String beanName;
protected ExternallyControlledInjectingBean bean;
@@ -53,13 +54,13 @@
protected void init()
{
- log.info("init() method called");
+ LOG.info("init() method called");
RootContainer rootContainer = RootContainer.getInstance();
bean = (ExternallyControlledInjectingBean) rootContainer.getComponentInstance(beanName);
- log.info("Retrieved " + beanName + ": " + bean);
+ LOG.info("Retrieved " + beanName + ": " + bean);
Assert.assertNotNull(beanName + " not installed", bean);
inJboss = Environment.getInstance().getPlatform() == Environment.JBOSS_PLATFORM;
- log.info("Running inside JBoss? " + inJboss);
+ LOG.info("Running inside JBoss? " + inJboss);
}
@Test
@@ -89,13 +90,13 @@
try
{
int status = tm.getStatus();
- log.info("Status before tx: " + tm.getStatus());
+ LOG.info("Status before tx: " + tm.getStatus());
tm.begin();
Assert.assertFalse("TX status didn't change: ", status == tm.getStatus());
- log.info("Status in tx: " + tm.getStatus());
+ LOG.info("Status in tx: " + tm.getStatus());
tm.commit();
Assert.assertTrue("TX status didn't return to original: ", status == tm.getStatus());
- log.info("Status after tx: " + tm.getStatus());
+ LOG.info("Status after tx: " + tm.getStatus());
}
catch (Exception ex)
{
@@ -106,7 +107,7 @@
{
Assert.assertNull("Injection should not have worked", tm);
}
- log.info("testTransactionManager passed");
+ LOG.info("testTransactionManager passed");
}
protected void testNameLookupMethodInjection()
@@ -120,7 +121,7 @@
{
Assert.assertFalse("Method injection by name lookup should not have worked", found);
}
- log.info("testNameLookupMethodInjection passed");
+ LOG.info("testNameLookupMethodInjection passed");
}
protected void testMapInjection()
@@ -137,7 +138,7 @@
{
Assert.assertFalse("Map injection should not have worked", found);
}
- log.info("testMapInjection passed");
+ LOG.info("testMapInjection passed");
}
protected void testPropertyValueMethodInjection()
@@ -153,7 +154,7 @@
{
Assert.assertFalse("Property value method injection should not have worked", found);
}
- log.info("testPropertyValueMethodInjection passed");
+ LOG.info("testPropertyValueMethodInjection passed");
}
protected void testNestedPropertyInjection()
@@ -169,7 +170,7 @@
{
Assert.assertFalse("Nested property value method injection should not have worked", found);
}
- log.info("testNestedPropertyInjection passed");
+ LOG.info("testNestedPropertyInjection passed");
}
protected void testInstallMethod()
@@ -183,12 +184,12 @@
{
Assert.assertFalse("Install method should not have worked", installOk);
}
- log.info("testInstallMethod passed");
+ LOG.info("testInstallMethod passed");
}
protected void testStarted()
{
Assert.assertEquals("start() method not called exactly once", 1, bean.getStartCount());
- log.info("testStarted passed");
+ LOG.info("testStarted passed");
}
}
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/src/main/java/org/exoplatform/tests/JUnitInvokerServlet.java
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/src/main/java/org/exoplatform/tests/JUnitInvokerServlet.java 2012-02-14 14:40:01 UTC (rev 5632)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/src/main/java/org/exoplatform/tests/JUnitInvokerServlet.java 2012-02-14 14:49:09 UTC (rev 5633)
@@ -36,7 +36,7 @@
public class JUnitInvokerServlet extends HttpServlet
{
- private static final Log log = ExoLogger.getLogger("exo.kernel.mc-int-tests.JUnitInvokerServlet");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.mc-int-tests.JUnitInvokerServlet");
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException
@@ -44,7 +44,7 @@
String className = request.getParameter("class");
response.setContentType("text/plain");
OutputStream out = response.getOutputStream();
- final PrintStream fOut = new PrintStream(new TeeOutputStream(out, new LogOutputStream(log)));
+ final PrintStream fOut = new PrintStream(new TeeOutputStream(out, new LogOutputStream(LOG)));
//final PrintStream fOut = new PrintStream(out);
JUnitSystem sys = new JUnitSystem()
{
More information about the exo-jcr-commits
mailing list