Author: dkatayev Date: 2010-03-25 09:02:20 -0400 (Thu, 25 Mar 2010) New Revision: 2124 Modified: 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/transaction/impl/jotm/TransactionServiceJotmImpl.java kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/TransactionTest.java kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/XAResourceTestImpl.java kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/AbstractExoCache.java kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/CommunicationServiceImpl.java kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/RequestHandlerImpl.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/RootContainer.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/ConfigurationUnmarshaller.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 Log: EXOJCR-605 Logging category now consists of 'package name' + 'simple classname' 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/LoggingCacheListener.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -34,7 +34,7 @@ public class LoggingCacheListener implements CacheListener { - Log log = ExoLogger.getLogger("kernel.cache.log"); + Log log = ExoLogger.getLogger("exo.kernel.component.cache.LoggingCacheListener"); public void onClearCache(CacheListenerContext context) throws Exception { 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/CommonsXMLConfigurationPlugin.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -43,7 +43,7 @@ // protected Catalog defaultCatalog; - private static Log log = ExoLogger.getLogger(CommonsXMLConfigurationPlugin.class); + private static Log log = ExoLogger.getLogger("exo.kernel.component.cache.CommonsXMLConfigurationPlugin"); public CommonsXMLConfigurationPlugin(InitParams params, ConfigurationManager configurationManager) throws Exception { 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/ListenerService.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -35,8 +35,8 @@ private Map<String, List<Listener>> listeners_; - private static Log log = ExoLogger.getLogger("kernel.ListenerService"); - + private static Log log = ExoLogger.getLogger("exo.kernel.component.common.ListenerService"); + /** * Construct a listener service. */ 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -26,22 +26,18 @@ import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; -import java.io.File; import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NameAlreadyBoundException; import javax.naming.NamingException; import javax.naming.Reference; -import javax.naming.StringRefAddr; import javax.xml.stream.XMLStreamException; /** @@ -58,7 +54,7 @@ final public static String PROPERTIES_MANDATORY = "mandatory-properties"; - private static Log log = ExoLogger.getLogger("naming.InitialContextInitializer"); + private static 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/transaction/impl/jotm/TransactionServiceJotmImpl.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/transaction/impl/jotm/TransactionServiceJotmImpl.java 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/transaction/impl/jotm/TransactionServiceJotmImpl.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -51,7 +51,7 @@ public class TransactionServiceJotmImpl implements TransactionService { - protected static Log log = ExoLogger.getLogger("transaction.TransactionServiceJotmImpl"); + protected static Log log = ExoLogger.getLogger("exo.kernel.component.common.TransactionServiceJotmImpl"); public static final String TRACK_WITHOT_TRANSACTION_PARAM = "track-without-transaction"; Modified: kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/TransactionTest.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/TransactionTest.java 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/TransactionTest.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -40,7 +40,7 @@ public class TransactionTest extends TestCase { - private static Log log = ExoLogger.getLogger("tx.TransactionTest"); + private static Log log = ExoLogger.getLogger("exo.kernel.component.common.TransactionTest"); private StandaloneContainer container; Modified: kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/XAResourceTestImpl.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/XAResourceTestImpl.java 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/XAResourceTestImpl.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -39,7 +39,7 @@ public class XAResourceTestImpl implements ExoResource, XAResource { - private static Log log = ExoLogger.getLogger("tx.TestXAResource"); + private static Log log = ExoLogger.getLogger("exo.kernel.component.common.XAResourceTestImpl"); private int timeout = 5; Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/AbstractExoCache.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/AbstractExoCache.java 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/AbstractExoCache.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -59,7 +59,7 @@ /** * Logger. */ - private static final Log LOG = ExoLogger.getLogger(AbstractExoCache.class); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.ext.cache.impl.jboss.v3.AbstractExoCache"); private final AtomicInteger hits = new AtomicInteger(0); Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -55,7 +55,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger(ExoCacheFactoryImpl.class); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.ext.cache.impl.jboss.v3.ExoCacheFactoryImpl"); /** * The initial parameter key that defines the full path of the configuration template Modified: kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/CommunicationServiceImpl.java =================================================================== --- kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/CommunicationServiceImpl.java 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/CommunicationServiceImpl.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -62,7 +62,7 @@ private CommunicationChannelListener channelListener_ = new CommunicationChannelListener(); - private Log LOG = ExoLogger.getLogger(CommunicationServiceImpl.class.getName()); + private Log LOG = ExoLogger.getLogger("exo.kernel.component.remote.CommunicationServiceImpl"); public CommunicationServiceImpl(InitParams confParams) throws Exception { Modified: kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/RequestHandlerImpl.java =================================================================== --- kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/RequestHandlerImpl.java 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/RequestHandlerImpl.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -40,7 +40,7 @@ { private Map messageHandlers_ = new HashMap(); - private static final Log LOG = ExoLogger.getLogger(RequestHandlerImpl.class.getName()); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.remote.RequestHandlerImpl"); public RequestHandlerImpl() { 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainer.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -71,7 +71,7 @@ return Collections.unmodifiableSet(profiles); } - Log log = ExoLogger.getLogger(ExoContainer.class); + Log log = ExoLogger.getLogger("exo.kernel.container.ExoContainer"); private Map<String, ComponentLifecyclePlugin> componentLifecylePlugin_ = new HashMap<String, ComponentLifecyclePlugin>(); 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainerContext.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -43,7 +43,7 @@ private String name; - private static final Log log = ExoLogger.getLogger(ExoContainerContext.class); + private static final Log log = ExoLogger.getLogger("exo.kernel.container.ExoContainerContext"); public ExoContainerContext(ExoContainer container) { 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -64,7 +64,7 @@ private PortalContainerConfig config_; - private static final Log log = ExoLogger.getLogger(RootContainer.class); + private static final Log log = ExoLogger.getLogger("exo.kernel.container.RootContainer"); private static volatile boolean booting = false; 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -52,7 +52,7 @@ final static public boolean LOG_DEBUG = System.getProperty(LOG_DEBUG_PROPERTY) != null; - private static final Log log = ExoLogger.getLogger(ConfigurationManagerImpl.class); + private static final Log log = ExoLogger.getLogger("exo.kernel.container.ConfigurationManagerImpl"); protected Configuration configurations_; Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -60,7 +60,7 @@ public class ConfigurationUnmarshaller { - private static final Log log = ExoLogger.getLogger(ConfigurationUnmarshaller.class); + private static final Log log = ExoLogger.getLogger("exo.kernel.container.ConfigurationUnmarshaller"); private class Reporter implements ErrorHandler { 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -52,14 +52,14 @@ * Created by The eXo Platform SAS * Author : Nicolas Filotto * nicolas.filotto(a)exoplatform.com - * 26 ao�t 2009 + * 26 ao�t 2009 */ public class PortalContainerConfig implements Startable { /** * The logger */ - private static final Log log = ExoLogger.getLogger(PortalContainerConfig.class); + private static final Log log = ExoLogger.getLogger("exo.kernel.container.PortalContainerConfig"); /** * The name of the setting corresponding to the portal container name 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -46,7 +46,7 @@ { private Object instance_; - private Log log = ExoLogger.getLogger(MX4JComponentAdapter.class); + private Log log = ExoLogger.getLogger("exo.kernel.container.MX4JComponentAdapter"); public MX4JComponentAdapter(Object key, Class implementation) { 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableComponentAdapter.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -35,7 +35,7 @@ { /** . */ - private Log log = ExoLogger.getLogger(ManageableComponentAdapter.class); + private Log log = ExoLogger.getLogger("exo.kernel.container.ManageableComponentAdapter"); /** . */ private ComponentAdapter delegate; 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationContainer.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -38,7 +38,7 @@ /** * Logger */ - private static Log log = ExoLogger.getLogger(MCIntegrationContainer.class); + private static Log log = ExoLogger.getLogger("exo.kernel.container.MCIntegrationContainer"); /** * Constructor that exposes super constructor. 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationInvoker.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -43,7 +43,7 @@ /** * Logger */ - private static Log log = ExoLogger.getLogger(MCIntegrationInvoker.class); + private static Log log = ExoLogger.getLogger("exo.kernel.container.MCIntegrationInvoker"); /** * Reference to actual implementation of mc-integration - the one with hard dependencies on JBoss MC Kernel. 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 2010-03-25 12:56:10 UTC (rev 2123) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/AddJVMComponentsToRootContainer.java 2010-03-25 13:02:20 UTC (rev 2124) @@ -34,7 +34,7 @@ public class AddJVMComponentsToRootContainer extends BaseContainerLifecyclePlugin { - private static final Log log = ExoLogger.getLogger(AddJVMComponentsToRootContainer.class); + private static final Log log = ExoLogger.getLogger("exo.kernel.container.AddJVMComponentsToRootContainer"); public void initContainer(ExoContainer container) {