[exo-jcr-commits] exo-jcr SVN: r2149 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: core/lock/jbosscache/jdbc and 7 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Mar 26 04:09:25 EDT 2010


Author: sergiykarpenko
Date: 2010-03-26 04:09:24 -0400 (Fri, 26 Mar 2010)
New Revision: 2149

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCConnection.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCContainer.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/DefaultChangesFilter.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/JCRDateFormat.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBInitializer.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java
Log:
EXOJCR-605: jcr.core Loggers updated

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java	2010-03-26 08:01:55 UTC (rev 2148)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java	2010-03-26 08:09:24 UTC (rev 2149)
@@ -65,7 +65,7 @@
 public class NamespaceDataPersister implements ComponentPersister
 {
 
-   public static Log log = ExoLogger.getLogger(NamespaceDataPersister.class.getName());
+   public static Log log = ExoLogger.getLogger("exo.jcr.component.core.NamespaceDataPersister");
 
    private final DataManager dataManager;
 

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java	2010-03-26 08:01:55 UTC (rev 2148)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java	2010-03-26 08:09:24 UTC (rev 2149)
@@ -66,7 +66,7 @@
 public class ScratchWorkspaceInitializer implements WorkspaceInitializer
 {
 
-   protected static final Log log = ExoLogger.getLogger("exo.jcr.component.core.WorkspaceInitializer");
+   protected static final Log log = ExoLogger.getLogger("exo.jcr.component.core.ScratchWorkspaceInitializer");
 
    private final String systemWorkspaceName;
 

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCConnection.java	2010-03-26 08:01:55 UTC (rev 2148)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCConnection.java	2010-03-26 08:09:24 UTC (rev 2149)
@@ -40,7 +40,7 @@
 public class LockJDBCConnection
 {
 
-   private final Log LOG = ExoLogger.getLogger(LockJDBCContainer.class);
+   private final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.LockJDBCContainer");
 
    // queries
    protected String ADD_LOCK_DATA;

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCContainer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCContainer.java	2010-03-26 08:01:55 UTC (rev 2148)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCContainer.java	2010-03-26 08:09:24 UTC (rev 2149)
@@ -40,7 +40,7 @@
  */
 public class LockJDBCContainer
 {
-   private final Log log = ExoLogger.getLogger(LockJDBCContainer.class);
+   private final Log log = ExoLogger.getLogger("exo.jcr.component.core.LockJDBCContainer");
 
    private DataSource dataSource;
 

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/DefaultChangesFilter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/DefaultChangesFilter.java	2010-03-26 08:01:55 UTC (rev 2148)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/DefaultChangesFilter.java	2010-03-26 08:09:24 UTC (rev 2149)
@@ -36,6 +36,10 @@
  */
 public class DefaultChangesFilter extends IndexerChangesFilter
 {
+   /**
+    * Logger instance for this class
+    */
+   private static final Log log = ExoLogger.getLogger("exo.jcr.component.core.DefaultChangesFilter");
 
    /**
     * @param searchManager
@@ -51,7 +55,8 @@
     */
    public DefaultChangesFilter(SearchManager searchManager, SearchManager parentSearchManager,
       QueryHandlerEntry config, IndexingTree indexingTree, IndexingTree parentIndexingTree, QueryHandler handler,
-      QueryHandler parentHandler, ConfigurationManager cfm) throws IOException, RepositoryConfigurationException, RepositoryException
+      QueryHandler parentHandler, ConfigurationManager cfm) throws IOException, RepositoryConfigurationException,
+      RepositoryException
    {
       super(searchManager, parentSearchManager, config, indexingTree, parentIndexingTree, handler, parentHandler, cfm);
       IndexerIoModeHandler modeHandler = new IndexerIoModeHandler(IndexerIoMode.READ_WRITE);
@@ -69,11 +74,6 @@
    }
 
    /**
-    * Logger instance for this class
-    */
-   private static final Log log = ExoLogger.getLogger(DefaultChangesFilter.class);
-
-   /**
     * @param removedNodes 
     * @param addedNodes 
     * @see org.exoplatform.services.jcr.impl.core.query.IndexerChangesFilter#doUpdateIndex()

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java	2010-03-26 08:01:55 UTC (rev 2148)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java	2010-03-26 08:09:24 UTC (rev 2149)
@@ -101,8 +101,7 @@
    /**
     * Logger for this class
     */
-   private static final Logger log =
-      LoggerFactory.getLogger("exo.jcr.component.core." + LuceneQueryBuilder.class.getSimpleName());
+   private static final Logger log = LoggerFactory.getLogger("exo.jcr.component.core.LuceneQueryBuilder");
 
    /**
     * Root node of the abstract query tree

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java	2010-03-26 08:01:55 UTC (rev 2148)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java	2010-03-26 08:09:24 UTC (rev 2149)
@@ -124,7 +124,7 @@
    /**
     * Cache implementaion logger.
     */
-   protected static final Log LOG = ExoLogger.getLogger("jcr.LinkedWorkspaceStorageCacheImpl");
+   protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.LinkedWorkspaceStorageCacheImpl");
 
    /**
     * Cache C.
@@ -553,7 +553,7 @@
     */
    abstract class WorkerTask extends TimerTask
    {
-      protected Log log = ExoLogger.getLogger("jcr.LinkedWorkspaceStorageCacheImpl_Worker");
+      protected Log log = ExoLogger.getLogger("exo.jcr.component.core.LinkedWorkspaceStorageCacheImpl_Worker");
 
       protected Worker currentWorker = null;
    }

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java	2010-03-26 08:01:55 UTC (rev 2148)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java	2010-03-26 08:09:24 UTC (rev 2149)
@@ -51,7 +51,7 @@
 @SuppressWarnings("unchecked")
 public class BufferedJBossCache implements Cache<Serializable, Object>
 {
-   //   private final Log log = ExoLogger.getLogger(BufferedJbossCache.class);
+   //   private final Log log = ExoLogger.getLogger("exo.jcr.component.core.BufferedJbossCache");
 
    /**
     * Parent cache.
@@ -160,7 +160,7 @@
    {
       return ((CacheSPI<Serializable, Object>)parentCache).getNumberOfNodes();
    }
-   
+
    /* (non-Javadoc)
     * @see org.jboss.cache.Cache#addCacheListener(java.lang.Object)
     */

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/JCRDateFormat.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/JCRDateFormat.java	2010-03-26 08:01:55 UTC (rev 2148)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/JCRDateFormat.java	2010-03-26 08:09:24 UTC (rev 2149)
@@ -70,7 +70,7 @@
 public class JCRDateFormat
 {
 
-   public static Log log = ExoLogger.getLogger("jcr.JCRDateFormat");
+   public static Log log = ExoLogger.getLogger("exo.jcr.component.core.JCRDateFormat");
 
    /**
     * ISO 8601, RFC822 formats for JCR datas deserialization in order of priority of parse

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBInitializer.java	2010-03-26 08:01:55 UTC (rev 2148)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBInitializer.java	2010-03-26 08:09:24 UTC (rev 2149)
@@ -61,7 +61,7 @@
 
    static public String SQL_TRIGGERNAME = "(([A-Z_]+JCR_[A-Z_]+){1}(\\s*?|(\\(\\))*?)+)+?";
 
-   protected final Log LOG = ExoLogger.getLogger("jcr.DBInitializer");
+   protected final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.DBInitializer");
 
    protected final Connection connection;
 
@@ -85,13 +85,12 @@
 
    protected final Pattern dbTriggerNamePattern;
 
-   public DBInitializer(String containerName, Connection connection, String scriptPath)
-      throws IOException
+   public DBInitializer(String containerName, Connection connection, String scriptPath) throws IOException
    {
       this.connection = connection;
       this.containerName = containerName;
       this.script = script(scriptPath);
-      
+
       this.creatTablePattern = Pattern.compile(SQL_CREATETABLE, Pattern.CASE_INSENSITIVE);
       this.creatViewPattern = Pattern.compile(SQL_CREATEVIEW, Pattern.CASE_INSENSITIVE);
       this.dbObjectNamePattern = Pattern.compile(SQL_OBJECTNAME, Pattern.CASE_INSENSITIVE);

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java	2010-03-26 08:01:55 UTC (rev 2148)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java	2010-03-26 08:09:24 UTC (rev 2149)
@@ -108,7 +108,7 @@
 
    protected final ValueFactoryImpl valueFactory;
 
-   private final Log log = ExoLogger.getLogger("jcr.ImporterBase");
+   private final Log log = ExoLogger.getLogger("exo.jcr.component.core.ImporterBase");
 
    public BaseXmlImporter(NodeData parent, QPath ancestorToSave, int uuidBehavior, ItemDataConsumer dataConsumer,
       NodeTypeDataManager ntManager, LocationFactory locationFactory, ValueFactoryImpl valueFactory,



More information about the exo-jcr-commits mailing list