February 2012 - exo-jcr-commits - Jboss List Archives

exo-jcr SVN: r5658 - in core/trunk: exo.core.component.document/src/main/java/org/exoplatform/services/document/impl and 8 other directories.

by do-not-reply＠jboss.org

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; }

12 years, 3 months

1
0
0 / 0

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.

by do-not-reply＠jboss.org

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; }

12 years, 3 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

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";

12 years, 3 months

1
0
0 / 0

exo-jcr SVN: r5655 - in kernel/trunk: exo.kernel.commons/src/main/java/org/exoplatform/commons/utils and 11 other directories.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2012-02-16 11:02:19 -0500 (Thu, 16 Feb 2012) New Revision: 5655 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/MimeTypeResolver.java kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.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/jdbc/impl/ManagedDataSource.java kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.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/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/monitor/jvm/MemoryInfo.java kernel/trunk/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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/debug/ObjectDebuger.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/IdentifierUtil.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/LazyList.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.commons.test/src/main/java/org/exoplatform/commons/test/TestSecurityManager.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/exception/ExoServiceException.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/idgenerator/impl/IDGeneratorServiceImpl.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/jdbc/impl/ManagedDataSource.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/jdbc/impl/ManagedDataSource.java 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/jdbc/impl/ManagedDataSource.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/client/http/ClientTypeMap.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagementContextImpl.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/MemoryInfo.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -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/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 2012-02-16 14:40:16 UTC (rev 5654) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/xml/object/XMLObject.java 2012-02-16 16:02:19 UTC (rev 5655) @@ -50,7 +50,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";

12 years, 3 months

1
0
0 / 0

exo-jcr SVN: r5654 - in jcr/trunk/exo.jcr.component.core/src: test/java/org/exoplatform/services/jcr/impl and 1 other directory.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2012-02-16 09:40:16 -0500 (Thu, 16 Feb 2012) New Revision: 5654 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java Log: EXOJCR-1755: Improved queries for repository checking consistency Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2012-02-16 14:31:09 UTC (rev 5653) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2012-02-16 14:40:16 UTC (rev 5654) @@ -76,12 +76,14 @@ queries.add(new InspectionQuery(jdbcDataContainer.multiDb ? "select * from JCR_MITEM N where N.I_CLASS=1 and NOT EXISTS " - + "(select * from JCR_MITEM P where P.I_CLASS=2 and P.PARENT_ID=N.ID)" + + "(select * from JCR_MITEM P where P.I_CLASS=2 and P.PARENT_ID=N.ID " + + "and P.NAME='[http://www.jcp.org/jcr/1.0]primaryType')" : "select * from JCR_SITEM N where N.CONTAINER_NAME='" + jdbcDataContainer.containerName + "' and N.I_CLASS=1 and NOT EXISTS (select * from JCR_SITEM P " - + "where P.I_CLASS=2 and P.PARENT_ID=N.ID and P.CONTAINER_NAME='" + jdbcDataContainer.containerName + "')", - new String[]{DBConstants.COLUMN_ID, DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, - "Nodes that do not have at least one property", InspectionStatus.ERR)); + + "where P.I_CLASS=2 and P.PARENT_ID=N.ID and P.NAME='[http://www.jcp.org/jcr/1.0]primaryType' " + + "and P.CONTAINER_NAME='" + jdbcDataContainer.containerName + "')", new String[]{DBConstants.COLUMN_ID, + DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, + "Nodes that do not have at least one jcr:primaryType property", InspectionStatus.ERR)); queries .add(new InspectionQuery(jdbcDataContainer.multiDb Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java 2012-02-16 14:31:09 UTC (rev 5653) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java 2012-02-16 14:40:16 UTC (rev 5654) @@ -745,6 +745,7 @@ public void testDBUsecasesNodeHasNoPropertiesSingleDB() throws Exception { checkDBUsecasesNodeHasNoProperties(helper.createRepository(container, false, false)); + checkDBUsecasesNodeHasPrimaryTypeProperties(helper.createRepository(container, false, false)); } /** @@ -753,6 +754,7 @@ public void testDBUsecasesNodeHasNoPropertiesMultiDB() throws Exception { checkDBUsecasesNodeHasNoProperties(helper.createRepository(container, true, false)); + checkDBUsecasesNodeHasPrimaryTypeProperties(helper.createRepository(container, false, false)); } private void checkDBUsecasesNodeHasNoProperties(ManageableRepository repository) throws Exception @@ -802,6 +804,56 @@ checkController.getLastLogFile().delete(); } + private void checkDBUsecasesNodeHasPrimaryTypeProperties(ManageableRepository repository) throws Exception + { + // create repository and add node + SessionImpl session = + (SessionImpl)repository.login(credentials, repository.getConfiguration().getSystemWorkspaceName()); + NodeImpl node = (NodeImpl)session.getRootNode().addNode("testNode"); + session.save(); + + PropertyIterator iter = node.getProperties(); + + // repository is consistent + checkController = new RepositoryCheckController(repository); + assertTrue(checkController.checkRepositoryDataBaseConsistency().startsWith("Repository data is consistent")); + checkController.getLastLogFile().delete(); + + WorkspaceEntry wsEntry = repository.getConfiguration().getWorkspaceEntries().get(0); + boolean isMultiDb = wsEntry.getContainer().getParameterBoolean(JDBCWorkspaceDataContainer.MULTIDB); + + // remove all properties + String sourceName = wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME); + + Connection conn = ((DataSource)new InitialContext().lookup(sourceName)).getConnection(); + while (iter.hasNext()) + { + PropertyImpl prop = (PropertyImpl)iter.nextProperty(); + + if (!prop.getName().equals("jcr:primaryType")) + { + conn.prepareStatement( + "DELETE FROM JCR_" + (isMultiDb ? "M" : "S") + "VALUE WHERE PROPERTY_ID = '" + + (isMultiDb ? "" : wsEntry.getName()) + prop.getInternalIdentifier() + "'").execute(); + + conn.prepareStatement( + "DELETE FROM JCR_" + (isMultiDb ? "M" : "S") + "ITEM WHERE ID = '" + + (isMultiDb ? "" : wsEntry.getName()) + prop.getInternalIdentifier() + "'").execute(); + } + } + + conn.commit(); + conn.close(); + + assertTrue(node.getProperties().hasNext()); + + session.logout(); + + // repository is inconsistent + assertTrue(checkController.checkRepositoryDataBaseConsistency().startsWith("Repository data is consistent")); + checkController.getLastLogFile().delete(); + } + /** * Usescase when STORAGE_DESC field in JCR_SVALUE table is not empty but there is no file in the value storage. */

12 years, 3 months

1
0
0 / 0

exo-jcr SVN: r5653 - in jcr/branches/1.15.x/exo.jcr.component.core/src: test/java/org/exoplatform/services/jcr/impl and 1 other directory.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2012-02-16 09:31:09 -0500 (Thu, 16 Feb 2012) New Revision: 5653 Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java Log: EXOJCR-1755: Improved queries for repository checking consistency Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2012-02-16 13:49:34 UTC (rev 5652) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2012-02-16 14:31:09 UTC (rev 5653) @@ -76,12 +76,14 @@ queries.add(new InspectionQuery(jdbcDataContainer.multiDb ? "select * from JCR_MITEM N where N.I_CLASS=1 and NOT EXISTS " - + "(select * from JCR_MITEM P where P.I_CLASS=2 and P.PARENT_ID=N.ID)" + + "(select * from JCR_MITEM P where P.I_CLASS=2 and P.PARENT_ID=N.ID " + + "and P.NAME='[http://www.jcp.org/jcr/1.0]primaryType')" : "select * from JCR_SITEM N where N.CONTAINER_NAME='" + jdbcDataContainer.containerName + "' and N.I_CLASS=1 and NOT EXISTS (select * from JCR_SITEM P " - + "where P.I_CLASS=2 and P.PARENT_ID=N.ID and P.CONTAINER_NAME='" + jdbcDataContainer.containerName + "')", - new String[]{DBConstants.COLUMN_ID, DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, - "Nodes that do not have at least one property", InspectionStatus.ERR)); + + "where P.I_CLASS=2 and P.PARENT_ID=N.ID and P.NAME='[http://www.jcp.org/jcr/1.0]primaryType' " + + "and P.CONTAINER_NAME='" + jdbcDataContainer.containerName + "')", new String[]{DBConstants.COLUMN_ID, + DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, + "Nodes that do not have at least one jcr:primaryType property", InspectionStatus.ERR)); queries .add(new InspectionQuery(jdbcDataContainer.multiDb Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java 2012-02-16 13:49:34 UTC (rev 5652) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java 2012-02-16 14:31:09 UTC (rev 5653) @@ -746,6 +746,7 @@ public void testDBUsecasesNodeHasNoPropertiesSingleDB() throws Exception { checkDBUsecasesNodeHasNoProperties(helper.createRepository(container, false, false)); + checkDBUsecasesNodeHasPrimaryTypeProperties(helper.createRepository(container, false, false)); } /** @@ -754,6 +755,7 @@ public void testDBUsecasesNodeHasNoPropertiesMultiDB() throws Exception { checkDBUsecasesNodeHasNoProperties(helper.createRepository(container, true, false)); + checkDBUsecasesNodeHasPrimaryTypeProperties(helper.createRepository(container, false, false)); } private void checkDBUsecasesNodeHasNoProperties(ManageableRepository repository) throws Exception @@ -766,7 +768,6 @@ PropertyIterator iter = node.getProperties(); - // repository is consistent checkController = new RepositoryCheckController(repository); assertTrue(checkController.checkRepositoryDataBaseConsistency().startsWith("Repository data is consistent")); @@ -803,6 +804,56 @@ checkController.getLastLogFile().delete(); } + private void checkDBUsecasesNodeHasPrimaryTypeProperties(ManageableRepository repository) throws Exception + { + // create repository and add node + SessionImpl session = + (SessionImpl)repository.login(credentials, repository.getConfiguration().getSystemWorkspaceName()); + NodeImpl node = (NodeImpl)session.getRootNode().addNode("testNode"); + session.save(); + + PropertyIterator iter = node.getProperties(); + + // repository is consistent + checkController = new RepositoryCheckController(repository); + assertTrue(checkController.checkRepositoryDataBaseConsistency().startsWith("Repository data is consistent")); + checkController.getLastLogFile().delete(); + + WorkspaceEntry wsEntry = repository.getConfiguration().getWorkspaceEntries().get(0); + boolean isMultiDb = wsEntry.getContainer().getParameterBoolean(JDBCWorkspaceDataContainer.MULTIDB); + + // remove all properties + String sourceName = wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME); + + Connection conn = ((DataSource)new InitialContext().lookup(sourceName)).getConnection(); + while (iter.hasNext()) + { + PropertyImpl prop = (PropertyImpl)iter.nextProperty(); + + if (!prop.getName().equals("jcr:primaryType")) + { + conn.prepareStatement( + "DELETE FROM JCR_" + (isMultiDb ? "M" : "S") + "VALUE WHERE PROPERTY_ID = '" + + (isMultiDb ? "" : wsEntry.getName()) + prop.getInternalIdentifier() + "'").execute(); + + conn.prepareStatement( + "DELETE FROM JCR_" + (isMultiDb ? "M" : "S") + "ITEM WHERE ID = '" + + (isMultiDb ? "" : wsEntry.getName()) + prop.getInternalIdentifier() + "'").execute(); + } + } + + conn.commit(); + conn.close(); + + assertTrue(node.getProperties().hasNext()); + + session.logout(); + + // repository is inconsistent + assertTrue(checkController.checkRepositoryDataBaseConsistency().startsWith("Repository data is consistent")); + checkController.getLastLogFile().delete(); + } + /** * Usescase when STORAGE_DESC field in JCR_SVALUE table is not empty but there is no file in the value storage. */

12 years, 3 months

1
0
0 / 0

exo-jcr SVN: r5652 - jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/cache/jbosscache.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2012-02-16 08:49:34 -0500 (Thu, 16 Feb 2012) New Revision: 5652 Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/cache/jbosscache/TestJBossCacheWorkspaceStorageCache.java Log: EXOJCR-1757 : Probelm with deadlock in test TestJBossCacheWorkspaceStorageCache was fixed. Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/cache/jbosscache/TestJBossCacheWorkspaceStorageCache.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/cache/jbosscache/TestJBossCacheWorkspaceStorageCache.java 2012-02-16 11:17:42 UTC (rev 5651) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/cache/jbosscache/TestJBossCacheWorkspaceStorageCache.java 2012-02-16 13:49:34 UTC (rev 5652) @@ -122,8 +122,20 @@ PlainChangesLog chlog = new PlainChangesLogImpl(); chlog.add(ItemState.createAddedState(new PersistedNodeData(idNode, Constants.ROOT_PATH, "parent-id", 1, 0, Constants.NT_UNSTRUCTURED, null, null))); + + if (mode == Mode.READ_FIRST) + { + try + { + goSignal.await(); + } + catch (InterruptedException e) + { + Thread.currentThread().interrupt(); + } + } + cwdm.save(chlog); - if (mode == Mode.WRITE_FIRST) goSignal.countDown(); } catch (Exception e) { @@ -131,6 +143,7 @@ } finally { + if (mode == Mode.WRITE_FIRST) goSignal.countDown(); doneSignal.countDown(); } } @@ -144,7 +157,6 @@ { startSignal.await(); cwdm.getItemData(idNode); - if (mode == Mode.READ_FIRST) goSignal.countDown(); } catch (Exception e) { @@ -152,6 +164,7 @@ } finally { + if (mode == Mode.READ_FIRST) goSignal.countDown(); doneSignal.countDown(); } } @@ -196,17 +209,6 @@ public void commit() throws IllegalStateException, RepositoryException { - if (mode == Mode.READ_FIRST) - { - try - { - goSignal.await(); - } - catch (InterruptedException e) - { - Thread.currentThread().interrupt(); - } - } } public void delete(NodeData data) throws RepositoryException, UnsupportedOperationException,

12 years, 3 months

1
0
0 / 0

exo-jcr SVN: r5651 - jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/cache/jbosscache.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2012-02-16 06:17:42 -0500 (Thu, 16 Feb 2012) New Revision: 5651 Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/cache/jbosscache/TestJBossCacheWorkspaceStorageCache.java Log: EXOJCR-1757 : Probelm with deadlock in test TestJBossCacheWorkspaceStorageCache was fixed. Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/cache/jbosscache/TestJBossCacheWorkspaceStorageCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/cache/jbosscache/TestJBossCacheWorkspaceStorageCache.java 2012-02-16 11:10:11 UTC (rev 5650) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/cache/jbosscache/TestJBossCacheWorkspaceStorageCache.java 2012-02-16 11:17:42 UTC (rev 5651) @@ -122,8 +122,20 @@ PlainChangesLog chlog = new PlainChangesLogImpl(); chlog.add(ItemState.createAddedState(new PersistedNodeData(idNode, Constants.ROOT_PATH, "parent-id", 1, 0, Constants.NT_UNSTRUCTURED, null, null))); + + if (mode == Mode.READ_FIRST) + { + try + { + goSignal.await(); + } + catch (InterruptedException e) + { + Thread.currentThread().interrupt(); + } + } + cwdm.save(chlog); - if (mode == Mode.WRITE_FIRST) goSignal.countDown(); } catch (Exception e) { @@ -131,6 +143,7 @@ } finally { + if (mode == Mode.WRITE_FIRST) goSignal.countDown(); doneSignal.countDown(); } } @@ -144,7 +157,6 @@ { startSignal.await(); cwdm.getItemData(idNode); - if (mode == Mode.READ_FIRST) goSignal.countDown(); } catch (Exception e) { @@ -152,6 +164,7 @@ } finally { + if (mode == Mode.READ_FIRST) goSignal.countDown(); doneSignal.countDown(); } } @@ -168,7 +181,6 @@ } private static class MyWorkspaceStorageConnection implements WorkspaceStorageConnection { - private Mode mode; private CountDownLatch goSignal; @@ -197,17 +209,6 @@ public void commit() throws IllegalStateException, RepositoryException { - if (mode == Mode.READ_FIRST) - { - try - { - goSignal.await(); - } - catch (InterruptedException e) - { - Thread.currentThread().interrupt(); - } - } } public void delete(NodeData data) throws RepositoryException, UnsupportedOperationException,

12 years, 3 months

1
0
0 / 0

exo-jcr SVN: r5650 - in jcr/trunk/exo.jcr.component.core/src: test/java/org/exoplatform/services/jcr/impl and 1 other directory.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2012-02-16 06:10:11 -0500 (Thu, 16 Feb 2012) New Revision: 5650 Added: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQuery.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQueryFilteredMultivaluedProperties.java Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java Log: EXOJCR-1755: Improved queries for repository checking consistency Added: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQuery.java (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQuery.java 2012-02-16 11:10:11 UTC (rev 5650) @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2012 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.services.jcr.impl.storage.jdbc; + +import org.exoplatform.services.jcr.impl.InspectionLog.InspectionStatus; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +/** + * @author <a href="mailto:aplotnikov@exoplatform.com">Andrey Plotnikov</a> + * @version $Id: InspectionQuery.java 34360 16.02.2012 andrew.plotnikov $ + */ +class InspectionQuery +{ + /** + * Data class, contains a combination of SQL states, description, field names and status + */ + + /** + * SQL query that must be executed. + */ + public String statement; + + /** + * Inspection query description. + */ + public String description; + + /** + * Field names that must be showed in inspection log if something wrong. + */ + public String[] fieldNames; + + /** + * Corruption status. Is it critical - ERR, or not - WARN. + */ + public InspectionStatus status; + + public InspectionQuery(String statement, String[] fieldNames, String headerMessage, InspectionStatus status) + { + this.statement = statement; + this.description = headerMessage; + this.fieldNames = fieldNames; + this.status = status; + } + + public String getStatement() + { + return statement; + } + + public String getDescription() + { + return description; + } + + public String[] getFieldNames() + { + return fieldNames; + } + + public InspectionStatus getStatus() + { + return status; + } + + /** + * Creates a PreparedStatement object for sending parameterized SQL statements to the database. + * + * @param connection + * connection to workspace storage + * @return + * a new default PreparedStatement object containing the pre-compiled SQL statement + * @throws SQLException + * if a database access error occurs or this method is called on a closed connection + */ + public PreparedStatement prepareStatement(Connection connection) throws SQLException + { + return connection.prepareStatement(statement); + } + +} Added: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQueryFilteredMultivaluedProperties.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQueryFilteredMultivaluedProperties.java (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQueryFilteredMultivaluedProperties.java 2012-02-16 11:10:11 UTC (rev 5650) @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2012 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.services.jcr.impl.storage.jdbc; + +import org.exoplatform.services.jcr.impl.InspectionLog.InspectionStatus; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +/** + * @author <a href="mailto:aplotnikov@exoplatform.com">Andrey Plotnikov</a> + * @version $Id: InspectionQueryFilteredMultivaluedProperties.java 34360 16.02.2012 andrew.plotnikov $ + */ +class InspectionQueryFilteredMultivaluedProperties extends InspectionQuery +{ + + /** + * {@inheritDoc} + */ + public InspectionQueryFilteredMultivaluedProperties(String statement, String[] fieldNames, String headerMessage, InspectionStatus status) + { + super(statement, fieldNames, headerMessage, status); + } + + /** + * {@inheritDoc} + */ + public PreparedStatement prepareStatement(Connection connection) throws SQLException + { + PreparedStatement preparedStatement = super.prepareStatement(connection); + preparedStatement.setBoolean(1, false); + + return preparedStatement; + } + +} Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2012-02-16 10:59:46 UTC (rev 5649) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2012-02-16 11:10:11 UTC (rev 5650) @@ -64,61 +64,6 @@ public static void checkDB(JDBCWorkspaceDataContainer jdbcDataContainer, InspectionLog inspectionLog) throws RepositoryException, IOException { - - /** - * Data class, contains a combination of SQL states, description, field names and status - */ - class InspectionQuery - { - /** - * SQL query that must be executed. - */ - private final String statement; - - /** - * Inspection query description. - */ - private final String description; - - /** - * Field names that must be showed in inspection log if something wrong. - */ - private final String[] fieldNames; - - /** - * Corruption status. Is it critical - ERR, or not - WARN. - */ - private final InspectionStatus status; - - public InspectionQuery(String statement, String[] fieldNames, String headerMessage, InspectionStatus status) - { - this.statement = statement; - this.description = headerMessage; - this.fieldNames = fieldNames; - this.status = status; - } - - public String getStatement() - { - return statement; - } - - public String getDescription() - { - return description; - } - - public String[] getFieldNames() - { - return fieldNames; - } - - public InspectionStatus getStatus() - { - return status; - } - } - Set<InspectionQuery> queries = new HashSet<InspectionQuery>(); // preload queries @@ -138,23 +83,26 @@ new String[]{DBConstants.COLUMN_ID, DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, "Nodes that do not have at least one property", InspectionStatus.ERR)); - queries.add(new InspectionQuery(jdbcDataContainer.multiDb - ? "select * from JCR_MVALUE V where NOT EXISTS(select * from JCR_MITEM P " - + "where V.PROPERTY_ID = P.ID and P.I_CLASS=2)" - : "select V.* from JCR_SVALUE V, JCR_SITEM I where V.PROPERTY_ID = I.ID and I.CONTAINER_NAME='" - + jdbcDataContainer.containerName + "' and NOT EXISTS(select * from JCR_SITEM P where P.CONTAINER_NAME='" - + jdbcDataContainer.containerName + "' and V.PROPERTY_ID = P.ID and P.I_CLASS=2)", new String[]{ - DBConstants.COLUMN_ID, DBConstants.COLUMN_VPROPERTY_ID}, - "All value records that has not owner-property record", InspectionStatus.ERR)); + queries + .add(new InspectionQuery(jdbcDataContainer.multiDb + ? "select * from JCR_MVALUE V where NOT EXISTS(select * from JCR_MITEM P " + + "where V.PROPERTY_ID = P.ID and P.I_CLASS=2)" + : "select * from JCR_SVALUE V where NOT EXISTS(select * from JCR_SITEM P " + + "where V.PROPERTY_ID = P.ID and P.I_CLASS=2)", new String[]{DBConstants.COLUMN_ID, + DBConstants.COLUMN_VPROPERTY_ID}, "All value records that has not owner-property record", + InspectionStatus.ERR)); + + queries + .add(new InspectionQueryFilteredMultivaluedProperties( + jdbcDataContainer.multiDb + ? "select * from JCR_MITEM P where P.I_CLASS=2 and P.P_MULTIVALUED=? and NOT EXISTS( select * from JCR_MVALUE V " + + "where V.PROPERTY_ID=P.ID)" + : "select * from JCR_SITEM P where P.CONTAINER_NAME='" + + jdbcDataContainer.containerName + + "' and P.I_CLASS=2 and P.P_MULTIVALUED=? and NOT EXISTS( select * from JCR_SVALUE V where V.PROPERTY_ID=P.ID)", + new String[]{DBConstants.COLUMN_ID, DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, + "All properties that have not value record.", InspectionStatus.ERR)); - queries.add(new InspectionQuery(jdbcDataContainer.multiDb - ? "select * from JCR_MITEM P where P.I_CLASS=2 and NOT EXISTS( select * from JCR_MVALUE V " - + "where V.PROPERTY_ID=P.ID)" : "select * from JCR_SITEM P where P.CONTAINER_NAME='" - + jdbcDataContainer.containerName - + "' and P.I_CLASS=2 and NOT EXISTS( select * from JCR_SVALUE V where V.PROPERTY_ID=P.ID)", new String[]{ - DBConstants.COLUMN_ID, DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, - "All properties that have not value record.", InspectionStatus.ERR)); - // The differences in the queries by DB dialect. // Oracle doesn't work correct with default query because empty value stored as null value. String statement; @@ -187,24 +135,17 @@ } queries.add(new InspectionQuery(statement, new String[]{DBConstants.COLUMN_ID}, "Incorrect JCR_VALUE records", InspectionStatus.ERR)); - - queries.add(new InspectionQuery(jdbcDataContainer.multiDb - ? "select * from JCR_MITEM P where P.P_TYPE=9 and NOT EXISTS " - + "(select * from JCR_MREF R where P.ID=R.PROPERTY_ID)" - : "select * from JCR_SITEM P where P.CONTAINER_NAME='" + jdbcDataContainer.containerName - + "' and P.P_TYPE=9 and NOT EXISTS( select * from JCR_SREF R where P.ID=R.PROPERTY_ID)", new String[]{ - DBConstants.COLUMN_ID, DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, - "Reference properties without reference records", InspectionStatus.ERR)); - // properties can refer to missing node. It is possible to perform this usecase via JCR API with no exceptions - queries.add(new InspectionQuery(jdbcDataContainer.multiDb - ? "select * from JCR_MREF R where NOT EXISTS(select * from JCR_MITEM N where R.NODE_ID=N.ID)" - : "select * from JCR_SREF R, JCR_SITEM I where R.PROPERTY_ID = I.ID and I.CONTAINER_NAME='" - + jdbcDataContainer.containerName - + "' and NOT EXISTS(select * from JCR_SITEM N where N.CONTAINER_NAME='" - + jdbcDataContainer.containerName + "' and R.NODE_ID=N.ID)", new String[]{"NODE_ID", "PROPERTY_ID", - DBConstants.COLUMN_VORDERNUM}, - "Reference records that linked to unexisted nodes. Can be normal for some usecases.", InspectionStatus.WARN)); + queries + .add(new InspectionQueryFilteredMultivaluedProperties( + jdbcDataContainer.multiDb + ? "select * from JCR_MITEM P where P.P_TYPE=9 and P.P_MULTIVALUED=? and NOT EXISTS " + + "(select * from JCR_MREF R where P.ID=R.PROPERTY_ID)" + : "select * from JCR_SITEM P where P.CONTAINER_NAME='" + + jdbcDataContainer.containerName + + "' and P.P_TYPE=9 and P.P_MULTIVALUED=? and NOT EXISTS( select * from JCR_SREF R where P.ID=R.PROPERTY_ID)", + new String[]{DBConstants.COLUMN_ID, DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, + "Reference properties without reference records", InspectionStatus.ERR)); // an item is its own parent. queries.add(new InspectionQuery(jdbcDataContainer.multiDb @@ -242,7 +183,8 @@ ResultSet resultSet = null; try { - st = jdbcConn.prepareStatement(query.getStatement()); + st = query.prepareStatement(jdbcConn); + // the result of query is expected to be empty resultSet = st.executeQuery(); if (resultSet.next()) Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java 2012-02-16 10:59:46 UTC (rev 5649) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java 2012-02-16 11:10:11 UTC (rev 5650) @@ -569,64 +569,11 @@ } /** - * Usecase: Reference records that linked to unexisted nodes. Can be normal for some usecases. - */ - public void testDBUsecasesRefPropertiesLinksToUnexistedNodesSingleDB() throws Exception - { - checkDBUsecasesRefPropertiesLinksToUnexistedNodes(helper.createRepository(container, false, false)); - } - - /** - * Usecase: Reference records that linked to unexisted nodes. Can be normal for some usecases. - */ - public void testDBUsecasesRefPropertiesLinksToUnexistedNodesMultiDB() throws Exception - { - checkDBUsecasesRefPropertiesLinksToUnexistedNodes(helper.createRepository(container, true, false)); - } - - private void checkDBUsecasesRefPropertiesLinksToUnexistedNodes(ManageableRepository repository) throws Exception - { - // create repository and add property - SessionImpl session = - (SessionImpl)repository.login(credentials, repository.getConfiguration().getSystemWorkspaceName()); - NodeImpl refNode = (NodeImpl)session.getRootNode().addNode("refNode"); - refNode.addMixin("mix:referenceable"); - NodeImpl node = (NodeImpl)session.getRootNode().addNode("testNode"); - PropertyImpl prop = (PropertyImpl)node.setProperty("refProp", refNode); - session.save(); - session.logout(); - - // repository is consistent - checkController = new RepositoryCheckController(repository); - assertTrue(checkController.checkRepositoryDataBaseConsistency().startsWith("Repository data is consistent")); - checkController.getLastLogFile().delete(); - - WorkspaceEntry wsEntry = repository.getConfiguration().getWorkspaceEntries().get(0); - boolean isMultiDb = wsEntry.getContainer().getParameterBoolean(JDBCWorkspaceDataContainer.MULTIDB); - - // change node id in REF table - String sourceName = wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME); - - Connection conn = ((DataSource)new InitialContext().lookup(sourceName)).getConnection(); - conn.prepareStatement( - "UPDATE JCR_" + (isMultiDb ? "M" : "S") + "REF SET NODE_ID = 'unexisted-id' WHERE PROPERTY_ID = '" - + (isMultiDb ? "" : wsEntry.getName()) + prop.getInternalIdentifier() + "'").execute(); - - conn.commit(); - conn.close(); - - // repository is inconsistent - assertTrue(checkController.checkRepositoryDataBaseConsistency().startsWith( - "Repository data is consistent, except some warnings")); - checkController.getLastLogFile().delete(); - } - - /** * Usecase: value records has no item record. */ public void testDBUsecasesValueRecordHasNoItemRecordSingleDB() throws Exception { - checkDBUsecasesPropertiesHasNoValueRecord(helper.createRepository(container, false, false)); + checkDBUsecasesValueRecordHasNoItemRecord(helper.createRepository(container, false, false)); } /** @@ -678,7 +625,8 @@ */ public void testDBUsecasesPropertiesHasNoValueRecordSingleDB() throws Exception { - checkDBUsecasesPropertiesHasNoValueRecord(helper.createRepository(container, false, false)); + checkDBUsecasesPropertiesHasNoSingleValueRecord(helper.createRepository(container, false, false)); + checkDBUsecasesPropertiesHasEmptyMultiValueRecord(helper.createRepository(container, false, false)); } /** @@ -686,10 +634,11 @@ */ public void testDBUsecasesPropertiesHasNoValueRecordMultiDB() throws Exception { - checkDBUsecasesPropertiesHasNoValueRecord(helper.createRepository(container, true, false)); + checkDBUsecasesPropertiesHasNoSingleValueRecord(helper.createRepository(container, true, false)); + checkDBUsecasesPropertiesHasEmptyMultiValueRecord(helper.createRepository(container, false, false)); } - private void checkDBUsecasesPropertiesHasNoValueRecord(ManageableRepository repository) throws Exception + private void checkDBUsecasesPropertiesHasNoSingleValueRecord(ManageableRepository repository) throws Exception { // create repository and add property SessionImpl session = @@ -722,6 +671,21 @@ checkController.getLastLogFile().delete(); } + private void checkDBUsecasesPropertiesHasEmptyMultiValueRecord(ManageableRepository repository) throws Exception + { + // create repository and add property + SessionImpl session = + (SessionImpl)repository.login(credentials, repository.getConfiguration().getSystemWorkspaceName()); + PropertyImpl prop = (PropertyImpl)session.getRootNode().addNode("testNode").setProperty("prop", new String[]{}); + session.save(); + session.logout(); + + // repository is consistent + checkController = new RepositoryCheckController(repository); + assertTrue(checkController.checkRepositoryDataBaseConsistency().startsWith("Repository data is consistent")); + checkController.getLastLogFile().delete(); + } + /** * Usecase: reference properties without reference records. */

12 years, 3 months

1
0
0 / 0

exo-jcr SVN: r5649 - in jcr/branches/1.15.x/exo.jcr.component.core/src: test/java/org/exoplatform/services/jcr/impl and 1 other directory.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2012-02-16 05:59:46 -0500 (Thu, 16 Feb 2012) New Revision: 5649 Added: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQuery.java jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQueryFilteredMultivaluedProperties.java Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java Log: EXOJCR-1755: Improved queries for repository checking consistency Added: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQuery.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQuery.java (rev 0) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQuery.java 2012-02-16 10:59:46 UTC (rev 5649) @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2012 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.services.jcr.impl.storage.jdbc; + +import org.exoplatform.services.jcr.impl.InspectionLog.InspectionStatus; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +/** + * @author <a href="mailto:aplotnikov@exoplatform.com">Andrey Plotnikov</a> + * @version $Id: InspectionQuery.java 34360 16.02.2012 andrew.plotnikov $ + */ +class InspectionQuery +{ + /** + * Data class, contains a combination of SQL states, description, field names and status + */ + + /** + * SQL query that must be executed. + */ + public String statement; + + /** + * Inspection query description. + */ + public String description; + + /** + * Field names that must be showed in inspection log if something wrong. + */ + public String[] fieldNames; + + /** + * Corruption status. Is it critical - ERR, or not - WARN. + */ + public InspectionStatus status; + + public InspectionQuery(String statement, String[] fieldNames, String headerMessage, InspectionStatus status) + { + this.statement = statement; + this.description = headerMessage; + this.fieldNames = fieldNames; + this.status = status; + } + + public String getStatement() + { + return statement; + } + + public String getDescription() + { + return description; + } + + public String[] getFieldNames() + { + return fieldNames; + } + + public InspectionStatus getStatus() + { + return status; + } + + /** + * Creates a PreparedStatement object for sending parameterized SQL statements to the database. + * + * @param connection + * connection to workspace storage + * @return + * a new default PreparedStatement object containing the pre-compiled SQL statement + * @throws SQLException + * if a database access error occurs or this method is called on a closed connection + */ + public PreparedStatement prepareStatement(Connection connection) throws SQLException + { + return connection.prepareStatement(statement); + } + +} Added: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQueryFilteredMultivaluedProperties.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQueryFilteredMultivaluedProperties.java (rev 0) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/InspectionQueryFilteredMultivaluedProperties.java 2012-02-16 10:59:46 UTC (rev 5649) @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2012 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.services.jcr.impl.storage.jdbc; + +import org.exoplatform.services.jcr.impl.InspectionLog.InspectionStatus; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +/** + * @author <a href="mailto:aplotnikov@exoplatform.com">Andrey Plotnikov</a> + * @version $Id: InspectionQueryFilteredMultivaluedProperties.java 34360 16.02.2012 andrew.plotnikov $ + */ +class InspectionQueryFilteredMultivaluedProperties extends InspectionQuery +{ + + /** + * {@inheritDoc} + */ + public InspectionQueryFilteredMultivaluedProperties(String statement, String[] fieldNames, String headerMessage, InspectionStatus status) + { + super(statement, fieldNames, headerMessage, status); + } + + /** + * {@inheritDoc} + */ + public PreparedStatement prepareStatement(Connection connection) throws SQLException + { + PreparedStatement preparedStatement = super.prepareStatement(connection); + preparedStatement.setBoolean(1, false); + + return preparedStatement; + } + +} Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2012-02-16 07:31:26 UTC (rev 5648) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2012-02-16 10:59:46 UTC (rev 5649) @@ -64,61 +64,6 @@ public static void checkDB(JDBCWorkspaceDataContainer jdbcDataContainer, InspectionLog inspectionLog) throws RepositoryException, IOException { - - /** - * Data class, contains a combination of SQL states, description, field names and status - */ - class InspectionQuery - { - /** - * SQL query that must be executed. - */ - private final String statement; - - /** - * Inspection query description. - */ - private final String description; - - /** - * Field names that must be showed in inspection log if something wrong. - */ - private final String[] fieldNames; - - /** - * Corruption status. Is it critical - ERR, or not - WARN. - */ - private final InspectionStatus status; - - public InspectionQuery(String statement, String[] fieldNames, String headerMessage, InspectionStatus status) - { - this.statement = statement; - this.description = headerMessage; - this.fieldNames = fieldNames; - this.status = status; - } - - public String getStatement() - { - return statement; - } - - public String getDescription() - { - return description; - } - - public String[] getFieldNames() - { - return fieldNames; - } - - public InspectionStatus getStatus() - { - return status; - } - } - Set<InspectionQuery> queries = new HashSet<InspectionQuery>(); // preload queries @@ -138,23 +83,26 @@ new String[]{DBConstants.COLUMN_ID, DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, "Nodes that do not have at least one property", InspectionStatus.ERR)); - queries.add(new InspectionQuery(jdbcDataContainer.multiDb - ? "select * from JCR_MVALUE V where NOT EXISTS(select * from JCR_MITEM P " - + "where V.PROPERTY_ID = P.ID and P.I_CLASS=2)" - : "select V.* from JCR_SVALUE V, JCR_SITEM I where V.PROPERTY_ID = I.ID and I.CONTAINER_NAME='" - + jdbcDataContainer.containerName + "' and NOT EXISTS(select * from JCR_SITEM P where P.CONTAINER_NAME='" - + jdbcDataContainer.containerName + "' and V.PROPERTY_ID = P.ID and P.I_CLASS=2)", new String[]{ - DBConstants.COLUMN_ID, DBConstants.COLUMN_VPROPERTY_ID}, - "All value records that has not owner-property record", InspectionStatus.ERR)); + queries + .add(new InspectionQuery(jdbcDataContainer.multiDb + ? "select * from JCR_MVALUE V where NOT EXISTS(select * from JCR_MITEM P " + + "where V.PROPERTY_ID = P.ID and P.I_CLASS=2)" + : "select * from JCR_SVALUE V where NOT EXISTS(select * from JCR_SITEM P " + + "where V.PROPERTY_ID = P.ID and P.I_CLASS=2)", new String[]{DBConstants.COLUMN_ID, + DBConstants.COLUMN_VPROPERTY_ID}, "All value records that has not owner-property record", + InspectionStatus.ERR)); + + queries + .add(new InspectionQueryFilteredMultivaluedProperties( + jdbcDataContainer.multiDb + ? "select * from JCR_MITEM P where P.I_CLASS=2 and P.P_MULTIVALUED=? and NOT EXISTS( select * from JCR_MVALUE V " + + "where V.PROPERTY_ID=P.ID)" + : "select * from JCR_SITEM P where P.CONTAINER_NAME='" + + jdbcDataContainer.containerName + + "' and P.I_CLASS=2 and P.P_MULTIVALUED=? and NOT EXISTS( select * from JCR_SVALUE V where V.PROPERTY_ID=P.ID)", + new String[]{DBConstants.COLUMN_ID, DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, + "All properties that have not value record.", InspectionStatus.ERR)); - queries.add(new InspectionQuery(jdbcDataContainer.multiDb - ? "select * from JCR_MITEM P where P.I_CLASS=2 and NOT EXISTS( select * from JCR_MVALUE V " - + "where V.PROPERTY_ID=P.ID)" : "select * from JCR_SITEM P where P.CONTAINER_NAME='" - + jdbcDataContainer.containerName - + "' and P.I_CLASS=2 and NOT EXISTS( select * from JCR_SVALUE V where V.PROPERTY_ID=P.ID)", new String[]{ - DBConstants.COLUMN_ID, DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, - "All properties that have not value record.", InspectionStatus.ERR)); - // The differences in the queries by DB dialect. // Oracle doesn't work correct with default query because empty value stored as null value. String statement; @@ -187,24 +135,17 @@ } queries.add(new InspectionQuery(statement, new String[]{DBConstants.COLUMN_ID}, "Incorrect JCR_VALUE records", InspectionStatus.ERR)); - - queries.add(new InspectionQuery(jdbcDataContainer.multiDb - ? "select * from JCR_MITEM P where P.P_TYPE=9 and NOT EXISTS " - + "(select * from JCR_MREF R where P.ID=R.PROPERTY_ID)" - : "select * from JCR_SITEM P where P.CONTAINER_NAME='" + jdbcDataContainer.containerName - + "' and P.P_TYPE=9 and NOT EXISTS( select * from JCR_SREF R where P.ID=R.PROPERTY_ID)", new String[]{ - DBConstants.COLUMN_ID, DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, - "Reference properties without reference records", InspectionStatus.ERR)); - // properties can refer to missing node. It is possible to perform this usecase via JCR API with no exceptions - queries.add(new InspectionQuery(jdbcDataContainer.multiDb - ? "select * from JCR_MREF R where NOT EXISTS(select * from JCR_MITEM N where R.NODE_ID=N.ID)" - : "select * from JCR_SREF R, JCR_SITEM I where R.PROPERTY_ID = I.ID and I.CONTAINER_NAME='" - + jdbcDataContainer.containerName - + "' and NOT EXISTS(select * from JCR_SITEM N where N.CONTAINER_NAME='" - + jdbcDataContainer.containerName + "' and R.NODE_ID=N.ID)", new String[]{"NODE_ID", "PROPERTY_ID", - DBConstants.COLUMN_VORDERNUM}, - "Reference records that linked to unexisted nodes. Can be normal for some usecases.", InspectionStatus.WARN)); + queries + .add(new InspectionQueryFilteredMultivaluedProperties( + jdbcDataContainer.multiDb + ? "select * from JCR_MITEM P where P.P_TYPE=9 and P.P_MULTIVALUED=? and NOT EXISTS " + + "(select * from JCR_MREF R where P.ID=R.PROPERTY_ID)" + : "select * from JCR_SITEM P where P.CONTAINER_NAME='" + + jdbcDataContainer.containerName + + "' and P.P_TYPE=9 and P.P_MULTIVALUED=? and NOT EXISTS( select * from JCR_SREF R where P.ID=R.PROPERTY_ID)", + new String[]{DBConstants.COLUMN_ID, DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME}, + "Reference properties without reference records", InspectionStatus.ERR)); // an item is its own parent. queries.add(new InspectionQuery(jdbcDataContainer.multiDb @@ -241,7 +182,8 @@ ResultSet resultSet = null; try { - st = jdbcConn.prepareStatement(query.getStatement()); + st = query.prepareStatement(jdbcConn); + // the result of query is expected to be empty resultSet = st.executeQuery(); if (resultSet.next()) Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java 2012-02-16 07:31:26 UTC (rev 5648) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java 2012-02-16 10:59:46 UTC (rev 5649) @@ -570,64 +570,11 @@ } /** - * Usecase: Reference records that linked to unexisted nodes. Can be normal for some usecases. - */ - public void testDBUsecasesRefPropertiesLinksToUnexistedNodesSingleDB() throws Exception - { - checkDBUsecasesRefPropertiesLinksToUnexistedNodes(helper.createRepository(container, false, false)); - } - - /** - * Usecase: Reference records that linked to unexisted nodes. Can be normal for some usecases. - */ - public void testDBUsecasesRefPropertiesLinksToUnexistedNodesMultiDB() throws Exception - { - checkDBUsecasesRefPropertiesLinksToUnexistedNodes(helper.createRepository(container, true, false)); - } - - private void checkDBUsecasesRefPropertiesLinksToUnexistedNodes(ManageableRepository repository) throws Exception - { - // create repository and add property - SessionImpl session = - (SessionImpl)repository.login(credentials, repository.getConfiguration().getSystemWorkspaceName()); - NodeImpl refNode = (NodeImpl)session.getRootNode().addNode("refNode"); - refNode.addMixin("mix:referenceable"); - NodeImpl node = (NodeImpl)session.getRootNode().addNode("testNode"); - PropertyImpl prop = (PropertyImpl)node.setProperty("refProp", refNode); - session.save(); - session.logout(); - - // repository is consistent - checkController = new RepositoryCheckController(repository); - assertTrue(checkController.checkRepositoryDataBaseConsistency().startsWith("Repository data is consistent")); - checkController.getLastLogFile().delete(); - - WorkspaceEntry wsEntry = repository.getConfiguration().getWorkspaceEntries().get(0); - boolean isMultiDb = wsEntry.getContainer().getParameterBoolean(JDBCWorkspaceDataContainer.MULTIDB); - - // change node id in REF table - String sourceName = wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME); - - Connection conn = ((DataSource)new InitialContext().lookup(sourceName)).getConnection(); - conn.prepareStatement( - "UPDATE JCR_" + (isMultiDb ? "M" : "S") + "REF SET NODE_ID = 'unexisted-id' WHERE PROPERTY_ID = '" - + (isMultiDb ? "" : wsEntry.getName()) + prop.getInternalIdentifier() + "'").execute(); - - conn.commit(); - conn.close(); - - // repository is inconsistent - assertTrue(checkController.checkRepositoryDataBaseConsistency().startsWith( - "Repository data is consistent, except some warnings")); - checkController.getLastLogFile().delete(); - } - - /** * Usecase: value records has no item record. */ public void testDBUsecasesValueRecordHasNoItemRecordSingleDB() throws Exception { - checkDBUsecasesPropertiesHasNoValueRecord(helper.createRepository(container, false, false)); + checkDBUsecasesValueRecordHasNoItemRecord(helper.createRepository(container, false, false)); } /** @@ -679,7 +626,8 @@ */ public void testDBUsecasesPropertiesHasNoValueRecordSingleDB() throws Exception { - checkDBUsecasesPropertiesHasNoValueRecord(helper.createRepository(container, false, false)); + checkDBUsecasesPropertiesHasNoSingleValueRecord(helper.createRepository(container, false, false)); + checkDBUsecasesPropertiesHasEmptyMultiValueRecord(helper.createRepository(container, false, false)); } /** @@ -687,10 +635,11 @@ */ public void testDBUsecasesPropertiesHasNoValueRecordMultiDB() throws Exception { - checkDBUsecasesPropertiesHasNoValueRecord(helper.createRepository(container, true, false)); + checkDBUsecasesPropertiesHasNoSingleValueRecord(helper.createRepository(container, true, false)); + checkDBUsecasesPropertiesHasEmptyMultiValueRecord(helper.createRepository(container, false, false)); } - private void checkDBUsecasesPropertiesHasNoValueRecord(ManageableRepository repository) throws Exception + private void checkDBUsecasesPropertiesHasNoSingleValueRecord(ManageableRepository repository) throws Exception { // create repository and add property SessionImpl session = @@ -723,6 +672,21 @@ checkController.getLastLogFile().delete(); } + private void checkDBUsecasesPropertiesHasEmptyMultiValueRecord(ManageableRepository repository) throws Exception + { + // create repository and add property + SessionImpl session = + (SessionImpl)repository.login(credentials, repository.getConfiguration().getSystemWorkspaceName()); + PropertyImpl prop = (PropertyImpl)session.getRootNode().addNode("testNode").setProperty("prop", new String[]{}); + session.save(); + session.logout(); + + // repository is consistent + checkController = new RepositoryCheckController(repository); + assertTrue(checkController.checkRepositoryDataBaseConsistency().startsWith("Repository data is consistent")); + checkController.getLastLogFile().delete(); + } + /** * Usecase: reference properties without reference records. */

12 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits February 2012