[exo-jcr-commits] exo-jcr SVN: r5657 - in core/branches/2.5.x: exo.core.component.document/src/main/java/org/exoplatform/services/document/impl and 8 other directories.

Author: andrew.plotnikov Date: 2012-02-17 03:47:58 -0500 (Fri, 17 Feb 2012) New Revision: 5657 Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/DAO.java core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/ReflectionUtil.java core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLDAO.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSOutlookDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/XMLDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/AddDeltaImpl.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ChangeDeltaImpl.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeleteDeltaImpl.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeltaImpl.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/image/ImageProcessingServiceImpl.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipTypeDAOImpl.java core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/DigestPasswordEncrypter.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java Log: EXOJCR-1760: Fixed the Blocker/Critical violations and the easiest Major ones raised by eXo Quality Level 1.2 Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/DAO.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/DAO.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/DAO.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -38,7 +38,7 @@ /** * Logger. */ - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.database.DAO"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.database.DAO"); protected ExoDatasource eXoDS_; Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/ReflectionUtil.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/ReflectionUtil.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/ReflectionUtil.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -33,7 +33,7 @@ public class ReflectionUtil { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.database.ReflectionUtil"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.database.ReflectionUtil"); public final static void setValue(Object bean, Field field, Object value) throws Exception { Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLDAO.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLDAO.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLDAO.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -66,14 +66,18 @@ public void update(List<T> list) throws Exception { if (list == null) - throw new Exception("The given beans null "); + { + throw new IllegalStateException("The given beans null "); + } if (list.size() < 1) + { return; + } for (T bean : list) { if (bean.getDBObjectId() < 0) { - throw new Exception("The given bean " + bean.getClass() + " doesn't have an id"); + throw new IllegalStateException("The given bean " + bean.getClass() + " doesn't have an id"); } } execute(eXoDS_.getQueryBuilder().createUpdateQuery(type_), list); @@ -89,13 +93,19 @@ public void save(List<T> list) throws Exception { if (list == null) - throw new Exception("The given beans null "); + { + throw new IllegalStateException("The given beans null "); + } if (list.size() < 1) + { return; + } for (T bean : list) { if (bean.getDBObjectId() != -1) + { continue; + } bean.setDBObjectId(eXoDS_.getIDGenerator().generateLongId(bean)); } execute(eXoDS_.getQueryBuilder().createInsertQuery(type_), list); Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -40,7 +40,7 @@ public class HTMLDocumentReader extends BaseDocumentReader { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.HTMLDocumentReader"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.HTMLDocumentReader"); /** * Initializes a newly created object for text/html files format parsing. Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -46,7 +46,7 @@ public class MSExcelDocumentReader extends BaseDocumentReader { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.MSExcelDocumentReader"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.MSExcelDocumentReader"); private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSSZ"; Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSOutlookDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSOutlookDocumentReader.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSOutlookDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -37,7 +37,7 @@ public class MSOutlookDocumentReader extends BaseDocumentReader { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.MSOutlookDocumentReader"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.MSOutlookDocumentReader"); /** * Get the application/msword mime type. Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -40,7 +40,7 @@ public class MSWordDocumentReader extends BaseDocumentReader { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.MSWordDocumentReader"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.MSWordDocumentReader"); /** * Get the application/msword mime type. Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -49,7 +49,7 @@ public class MSXExcelDocumentReader extends BaseDocumentReader { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.MSXExcelDocumentReader"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.MSXExcelDocumentReader"); private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSSZ"; Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -48,7 +48,7 @@ public class MSXPPTDocumentReader extends BaseDocumentReader { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.MSXPPTDocumentReader"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.MSXPPTDocumentReader"); /** * @see org.exoplatform.services.document.DocumentReader#getMimeTypes() Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -44,7 +44,7 @@ public class MSXWordDocumentReader extends BaseDocumentReader { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.MSXWordDocumentReader"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.MSXWordDocumentReader"); /** * @see org.exoplatform.services.document.DocumentReader#getMimeTypes() Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -51,8 +51,7 @@ public class OpenOfficeDocumentReader extends BaseDocumentReader { - private static final Log LOG = ExoLogger - .getLogger("org.exoplatform.services.document.impl.OpenOfficeDocumentReader"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.OpenOfficeDocumentReader"); /* * (non-Javadoc) Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -52,7 +52,7 @@ public class POIPropertiesReader { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.POIPropertiesReader"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.POIPropertiesReader"); private final Properties props = new Properties(); Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -38,7 +38,7 @@ public class PPTDocumentReader extends BaseDocumentReader { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.PPTDocumentReader"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.PPTDocumentReader"); /** * Get the application/powerpoint mime type. Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -38,7 +38,7 @@ public class TextPlainDocumentReader extends BaseDocumentReader { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.TextPlainDocumentReader"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.TextPlainDocumentReader"); public static final String DEFAULT_ENCODING = "defaultEncoding"; Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/XMLDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/XMLDocumentReader.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/XMLDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -45,7 +45,7 @@ public class XMLDocumentReader extends BaseDocumentReader { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.XMLDocumentReader"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.XMLDocumentReader"); /** * Get the text/xml, application/xml, application/x-google-gadget mime types. Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/AddDeltaImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/AddDeltaImpl.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/AddDeltaImpl.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -50,7 +50,7 @@ { if (original.first() > target.size()) { - throw new Exception("original.first() > target.size()"); + throw new IllegalStateException("original.first() > target.size()"); } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ChangeDeltaImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ChangeDeltaImpl.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ChangeDeltaImpl.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -49,11 +49,11 @@ { if (!original.verify(target)) { - throw new Exception(); + throw new IllegalStateException("target isn't correct"); } if (original.first() > target.size()) { - throw new Exception("original.first() > target.size()"); + throw new IllegalStateException("original.first() > target.size()"); } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeleteDeltaImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeleteDeltaImpl.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeleteDeltaImpl.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -49,7 +49,7 @@ { if (!original.verify(target)) { - throw new Exception(); + throw new IllegalStateException("target isn't correct"); } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeltaImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeltaImpl.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeltaImpl.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -41,7 +41,7 @@ public abstract class DeltaImpl implements Delta { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.diff.DeltaImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.DeltaImpl"); protected Chunk original; Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -37,7 +37,7 @@ public class ToStringImpl implements ToString { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.diff.ToStringImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.ToStringImpl"); public ToStringImpl() { Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/image/ImageProcessingServiceImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/image/ImageProcessingServiceImpl.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/image/ImageProcessingServiceImpl.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -31,8 +31,7 @@ public class ImageProcessingServiceImpl implements ImageProcessingService { - private static final Log LOG = ExoLogger - .getLogger("org.exoplatform.services.document.impl.image.ImageProcessingServiceImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.ImageProcessingServiceImpl"); public BufferedImage createCroppedImage(BufferedImage img, int chosenWidth, int chosenHeight) { Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -53,7 +53,7 @@ public class TikaDocumentReader implements AdvancedDocumentReader { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.tika.TikaDocumentReader"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.document.TikaDocumentReader"); /** * Since Tika can not extract metadata without extracting document content, Modified: core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -58,7 +58,7 @@ public class CacheHandler { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.organization.CacheHandler"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.api.CacheHandler"); public static final String MEMBERSHIPTYPE_PREFIX = "mt="; Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -327,7 +327,7 @@ @SuppressWarnings("unchecked") public void addMembershipEventListener(MembershipEventListener listener) { - throw new RuntimeException("This method is not supported anymore, please use the new api"); + throw new UnsupportedOperationException("This method is not supported anymore, please use the new api"); } /** @@ -335,6 +335,6 @@ */ public void removeMembershipEventListener(MembershipEventListener listener) { - throw new RuntimeException("This method is not supported anymore, please use the new api"); + throw new UnsupportedOperationException("This method is not supported anymore, please use the new api"); } } Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipTypeDAOImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipTypeDAOImpl.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipTypeDAOImpl.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -124,7 +124,7 @@ */ public void addMembershipTypeEventListener(MembershipTypeEventListener listener) { - throw new RuntimeException("This method is not supported anymore, please use the new api"); + throw new UnsupportedOperationException("This method is not supported anymore, please use the new api"); } /** @@ -132,6 +132,6 @@ */ public void removeMembershipTypeEventListener(MembershipTypeEventListener listener) { - throw new RuntimeException("This method is not supported anymore, please use the new api"); + throw new UnsupportedOperationException("This method is not supported anymore, please use the new api"); } } Modified: core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -45,7 +45,7 @@ { private static final Log LOG = ExoLogger - .getLogger("org.exoplatform.services.organization.ldap.OrganizationLdapInitializer"); + .getLogger("exo.core.component.organization.ldap.OrganizationLdapInitializer"); protected static Pattern COMPACT_DN = Pattern.compile("\\b\\p{Space}*=\\p{Space}*", Pattern.CASE_INSENSITIVE); Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/DigestPasswordEncrypter.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/DigestPasswordEncrypter.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/DigestPasswordEncrypter.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -38,7 +38,7 @@ public class DigestPasswordEncrypter implements PasswordEncrypter { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.security.DigestPasswordEncrypter"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.security.core.DigestPasswordEncrypter"); final private int HASH_HEX_LENGTH = 32; Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java 2012-02-16 16:07:42 UTC (rev 5656) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java 2012-02-17 08:47:58 UTC (rev 5657) @@ -114,13 +114,14 @@ container = RootContainer.getInstance().getPortalContainer(portalContainerName); if (container == null) { - throw new Exception("The eXo container is null, because the current container is a RootContainer " - + "and there is no PortalContainer with the name '" + portalContainerName + "'."); + throw new IllegalStateException( + "The eXo container is null, because the current container is a RootContainer " + + "and there is no PortalContainer with the name '" + portalContainerName + "'."); } } else if (container == null) { - throw new Exception("The eXo container is null, because the current container is null."); + throw new IllegalStateException("The eXo container is null, because the current container is null."); } return container; }