[exo-jcr-commits] exo-jcr SVN: r5658 - in core/trunk: exo.core.component.document/src/main/java/org/exoplatform/services/document/impl and 8 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Feb 17 04:05:31 EST 2012
Author: andrew.plotnikov
Date: 2012-02-17 04:05:27 -0500 (Fri, 17 Feb 2012)
New Revision: 5658
Modified:
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/DAO.java
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ReflectionUtil.java
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLDAO.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSOutlookDocumentReader.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/XMLDocumentReader.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/AddDeltaImpl.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ChangeDeltaImpl.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeleteDeltaImpl.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeltaImpl.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/image/ImageProcessingServiceImpl.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java
core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipTypeDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/DigestPasswordEncrypter.java
core/trunk/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/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/DAO.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/DAO.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/DAO.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ReflectionUtil.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ReflectionUtil.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ReflectionUtil.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLDAO.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLDAO.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLDAO.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -66,9 +66,13 @@
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)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSOutlookDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSOutlookDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSOutlookDocumentReader.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/XMLDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/XMLDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/XMLDocumentReader.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/AddDeltaImpl.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/AddDeltaImpl.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/AddDeltaImpl.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ChangeDeltaImpl.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ChangeDeltaImpl.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ChangeDeltaImpl.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeleteDeltaImpl.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeleteDeltaImpl.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeleteDeltaImpl.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -49,7 +49,7 @@
{
if (!original.verify(target))
{
- throw new Exception();
+ throw new IllegalStateException("target isn't correct");
}
}
Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeltaImpl.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeltaImpl.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeltaImpl.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/image/ImageProcessingServiceImpl.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/image/ImageProcessingServiceImpl.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/image/ImageProcessingServiceImpl.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java
===================================================================
--- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipTypeDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipTypeDAOImpl.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipTypeDAOImpl.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/DigestPasswordEncrypter.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/DigestPasswordEncrypter.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/DigestPasswordEncrypter.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java 2012-02-17 08:47:58 UTC (rev 5657)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java 2012-02-17 09:05:27 UTC (rev 5658)
@@ -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;
}
More information about the exo-jcr-commits
mailing list