[exo-jcr-commits] exo-jcr SVN: r5656 - in kernel/branches/2.4.x: exo.kernel.commons/src/main/java/org/exoplatform/commons/utils and 11 other directories.

Author: andrew.plotnikov Date: 2012-02-16 11:07:42 -0500 (Thu, 16 Feb 2012) New Revision: 5656 Modified: kernel/branches/2.4.x/exo.kernel.commons.test/src/main/java/org/exoplatform/commons/test/TestSecurityManager.java kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/debug/ObjectDebuger.java kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/IdentifierUtil.java kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/LazyList.java kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/exception/ExoServiceException.java kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/idgenerator/impl/IDGeneratorServiceImpl.java kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/jdbc/impl/ManagedDataSource.java kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/client/http/ClientTypeMap.java kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagementContextImpl.java kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/MemoryInfo.java kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/xml/object/XMLObject.java Log: EXOJCR-1760: Fixed the Blocker/Critical violations and the easiest Major ones raised by eXo Quality Level 1.2 Modified: kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/debug/ObjectDebuger.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/debug/ObjectDebuger.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/debug/ObjectDebuger.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -39,7 +39,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.commons.debug.ObjectDebuger"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.commons.ObjectDebuger"); static public void printObject(Object o) throws Exception { Modified: kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/IdentifierUtil.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/IdentifierUtil.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/IdentifierUtil.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -37,7 +37,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.commons.utils.IdentifierUtil"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.commons.IdentifierUtil"); private static String hexServerIP_ = null; Modified: kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/LazyList.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/LazyList.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/LazyList.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -54,7 +54,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.commons.utils.LazyList"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.commons.LazyList"); /** The batch size. */ private final int batchSize; Modified: kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -36,7 +36,7 @@ public class MimeTypeResolver { - protected static final Log LOG = ExoLogger.getLogger("org.exoplatform.commons.utils.MimeTypeResolver"); + protected static final Log LOG = ExoLogger.getLogger("exo.kernel.commons.MimeTypeResolver"); static { SecurityHelper.doPrivilegedAction(new PrivilegedAction<Void>() Modified: kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -22,7 +22,6 @@ import java.io.IOException; import java.net.MalformedURLException; -import java.security.AccessControlException; import java.security.AccessController; import java.security.Permission; import java.security.PrivilegedAction; @@ -322,8 +321,6 @@ /** * Validate permissions. - * - * @throws AccessControlException */ public static void validateSecurityPermission(Permission permission) { Modified: kernel/branches/2.4.x/exo.kernel.commons.test/src/main/java/org/exoplatform/commons/test/TestSecurityManager.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.commons.test/src/main/java/org/exoplatform/commons/test/TestSecurityManager.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.commons.test/src/main/java/org/exoplatform/commons/test/TestSecurityManager.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -138,8 +138,9 @@ } catch (Exception e) { - // ignore me + return null; } + if (is != null) { try @@ -167,10 +168,11 @@ } catch (IOException e) { - // ignore me + e.printStackTrace(); //NOSONAR } - } + } } + return null; } } Modified: kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -48,7 +48,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.compress.CompressData"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.common.CompressData"); private String base_; Modified: kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/exception/ExoServiceException.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/exception/ExoServiceException.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/exception/ExoServiceException.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -32,7 +32,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.exception.ExoServiceException"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.common.ExoServiceException"); protected Object[] params_; Modified: kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/idgenerator/impl/IDGeneratorServiceImpl.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/idgenerator/impl/IDGeneratorServiceImpl.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/idgenerator/impl/IDGeneratorServiceImpl.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -36,7 +36,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.idgenerator.impl.IDGeneratorServiceImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.common.IDGeneratorServiceImpl"); private static String hexServerIP_ = null; Modified: kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/jdbc/impl/ManagedDataSource.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/jdbc/impl/ManagedDataSource.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/jdbc/impl/ManagedDataSource.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -42,7 +42,7 @@ */ public class ManagedDataSource implements DataSource { - private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ManagedDataSource"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.common.ManagedDataSource"); /** * The transaction manager Modified: kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -58,7 +58,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.naming.SimpleContext"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.common.SimpleContext"); private static final NameParser NAME_PARSER = new SimpleNameParser(); Modified: kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -66,7 +66,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.container.StandaloneContainer"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.StandaloneContainer"); private static final long serialVersionUID = 12L; Modified: kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/client/http/ClientTypeMap.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/client/http/ClientTypeMap.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/client/http/ClientTypeMap.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -26,7 +26,6 @@ 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; @@ -52,7 +51,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.container.client.http.ClientTypeMap"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.ClientTypeMap"); private ArrayList<HttpClientType> clientList_; Modified: kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -59,7 +59,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.container.management.ManageableContainer"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.ManageableContainer"); private static MBeanServer findMBeanServer() { Modified: kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagementContextImpl.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagementContextImpl.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagementContextImpl.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -48,7 +48,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.container.management.ManagementContextImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.ManagementContextImpl"); /** . */ private final Map<Class<?>, Object> scopingDataList; Modified: kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/MemoryInfo.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/MemoryInfo.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/MemoryInfo.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -35,7 +35,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.container.monitor.jvm.MemoryInfo"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.MemoryInfo"); private MemoryMXBean mxbean_; Modified: kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/xml/object/XMLObject.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/xml/object/XMLObject.java 2012-02-16 16:02:19 UTC (rev 5655) +++ kernel/branches/2.4.x/exo.kernel.container/src/main/java/org/exoplatform/xml/object/XMLObject.java 2012-02-16 16:07:42 UTC (rev 5656) @@ -51,7 +51,7 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.xml.object.XMLObject"); + private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.XMLObject"); public static String CURRENT_VERSION = "1.0";