Author: areshetnyak Date: 2011-04-28 09:23:28 -0400 (Thu, 28 Apr 2011) New Revision: 4328 Modified: kernel/trunk/exo.kernel.commons.test/src/main/java/org/exoplatform/commons/test/TestSecurityManager.java kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/debug/ObjectDebuger.java kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/IdentifierUtil.java kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/LazyList.java kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/QName.java kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/CacheServiceImpl.java kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/exception/ExoServiceException.java kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/idgenerator/impl/IDGeneratorServiceImpl.java kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/rpc/impl/RPCServiceImpl.java kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/QueueTaskJob.java kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheCreator.java kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheFactoryImpl.java kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/java/org/exoplatform/services/cache/impl/infinispan/generic/GenericExoCacheCreator.java kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheCreator.java kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ea/EAExoCacheCreator.java kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/fifo/FIFOExoCacheCreator.java kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lfu/LFUExoCacheCreator.java kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lru/LRUExoCacheCreator.java kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/mru/MRUExoCacheCreator.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/client/http/ClientTypeMap.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/component/RequestLifeCycleStack.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/management/ManageableContainer.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagementContextImpl.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/MetaDataBuilder.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/MemoryInfo.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/util/ExoWurflSource.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/jmx/impl/ExoMBeanInfoBuilder.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/jmx/impl/JMXManagementProvider.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/xml/object/XMLObject.java kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCComponentAdapter.java kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCIntConfig.java Log: EXOJCR-1221 : The same violations was fixed in KERNEL. Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/debug/ObjectDebuger.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/debug/ObjectDebuger.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/debug/ObjectDebuger.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -18,6 +18,9 @@ */ package org.exoplatform.commons.debug; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.lang.reflect.Field; import java.util.Collection; import java.util.HashMap; @@ -33,6 +36,11 @@ */ public class ObjectDebuger { + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.commons.debug.ObjectDebuger"); + static public void printObject(Object o) throws Exception { // System. out.println(asString(o)) ; @@ -53,7 +61,7 @@ } catch (Exception ex) { - ex.printStackTrace(); + LOG.error(ex.getLocalizedMessage(), ex); b.append("\n").append(ex.getMessage()); } return b.toString(); Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/IdentifierUtil.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/IdentifierUtil.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/IdentifierUtil.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -18,6 +18,9 @@ */ package org.exoplatform.commons.utils; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.net.InetAddress; import java.security.SecureRandom; @@ -31,6 +34,11 @@ public class IdentifierUtil { + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.commons.utils.IdentifierUtil"); + private static String hexServerIP_ = null; private static final SecureRandom seeder_ = new SecureRandom(); @@ -54,7 +62,7 @@ // "ContentSetUtil: Could not get the local IP address using InetAddress.getLocalHost()!" // ); // todo: find better way to get around this... - uhe.printStackTrace(); + LOG.error(uhe.getLocalizedMessage(), uhe); return null; } byte serverIP[] = localInetAddress.getAddress(); Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/LazyList.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/LazyList.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/LazyList.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -18,6 +18,9 @@ */ package org.exoplatform.commons.utils; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.lang.ref.Reference; import java.lang.ref.SoftReference; import java.util.AbstractList; @@ -48,6 +51,11 @@ public class LazyList<E> extends AbstractList<E> implements RandomAccess { + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.commons.utils.LazyList"); + /** The batch size. */ private final int batchSize; @@ -114,7 +122,7 @@ } catch (Exception e) { - e.printStackTrace(); + LOG.error(e.getLocalizedMessage(), e); throw new IllegalStateException("Cannot load resource at index " + index, e); } } Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/QName.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/QName.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/QName.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -37,18 +37,18 @@ protected final int hashCode; public QName(String namespace, String name) - { - if (namespace == null) - { - namespace = ""; - } - if (name == null) - { - name = ""; - } - String stringName = ("[" + namespace + "]" + name); - int hashCode = (31 + namespace.hashCode()) * 31 + name.hashCode(); - + { + if (namespace == null) + { + namespace = ""; + } + if (name == null) + { + name = ""; + } + String stringName = ("[" + namespace + "]" + name); + int hashCode = (31 + namespace.hashCode()) * 31 + name.hashCode(); + // this.namespace = namespace; this.name = name; @@ -95,7 +95,7 @@ if (!(o instanceof QName)) return false; - return hashCode == o.hashCode() && getAsString().equals(((QName)o).getAsString()); + return hashCode == o.hashCode() && getAsString().equals(((QName) o).getAsString()); } @Override Modified: kernel/trunk/exo.kernel.commons.test/src/main/java/org/exoplatform/commons/test/TestSecurityManager.java =================================================================== --- kernel/trunk/exo.kernel.commons.test/src/main/java/org/exoplatform/commons/test/TestSecurityManager.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.commons.test/src/main/java/org/exoplatform/commons/test/TestSecurityManager.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -73,7 +73,7 @@ else if (className.startsWith("org.apache.jackrabbit.test")) { if (fileName.endsWith("Test.java") || fileName.equals("JCRTestResult.java") - || fileName.equals("RepositoryHelper.java") || fileName.equals("RepositoryStub.java")) + || fileName.equals("RepositoryHelper.java") || fileName.equals("RepositoryStub.java")) { testCode = true; } @@ -93,7 +93,8 @@ // if (!se // .getMessage() // .equals( - // "access denied (java.lang.RuntimePermission accessClassInPackage.com.sun.xml.internal.bind.v2.runtime.reflect)")) + // "access denied (java.lang.RuntimePermission + // accessClassInPackage.com.sun.xml.internal.bind.v2.runtime.reflect)")) // { // se.printStackTrace(); // } Modified: kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/CacheServiceImpl.java =================================================================== --- kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/CacheServiceImpl.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/CacheServiceImpl.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -203,7 +203,8 @@ public Collection<ExoCache<? extends Serializable, ?>> getAllCacheInstances() { - Collection<ExoCache<? extends Serializable, ?>> caches = new ArrayList<ExoCache<? extends Serializable,?>>(cacheMap_.size()); + Collection<ExoCache<? extends Serializable, ?>> caches = + new ArrayList<ExoCache<? extends Serializable,?>>(cacheMap_.size()); for (FutureTask<ExoCache<? extends Serializable,?>> task : cacheMap_.values()) { ExoCache<? extends Serializable, ?> cache = null; Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -19,6 +19,8 @@ package org.exoplatform.services.compress; import org.exoplatform.commons.utils.PrivilegedFileHelper; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -43,6 +45,11 @@ */ public class CompressData { + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.compress.CompressData"); + private String base_; private List<DataInstance> datas_ = new ArrayList<DataInstance>(); @@ -61,7 +68,7 @@ base_ = base; } - private String getBase() + public String getBase() { return base_; } @@ -75,7 +82,7 @@ } catch (FileNotFoundException e) { - e.printStackTrace(); + LOG.error(e.getLocalizedMessage(), e); } } @@ -296,7 +303,7 @@ { ByteArrayOutputStream baos = new ByteArrayOutputStream(); - if (getType() == "Zip") + if (getType().equals("Zip")) { ZipOutputStream zos = new ZipOutputStream(baos); try @@ -305,7 +312,7 @@ } catch (Exception e) { - e.printStackTrace(); + LOG.error(e.getLocalizedMessage(), e); } } else @@ -318,7 +325,7 @@ } catch (Exception e) { - e.printStackTrace(); + LOG.error(e.getLocalizedMessage(), e); } } InputStream is = new ByteArrayInputStream(baos.toByteArray()); @@ -329,7 +336,7 @@ } catch (IOException e) { - e.printStackTrace(); + LOG.error(e.getLocalizedMessage(), e); } return is; Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/exception/ExoServiceException.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/exception/ExoServiceException.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/exception/ExoServiceException.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -18,6 +18,9 @@ */ package org.exoplatform.services.exception; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + /** * @author: Tuan Nguyen * @version: $Id: ExoServiceException.java 5332 2006-04-29 18:32:44Z geaz $ @@ -26,6 +29,11 @@ */ public class ExoServiceException extends Exception { + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.exception.ExoServiceException"); + protected Object[] params_; protected String key_ = "SystemException"; @@ -39,7 +47,7 @@ public ExoServiceException(Throwable ex) { super(ex.getMessage()); - ex.printStackTrace(); + LOG.error(ex.getLocalizedMessage(), ex); } public ExoServiceException(String s) Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/idgenerator/impl/IDGeneratorServiceImpl.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/idgenerator/impl/IDGeneratorServiceImpl.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/idgenerator/impl/IDGeneratorServiceImpl.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -19,6 +19,8 @@ package org.exoplatform.services.idgenerator.impl; import org.exoplatform.services.idgenerator.IDGeneratorService; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.Serializable; import java.net.InetAddress; @@ -31,6 +33,11 @@ */ public class IDGeneratorServiceImpl implements IDGeneratorService { + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.idgenerator.impl.IDGeneratorServiceImpl"); + private static String hexServerIP_ = null; private static final SecureRandom seeder_ = new SecureRandom(); @@ -69,7 +76,7 @@ // "ContentSetUtil: Could not get the local IP address using InetAddress.getLocalHost()!" // ); // todo: find better way to get around this... - uhe.printStackTrace(); + LOG.error(uhe.getLocalizedMessage(), uhe); return null; } byte serverIP[] = localInetAddress.getAddress(); Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -19,6 +19,8 @@ package org.exoplatform.services.naming; import org.exoplatform.commons.utils.SecurityHelper; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.security.PrivilegedExceptionAction; import java.util.Hashtable; @@ -43,6 +45,11 @@ public class SimpleContext implements Context { + + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.naming.SimpleContext"); private static Hashtable objects = new Hashtable(); @@ -75,7 +82,7 @@ } catch (Exception e) { - e.printStackTrace(); + LOG.error(e.getLocalizedMessage(), e); throw new NamingException("Exception: " + e); } } @@ -142,8 +149,7 @@ public NamingEnumeration<Binding> listBindings(String arg0) throws NamingException { - // TODO Auto-generated method stub - return null; + throw new NamingException("Not supported"); } public void destroySubcontext(Name arg0) throws NamingException Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/rpc/impl/RPCServiceImpl.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/rpc/impl/RPCServiceImpl.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/rpc/impl/RPCServiceImpl.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -373,7 +373,8 @@ if (coordinator.equals(this.coordinator)) { if (LOG.isTraceEnabled()) - LOG.trace("The coordinator did not change yet, we will relaunch the command after " + retryTimeout + " ms or once a topology change has been detected"); + LOG.trace("The coordinator did not change yet, we will relaunch the command after " + + retryTimeout + " ms or once a topology change has been detected"); try { topologyChangeLock.wait(retryTimeout); @@ -640,7 +641,7 @@ if (state != State.STARTED) { throw new RPCException("Cannot know whether the local node is a coordinator or not if " + - "the service is not started, the current state of the service is " + state); + "the service is not started, the current state of the service is " + state); } return isCoordinator; } Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/QueueTaskJob.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/QueueTaskJob.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/QueueTaskJob.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -23,7 +23,10 @@ import org.exoplatform.services.scheduler.JobContext; import org.exoplatform.services.scheduler.QueueTasks; import org.exoplatform.services.scheduler.Task; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + /** * Created by The eXo Platform SAS Author : Hoa Pham * hoapham@exoplatform.com,phamvuxuanhoa(a)yahoo.com Oct 7, 2005 @@ -32,6 +35,11 @@ */ public class QueueTaskJob extends BaseJob { + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.scheduler.impl.QueueTaskJob"); + public void execute(JobContext context) throws Exception { PortalContainer manager = PortalContainer.getInstance(); @@ -45,7 +53,7 @@ } catch (Exception ex) { - ex.printStackTrace(); + LOG.error(ex.getLocalizedMessage(), ex); } task = qtasks.poll(); } Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheCreator.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheCreator.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheCreator.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -45,7 +45,8 @@ * @param cacheGetter a {@link Callable} instance from which we can get the cache * @exception ExoCacheInitException if an exception happens while initializing the cache */ - public ExoCache<Serializable, Object> create(ExoCacheConfig config, Configuration cacheConfig, Callable<Cache<Serializable, Object>> cacheGetter) throws ExoCacheInitException; + public ExoCache<Serializable, Object> create(ExoCacheConfig config, Configuration cacheConfig, + Callable<Cache<Serializable, Object>> cacheGetter) throws ExoCacheInitException; /** * Returns the type of {@link org.exoplatform.services.cache.ExoCacheConfig} expected by the creator Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheFactoryImpl.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheFactoryImpl.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheFactoryImpl.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -104,7 +104,8 @@ /** * The mapping between the global configuration and the cache managers */ - private final Map<GlobalConfiguration, DefaultCacheManager> mappingGlobalConfigCacheManager = new HashMap<GlobalConfiguration, DefaultCacheManager>(); + private final Map<GlobalConfiguration, DefaultCacheManager> mappingGlobalConfigCacheManager = + new HashMap<GlobalConfiguration, DefaultCacheManager>(); /** * The default creator Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/java/org/exoplatform/services/cache/impl/infinispan/generic/GenericExoCacheCreator.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/java/org/exoplatform/services/cache/impl/infinispan/generic/GenericExoCacheCreator.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/main/java/org/exoplatform/services/cache/impl/infinispan/generic/GenericExoCacheCreator.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -80,7 +80,7 @@ } /** - * @see org.exoplatform.services.cache.impl.infinispan.ExoCacheCreator#create(org.exoplatform.services.cache.ExoCacheConfig, java.util.concurrent.Callable) + * {@inheritDoc} */ public ExoCache<Serializable, Object> create(ExoCacheConfig config, Configuration cacheConfig, Callable<Cache<Serializable, Object>> cacheGetter) throws ExoCacheInitException @@ -166,7 +166,8 @@ } @ManagedName("Lifespan") - @ManagedDescription("Maximum lifespan of a cache entry, after which the entry is expired cluster-wide. -1 means the entries never expire.") + @ManagedDescription("Maximum lifespan of a cache entry, after which the entry is expired cluster-wide." + + " -1 means the entries never expire.") public long getLiveTime() { return cacheConfig.getExpirationLifespan(); @@ -174,7 +175,8 @@ @Managed @ManagedName("MaxIdle") - @ManagedDescription("Maximum idle time a cache entry will be maintained in the cache. If the idle time is exceeded, the entry will be expired cluster-wide. -1 means the entries never expire.") + @ManagedDescription("Maximum idle time a cache entry will be maintained in the cache. " + + "If the idle time is exceeded, the entry will be expired cluster-wide. -1 means the entries never expire.") public long getMaxIdle() { return cacheConfig.getExpirationMaxIdle(); @@ -182,7 +184,8 @@ @Managed @ManagedName("WakeUpInterval") - @ManagedDescription("Interval between subsequent eviction runs. If you wish to disable the periodic eviction process altogether, set wakeupInterval to -1.") + @ManagedDescription("Interval between subsequent eviction runs. If you wish to disable the periodic eviction " + + "process altogether, set wakeupInterval to -1.") public long getWakeUpInterval() { return cacheConfig.getEvictionWakeUpInterval(); Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheCreator.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheCreator.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheCreator.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -43,7 +43,8 @@ * @param cache the cache to initialize * @exception ExoCacheInitException if an exception happens while initializing the cache */ - public ExoCache<Serializable, Object> create(ExoCacheConfig config, Cache<Serializable, Object> cache) throws ExoCacheInitException; + public ExoCache<Serializable, Object> create(ExoCacheConfig config, + Cache<Serializable, Object> cache) throws ExoCacheInitException; /** * Returns the type of {@link org.exoplatform.services.cache.ExoCacheConfig} expected by the creator Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ea/EAExoCacheCreator.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ea/EAExoCacheCreator.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ea/EAExoCacheCreator.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -68,7 +68,7 @@ } /** - * @see org.exoplatform.services.cache.impl.jboss.ExoCacheCreator#create(org.exoplatform.services.cache.ExoCacheConfig, org.jboss.cache.Cache) + * {@inheritDoc} */ public ExoCache<Serializable, Object> create(ExoCacheConfig config, Cache<Serializable, Object> cache) throws ExoCacheInitException @@ -143,14 +143,17 @@ } @ManagedName("MaxNodes") - @ManagedDescription("This is the maximum number of nodes allowed in this region. 0 denotes immediate expiry, -1 denotes no limit.") + @ManagedDescription("This is the maximum number of nodes allowed in this region. 0 denotes immediate expiry, " + + "-1 denotes no limit.") public int getMaxSize() { return ea.getMaxNodes(); } @ManagedName("MinTimeToLive") - @ManagedDescription("the minimum amount of time a node must be allowed to live after being accessed before it is allowed to be considered for eviction. 0 denotes that this feature is disabled, which is the default value.") + @ManagedDescription("the minimum amount of time a node must be allowed to live after being accessed before " + + "it is allowed to be considered for eviction. 0 denotes that this feature is disabled, " + + "which is the default value.") public long getLiveTime() { return ea.getMinTimeToLive(); Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/fifo/FIFOExoCacheCreator.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/fifo/FIFOExoCacheCreator.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/fifo/FIFOExoCacheCreator.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -65,7 +65,8 @@ /** * {@inheritDoc} */ - public ExoCache<Serializable, Object> create(ExoCacheConfig config, Cache<Serializable, Object> cache) throws ExoCacheInitException + public ExoCache<Serializable, Object> create(ExoCacheConfig config, Cache<Serializable, Object> cache) + throws ExoCacheInitException { if (config instanceof FIFOExoCacheConfig) { @@ -82,7 +83,8 @@ /** * Creates a new ExoCache instance with the relevant parameters */ - private ExoCache<Serializable, Object> create(ExoCacheConfig config, Cache<Serializable, Object> cache, int maxNodes, long minTimeToLive) + private ExoCache<Serializable, Object> create(ExoCacheConfig config, Cache<Serializable, Object> cache, + int maxNodes, long minTimeToLive) throws ExoCacheInitException { final FIFOAlgorithmConfig fifo = new FIFOAlgorithmConfig(maxNodes); @@ -102,14 +104,17 @@ } @ManagedName("MaxNodes") - @ManagedDescription("This is the maximum number of nodes allowed in this region. 0 denotes immediate expiry, -1 denotes no limit.") + @ManagedDescription("This is the maximum number of nodes allowed in this region. " + + "0 denotes immediate expiry, -1 denotes no limit.") public int getMaxSize() { return fifo.getMaxNodes(); } @ManagedName("MinTimeToLive") - @ManagedDescription("the minimum amount of time a node must be allowed to live after being accessed before it is allowed to be considered for eviction. 0 denotes that this feature is disabled, which is the default value.") + @ManagedDescription("the minimum amount of time a node must be allowed to live after " + + "being accessed before it is allowed to be considered for eviction. 0 denotes that " + + "this feature is disabled, which is the default value.") public long getLiveTime() { return fifo.getMinTimeToLive(); Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lfu/LFUExoCacheCreator.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lfu/LFUExoCacheCreator.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lfu/LFUExoCacheCreator.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -114,14 +114,17 @@ } @ManagedName("MinTimeToLive") - @ManagedDescription("the minimum amount of time a node must be allowed to live after being accessed before it is allowed to be considered for eviction. 0 denotes that this feature is disabled, which is the default value.") + @ManagedDescription("the minimum amount of time a node must be allowed to live after being accessed " + + "before it is allowed to be considered for eviction. 0 denotes that this feature is disabled, " + + "which is the default value.") public long getLiveTime() { return lfu.getMinTimeToLive(); } @ManagedName("MaxNodes") - @ManagedDescription("This is the maximum number of nodes allowed in this region. 0 denotes immediate expiry, -1 denotes no limit.") + @ManagedDescription("This is the maximum number of nodes allowed in this region. " + + "0 denotes immediate expiry, -1 denotes no limit.") public int getMaxSize() { return lfu.getMaxNodes(); @@ -129,7 +132,10 @@ @Managed @ManagedName("MinNodes") - @ManagedDescription("This is the minimum number of nodes allowed in this region. This value determines what the eviction queue should prune down to per pass. e.g. If minNodes is 10 and the cache grows to 100 nodes, the cache is pruned down to the 10 most frequently used nodes when the eviction timer makes a pass through the eviction algorithm.") + @ManagedDescription("This is the minimum number of nodes allowed in this region. This value determines " + + "what the eviction queue should prune down to per pass. e.g. If minNodes is 10 and the cache grows " + + "to 100 nodes, the cache is pruned down to the 10 most frequently used nodes when the eviction timer " + + "makes a pass through the eviction algorithm.") public long getMinNodes() { return lfu.getMinNodes(); Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lru/LRUExoCacheCreator.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lru/LRUExoCacheCreator.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lru/LRUExoCacheCreator.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -121,14 +121,17 @@ } @ManagedName("MinTimeToLive") - @ManagedDescription("the minimum amount of time a node must be allowed to live after being accessed before it is allowed to be considered for eviction. 0 denotes that this feature is disabled, which is the default value.") + @ManagedDescription("the minimum amount of time a node must be allowed to live after" + + " being accessed before it is allowed to be considered for eviction. 0 denotes " + + "that this feature is disabled, which is the default value.") public long getLiveTime() { return lru.getMinTimeToLive(); } @ManagedName("MaxNodes") - @ManagedDescription("This is the maximum number of nodes allowed in this region. 0 denotes immediate expiry, -1 denotes no limit.") + @ManagedDescription("This is the maximum number of nodes allowed in this region. " + + "0 denotes immediate expiry, -1 denotes no limit.") public int getMaxSize() { return lru.getMaxNodes(); @@ -136,7 +139,8 @@ @Managed @ManagedName("TimeToLive") - @ManagedDescription("The amount of time a node is not written to or read (in milliseconds) before the node is swept away. 0 denotes immediate expiry, -1 denotes no limit.") + @ManagedDescription("The amount of time a node is not written to or read (in milliseconds) " + + "before the node is swept away. 0 denotes immediate expiry, -1 denotes no limit.") public long getTimeToLive() { return lru.getTimeToLive(); @@ -144,7 +148,8 @@ @Managed @ManagedName("MaxAges") - @ManagedDescription("Lifespan of a node (in milliseconds) regardless of idle time before the node is swept away. 0 denotes immediate expiry, -1 denotes no limit.") + @ManagedDescription("Lifespan of a node (in milliseconds) regardless of idle time before " + + "the node is swept away. 0 denotes immediate expiry, -1 denotes no limit.") public long getMaxAge() { return lru.getMaxAge(); Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/mru/MRUExoCacheCreator.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/mru/MRUExoCacheCreator.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/mru/MRUExoCacheCreator.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -49,7 +49,8 @@ /** * {@inheritDoc} */ - public ExoCache<Serializable, Object> create(ExoCacheConfig config, Cache<Serializable, Object> cache) throws ExoCacheInitException + public ExoCache<Serializable, Object> create(ExoCacheConfig config, Cache<Serializable, Object> cache) + throws ExoCacheInitException { if (config instanceof MRUExoCacheConfig) { @@ -66,7 +67,8 @@ /** * Creates a new ExoCache instance with the relevant parameters */ - private ExoCache<Serializable, Object> create(ExoCacheConfig config, Cache<Serializable, Object> cache, int maxNodes, long minTimeToLive) + private ExoCache<Serializable, Object> create(ExoCacheConfig config, Cache<Serializable, Object> cache, + int maxNodes, long minTimeToLive) throws ExoCacheInitException { final MRUAlgorithmConfig mru = new MRUAlgorithmConfig(maxNodes); @@ -86,14 +88,17 @@ } @ManagedName("MaxNodes") - @ManagedDescription("This is the maximum number of nodes allowed in this region. 0 denotes immediate expiry, -1 denotes no limit.") + @ManagedDescription("This is the maximum number of nodes allowed in this region. " + + "0 denotes immediate expiry, -1 denotes no limit.") public int getMaxSize() { return mru.getMaxNodes(); } @ManagedName("MinTimeToLive") - @ManagedDescription("the minimum amount of time a node must be allowed to live after being accessed before it is allowed to be considered for eviction. 0 denotes that this feature is disabled, which is the default value.") + @ManagedDescription("the minimum amount of time a node must be allowed to live after " + + "being accessed before it is allowed to be considered for eviction. " + + "0 denotes that this feature is disabled, which is the default value.") public long getLiveTime() { return mru.getMinTimeToLive(); 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 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -78,7 +78,7 @@ private PortalContainerConfig config_; - private static final Log log = ExoLogger.getLogger("exo.kernel.container.RootContainer"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.RootContainer"); private static volatile boolean booting = false; @@ -208,7 +208,7 @@ } catch (Exception ex) { - ex.printStackTrace(); + LOG.error(ex.getLocalizedMessage(), ex); } } } @@ -483,7 +483,7 @@ log.error("Could not build root container", e); // The logger is not necessary configured so we have to use the standard // output stream - e.printStackTrace(); + LOG.error(e.getLocalizedMessage(), e); return null; } } 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 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -32,6 +32,8 @@ import org.exoplatform.management.jmx.annotations.NamingContext; import org.exoplatform.management.jmx.annotations.Property; import org.exoplatform.management.rest.annotations.RESTEndpoint; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.File; import java.net.MalformedURLException; @@ -60,6 +62,11 @@ public class StandaloneContainer extends ExoContainer implements SessionManagerContainer { + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.container.StandaloneContainer"); + private static final long serialVersionUID = 12L; private static StandaloneContainer container; @@ -169,7 +176,7 @@ } }); PrivilegedSystemHelper.setProperty("exo.standalone-container", StandaloneContainer.class.getName()); - System.out.println("StandaloneContainer initialized using: " + configurationURL); + LOG.info("StandaloneContainer initialized using: " + configurationURL); } return container; } @@ -187,7 +194,7 @@ String n = (String)comp[0]; Object o = comp[1]; container.registerComponentInstance(n, o); - System.out.println("StandaloneContainer: injecting \"" + n + "\""); + LOG.info("StandaloneContainer: injecting \"" + n + "\""); } } Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/client/http/ClientTypeMap.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/client/http/ClientTypeMap.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/client/http/ClientTypeMap.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -24,6 +24,9 @@ * */ package org.exoplatform.container.client.http; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -45,6 +48,11 @@ final static public String XHTML_MIME_TYPE = "text/xhtml"; final static public String XHTMLMP_MIME_TYPE = "application/vnd.wap.xhtml+xml"; + + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.container.client.http.ClientTypeMap"); private ArrayList<HttpClientType> clientList_; @@ -107,7 +115,7 @@ } catch (Exception ex) { - ex.printStackTrace(); + LOG.error(ex.getLocalizedMessage(), ex); } } @@ -146,7 +154,7 @@ } catch (PatternSyntaxException e) { - e.printStackTrace(); + LOG.error(e.getLocalizedMessage(), e); return clientList_.get(0); } } Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/component/RequestLifeCycleStack.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/component/RequestLifeCycleStack.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/component/RequestLifeCycleStack.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -19,7 +19,6 @@ package org.exoplatform.container.component; import org.exoplatform.container.ExoContainer; -import org.exoplatform.container.component.ComponentRequestLifecycle; import org.picocontainer.PicoContainer; import java.util.ArrayList; @@ -35,7 +34,8 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -class RequestLifeCycleStack extends LinkedList<RequestLifeCycle> +class RequestLifeCycleStack + extends LinkedList<RequestLifeCycle> { /** . */ @@ -49,7 +49,7 @@ { if (allComponents.contains(lifeCycle)) { - addLast(new RequestLifeCycle(null, Collections.<ComponentRequestLifecycle>emptyList())); + addLast(new RequestLifeCycle(null, Collections.<ComponentRequestLifecycle> emptyList())); } else { @@ -63,14 +63,17 @@ void begin(ExoContainer container, boolean local) { // Need to make a copy as modifying the list is cached by the container - List<ComponentRequestLifecycle> components = new ArrayList<ComponentRequestLifecycle>((List<ComponentRequestLifecycle>)container.getComponentInstancesOfType(ComponentRequestLifecycle.class)); + List<ComponentRequestLifecycle> components = + new ArrayList<ComponentRequestLifecycle>((List<ComponentRequestLifecycle>) container + .getComponentInstancesOfType(ComponentRequestLifecycle.class)); // if (!local) { - for (PicoContainer current = container.getParent();current != null;current = current.getParent()) + for (PicoContainer current = container.getParent(); current != null; current = current.getParent()) { - components.addAll((List<ComponentRequestLifecycle>)current.getComponentInstancesOfType(ComponentRequestLifecycle.class)); + components.addAll((List<ComponentRequestLifecycle>) current + .getComponentInstancesOfType(ComponentRequestLifecycle.class)); } } 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 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -104,7 +104,8 @@ + "XML declaration similar to\n" + "<configuration\n" + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" - + " xsi:schemaLocation=\"http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd\"\n" + + " xsi:schemaLocation=\"http://www.exoplaform.org/xml/ns/kernel_1_1.xsd " + + "http://www.exoplaform.org/xml/ns/kernel_1_1.xsd\"\n" + " xmlns=\"http://www.exoplaform.org/xml/ns/kernel_1_1.xsd\">&q...); } else 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 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -569,7 +569,7 @@ if (PropertyManager.isDevelopping()) { log.debug("The context '" + contextName + "' has not been added as " + - "dependency of any portal containers"); + "dependency of any portal containers"); } // by default we will return the default portal container return defaultDefinition.getName(); Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -44,7 +44,8 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class ManageableContainer extends CachingContainer +public class ManageableContainer + extends CachingContainer { private static MBeanServer findMBeanServer() @@ -54,7 +55,8 @@ } /** . */ - private static final ThreadLocal<ManageableComponentAdapterFactory> hack = new ThreadLocal<ManageableComponentAdapterFactory>(); + private static final ThreadLocal<ManageableComponentAdapterFactory> hack = + new ThreadLocal<ManageableComponentAdapterFactory>(); /** . */ final ManagementContextImpl managementContext; @@ -70,7 +72,7 @@ public ManageableContainer() { - this((PicoContainer)null); + this((PicoContainer) null); } public ManageableContainer(PicoContainer parent) @@ -95,12 +97,12 @@ ManagementContextImpl parentCtx = null; if (parent instanceof ManageableContainer) { - ManageableContainer manageableParent = (ManageableContainer)parent; + ManageableContainer manageableParent = (ManageableContainer) parent; parentCtx = manageableParent.managementContext; } // - this.parent = parent instanceof ManageableContainer ? (ManageableContainer)parent : null; + this.parent = parent instanceof ManageableContainer ? (ManageableContainer) parent : null; // if (parentCtx != null) @@ -138,7 +140,7 @@ } private static ManageableComponentAdapterFactory getComponentAdapterFactory( - ComponentAdapterFactory componentAdapterFactory) + ComponentAdapterFactory componentAdapterFactory) { ManageableComponentAdapterFactory factory = new ManageableComponentAdapterFactory(componentAdapterFactory); hack.set(factory); @@ -156,7 +158,7 @@ } public ComponentAdapter registerComponentInstance(Object componentKey, Object componentInstance) - throws PicoRegistrationException + throws PicoRegistrationException { ComponentAdapter adapter = super.registerComponentInstance(componentKey, componentInstance); if (managementContext != null) @@ -166,7 +168,7 @@ // Register if it is a management provider if (componentInstance instanceof ManagementProvider) { - ManagementProvider provider = (ManagementProvider)componentInstance; + ManagementProvider provider = (ManagementProvider) componentInstance; addProvider(provider); } } Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagementContextImpl.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagementContextImpl.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagementContextImpl.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -21,11 +21,13 @@ import org.exoplatform.container.ExoContainer; import org.exoplatform.container.component.RequestLifeCycle; import org.exoplatform.management.ManagementAware; +import org.exoplatform.management.ManagementContext; +import org.exoplatform.management.annotations.ManagedBy; import org.exoplatform.management.spi.ManagedResource; import org.exoplatform.management.spi.ManagedTypeMetaData; import org.exoplatform.management.spi.ManagementProvider; -import org.exoplatform.management.ManagementContext; -import org.exoplatform.management.annotations.ManagedBy; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -41,6 +43,11 @@ public class ManagementContextImpl implements ManagementContext, ManagedResource { + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.container.management.ManagementContextImpl"); + /** . */ private final Map<Class<?>, Object> scopingDataList; @@ -167,19 +174,19 @@ } catch (NoSuchMethodException e) { - e.printStackTrace(); + LOG.error(e.getLocalizedMessage(), e); } catch (InstantiationException e) { - e.printStackTrace(); + LOG.error(e.getLocalizedMessage(), e); } catch (IllegalAccessException e) { - e.printStackTrace(); + LOG.error(e.getLocalizedMessage(), e); } catch (InvocationTargetException e) { - e.printStackTrace(); + LOG.error(e.getLocalizedMessage(), e); } } else Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/MetaDataBuilder.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/MetaDataBuilder.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/MetaDataBuilder.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -43,18 +43,26 @@ * <ul> * <li>The class must be annotated by {@link org.exoplatform.management.annotations.Managed}</li> * <li>The class may be annoated by {@link org.exoplatform.management.annotations.ManagedDescription}</li> - * <li>Any property described by its getter and/or setter getter annotated by {@link org.exoplatform.management.annotations.Managed} is exposed as an attribute/li> + * <li>Any property described by its getter and/or setter getter annotated + * by {@link org.exoplatform.management.annotations.Managed} is exposed as an attribute </li> * <li>Any property providing an annotated getter is readable</li> * <li>Any property providing an annotated setter is writable</li> - * <li>Any getter/setter annotated by {@link org.exoplatform.management.annotations.ManagedName} redefines the attribute name</li> - * <li>Any getter/setter annotated by {@link org.exoplatform.management.annotations.ManagedDescription} defines the attribute description</li> + * <li>Any getter/setter annotated by {@link org.exoplatform.management.annotations.ManagedName} + * redefines the attribute name</li> + * <li>Any getter/setter annotated by {@link org.exoplatform.management.annotations.ManagedDescription} + * defines the attribute description</li> * <li>When corresponding getter/setter redefines the attribute name, the value must be the same otherwhise * an exception is thrown at built time</li> - * <li>Any method annotated by {@link org.exoplatform.management.annotations.Managed} is exposed as a management operation</li> - * <li>Any method annotated by {@link org.exoplatform.management.annotations.ManagedDescription} defines the operation description</li> - * <li>Any non setter/getter method annotated by {@link org.exoplatform.management.annotations.ManagedName} causes a built time exception</li> - * <li>Any method argument annotated by {@link org.exoplatform.management.annotations.ManagedName} defines the management name of the corresponding operation parameter</li> - * <li>Any method argument annotated by {@link org.exoplatform.management.annotations.ManagedDescription} defines the management description of the corresponding operation parameter</li> + * <li>Any method annotated by {@link org.exoplatform.management.annotations.Managed} is exposed + * as a management operation</li> + * <li>Any method annotated by {@link org.exoplatform.management.annotations.ManagedDescription} + * defines the operation description</li> + * <li>Any non setter/getter method annotated by {@link org.exoplatform.management.annotations.ManagedName} + * causes a built time exception</li> + * <li>Any method argument annotated by {@link org.exoplatform.management.annotations.ManagedName} + * defines the management name of the corresponding operation parameter</li> + * <li>Any method argument annotated by {@link org.exoplatform.management.annotations.ManagedDescription} + * defines the management description of the corresponding operation parameter</li> * </ul> * </p> * @@ -76,7 +84,8 @@ * Create a new builder. * * @param clazz the clazz - * @throws IllegalArgumentException if the class is null or is not annotated by {@link org.exoplatform.management.annotations.Managed} + * @throws IllegalArgumentException if the class is null or is not annotated + * by {@link org.exoplatform.management.annotations.Managed} */ public MetaDataBuilder(Class clazz) throws IllegalArgumentException { @@ -113,14 +122,14 @@ // ManagedDescription typeDescriptionAnn = - AnnotationIntrospector.resolveClassAnnotations(clazz, ManagedDescription.class); + AnnotationIntrospector.resolveClassAnnotations(clazz, ManagedDescription.class); String typeDescription = typeDescriptionAnn != null ? typeDescriptionAnn.value() : null; // Map<Method, Managed> managedMethods = AnnotationIntrospector.resolveMethodAnnotations(clazz, Managed.class); Map<Method, ManagedName> methodNames = AnnotationIntrospector.resolveMethodAnnotations(clazz, ManagedName.class); Map<Method, ManagedDescription> methodDescriptions = - AnnotationIntrospector.resolveMethodAnnotations(clazz, ManagedDescription.class); + AnnotationIntrospector.resolveMethodAnnotations(clazz, ManagedDescription.class); // Map<Method, ManagedMethodMetaData> bilto = new HashMap<Method, ManagedMethodMetaData>(); @@ -150,11 +159,11 @@ { if (parameterAnnotation instanceof ManagedName) { - mmpMD.setName(((ManagedName)parameterAnnotation).value()); + mmpMD.setName(((ManagedName) parameterAnnotation).value()); } else if (parameterAnnotation instanceof ManagedDescription) { - mmpMD.setDescription(((ManagedDescription)parameterAnnotation).value()); + mmpMD.setDescription(((ManagedDescription) parameterAnnotation).value()); } } managedMethod.addParameter(mmpMD); @@ -226,7 +235,8 @@ if (managedName != null) { throw new IllegalArgumentException("Managed operation " + method.getName() - + " cannot be annoated with @" + ManagedName.class.getName() + " with value " + managedName.value()); + + " cannot be annoated with @" + ManagedName.class.getName() + " with value " + + managedName.value()); } // @@ -278,7 +288,7 @@ if (!getterName.value().equals(setterName.value())) { throw new IllegalArgumentException("Getter name=" + getterName.value() - + " does not match the setter name=" + setterName.value()); + + " does not match the setter name=" + setterName.value()); } } attributeName = getterName.value(); @@ -290,7 +300,7 @@ // ManagedPropertyMetaData managedProperty = - new ManagedPropertyMetaData(attributeName, getter, getterDescription, setter, setterDescription, mpm); + new ManagedPropertyMetaData(attributeName, getter, getterDescription, setter, setterDescription, mpm); managedProperty.setDescription(propertyDescription); @@ -299,7 +309,7 @@ if (previousManagedProperty != null) { throw new IllegalArgumentException("The same property was declared twice old=" + previousManagedProperty - + " new=" + managedProperty); + + " new=" + managedProperty); } // Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -124,7 +124,7 @@ } catch (Exception ignore) { - ignore.printStackTrace(); + log.error(ignore.getLocalizedMessage(), ignore); } } else if (jettyHome != null) Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/MemoryInfo.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/MemoryInfo.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/MemoryInfo.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -18,6 +18,9 @@ */ package org.exoplatform.container.monitor.jvm; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; import java.lang.management.MemoryUsage; @@ -29,6 +32,11 @@ */ public class MemoryInfo { + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.container.monitor.jvm.MemoryInfo"); + private MemoryMXBean mxbean_; public MemoryInfo() @@ -58,7 +66,7 @@ public void printMemoryInfo() { - System.out.println(" Memory Heap Usage: " + mxbean_.getHeapMemoryUsage()); - System.out.println(" Memory Non Heap Usage" + mxbean_.getNonHeapMemoryUsage()); + LOG.info(" Memory Heap Usage: " + mxbean_.getHeapMemoryUsage()); + LOG.info(" Memory Non Heap Usage" + mxbean_.getNonHeapMemoryUsage()); } } Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/util/ExoWurflSource.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/util/ExoWurflSource.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/util/ExoWurflSource.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -18,12 +18,20 @@ */ package org.exoplatform.container.util; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.io.InputStream; //import net.sourceforge.wurfl.wurflapi.WurflSource; public class ExoWurflSource /* implements WurflSource */ { + + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.util.ExoWurflSource"); public InputStream getWurflInputStream() { @@ -35,7 +43,7 @@ } catch (Exception e) { - e.printStackTrace(); + LOG.error(e.getLocalizedMessage(), e); return null; } } Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -19,6 +19,8 @@ package org.exoplatform.container.xml; import org.apache.commons.beanutils.PropertyUtils; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.util.ArrayList; import java.util.Collection; @@ -34,6 +36,11 @@ */ public class ObjectParam extends Parameter { + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.xml.ObjectParam"); + private String type; private String package_; @@ -100,7 +107,7 @@ // prop.name_ + // ", value prop.value " + prop.value_) ; // } - ex.printStackTrace(); + LOG.error(ex.getLocalizedMessage(), ex); } } Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/jmx/impl/ExoMBeanInfoBuilder.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/jmx/impl/ExoMBeanInfoBuilder.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/jmx/impl/ExoMBeanInfoBuilder.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -18,12 +18,12 @@ */ package org.exoplatform.management.jmx.impl; +import org.exoplatform.container.management.MetaDataBuilder; import org.exoplatform.management.annotations.ImpactType; import org.exoplatform.management.spi.ManagedMethodMetaData; import org.exoplatform.management.spi.ManagedMethodParameterMetaData; import org.exoplatform.management.spi.ManagedPropertyMetaData; import org.exoplatform.management.spi.ManagedTypeMetaData; -import org.exoplatform.container.management.MetaDataBuilder; import java.lang.reflect.Method; import java.util.ArrayList; @@ -154,7 +154,8 @@ for (ManagedMethodMetaData methodMD : typeMD.getMethods()) { ModelMBeanOperationInfo operationInfo = - buildOperationInfo(methodMD.getMethod(), methodMD.getDescription(), Role.OP, methodMD.getParameters(), methodMD.getImpact()); + buildOperationInfo(methodMD.getMethod(), methodMD.getDescription(), Role.OP, + methodMD.getParameters(), methodMD.getImpact()); operations.add(operationInfo); } Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/jmx/impl/JMXManagementProvider.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/jmx/impl/JMXManagementProvider.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/jmx/impl/JMXManagementProvider.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -76,7 +76,8 @@ } catch (Exception e) { - LOG.warn("Could not create the ExoModelMBean for the class " + (context == null ? null : (context.getResource() == null ? null : context.getResource().getClass())), e); + LOG.warn("Could not create the ExoModelMBean for the class " + + (context == null ? null : (context.getResource() == null ? null : context.getResource().getClass())), e); } // Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/xml/object/XMLObject.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/xml/object/XMLObject.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/xml/object/XMLObject.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -19,6 +19,8 @@ package org.exoplatform.xml.object; import org.exoplatform.commons.utils.SecurityHelper; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import org.jibx.runtime.BindingDirectory; import org.jibx.runtime.IBindingFactory; import org.jibx.runtime.IMarshallingContext; @@ -45,6 +47,12 @@ */ public class XMLObject { + + /** + * The logger + */ + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.xml.object.XMLObject"); + public static String CURRENT_VERSION = "1.0"; static Map cacheFields_ = new HashMap(); @@ -180,7 +188,7 @@ } catch (Exception ex) { - System.err.println("ERROR: Cannot set field: " + xmlfield.getName() + " of " + type); + LOG.error("ERROR: Cannot set field: " + xmlfield.getName() + " of " + type, ex); throw ex; } } Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCComponentAdapter.java =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCComponentAdapter.java 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCComponentAdapter.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -41,7 +41,8 @@ * @author <a href="mailto:ajustin@redhat.com">Ales Justin</a> * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class MCComponentAdapter implements ComponentAdapter +public class MCComponentAdapter + implements ComponentAdapter { /** * Kernel controller retrieved from associated mc kernel. @@ -75,8 +76,8 @@ * @param delegate original component adapter * @param interceptMC mc-integration configuration in the form of annotation */ - public MCComponentAdapter(KernelController controller, ComponentAdapter delegate, - InterceptMC interceptMC, AbstractBeanMetaData data) + public MCComponentAdapter(KernelController controller, ComponentAdapter delegate, InterceptMC interceptMC, + AbstractBeanMetaData data) { if (controller == null) { @@ -128,7 +129,8 @@ * @throws PicoInitializationException * @throws PicoIntrospectionException */ - public Object getComponentInstance(PicoContainer container) throws PicoInitializationException, PicoIntrospectionException + public Object getComponentInstance(PicoContainer container) throws PicoInitializationException, + PicoIntrospectionException { Object target = lastComponentInstance; if (target != null) @@ -163,7 +165,8 @@ } if (ctrl.getStates().isBeforeState(ctx.getState(), ControllerState.INSTALLED)) { - throw new IllegalArgumentException("Missing some dependency: " + ctx.getDependencyInfo().getUnresolvedDependencies(null)); + throw new IllegalArgumentException("Missing some dependency: " + + ctx.getDependencyInfo().getUnresolvedDependencies(null)); } target = ctx.getTarget(); @@ -172,7 +175,8 @@ } catch (Throwable ex) { - throw new RuntimeException("Failed to perform MC interception on component: " + delegate.getComponentImplementation(), ex); + throw new RuntimeException("Failed to perform MC interception on component: " + + delegate.getComponentImplementation(), ex); } } @@ -188,11 +192,11 @@ switch (mode) { - case ALL: + case ALL : return BeanAccessMode.ALL; - case FIELDS: + case FIELDS : return BeanAccessMode.FIELDS; - default: + default : return BeanAccessMode.STANDARD; } } 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 2011-04-28 12:36:25 UTC (rev 4327) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/src/main/java/org/exoplatform/container/mc/impl/MCIntConfig.java 2011-04-28 13:23:28 UTC (rev 4328) @@ -53,7 +53,8 @@ * <annotation&gt;(a)org.exoplatform.container.mc.impl.InterceptMC&lt;/annotation&gt; * </bean> * <bean name="InjectingBean2"> - * <annotation&gt;(a)org.exoplatform.container.mc.impl.InterceptMC(injectionMode=org.exoplatform.container.mc.impl.MCInjectionMode.STANDARD)&lt;/annotation&gt; + * <annotation&gt;(a)org.exoplatform.container.mc.impl.InterceptMC(injectionMode= + * org.exoplatform.container.mc.impl.MCInjectionMode.STANDARD)</annotation> * </bean> * </pre> * <p>