inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1 to HEAD

Browse Source 
6694: Removal of explicit Log4J usage


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-11 04:32:56 +00:00
parent a4b4ca69ec
commit 4fd130a5a4
40 changed files with 128 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneIndexerImpl.java
View File

@@ -71,7 +71,8 @@ import org.alfresco.service.cmr.repository.datatype.TypeConversionException;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.EqualsHelper;
import org.alfresco.util.ISO9075;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
@@ -92,7 +93,7 @@ import org.apache.lucene.search.BooleanClause.Occur;
*/
public class ADMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<NodeRef> implements ADMLuceneIndexer
{
static Logger s_logger = Logger.getLogger(ADMLuceneIndexerImpl.class);
static Log s_logger = LogFactory.getLog(ADMLuceneIndexerImpl.class);
/**
* The node service we use to get information about nodes

5
source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java
View File

@@ -58,7 +58,8 @@ import org.alfresco.service.namespace.NamespacePrefixResolver;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.ISO9075;
import org.alfresco.util.SearchLanguageConversion;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermEnum;
@@ -79,7 +80,7 @@ import com.werken.saxpath.XPathReader;
*/
public class ADMLuceneSearcherImpl extends AbstractLuceneBase implements LuceneSearcher
{
static Logger s_logger = Logger.getLogger(ADMLuceneSearcherImpl.class);
static Log s_logger = LogFactory.getLog(ADMLuceneSearcherImpl.class);
/**
* Default field name

5
source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java
View File

@@ -78,7 +78,8 @@ import org.alfresco.util.EqualsHelper;
import org.alfresco.util.GUID;
import org.alfresco.util.ISO9075;
import org.alfresco.util.Pair;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
@@ -103,7 +104,7 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
private static String SNAP_SHOT_ID = "SnapShot";
static Logger s_logger = Logger.getLogger(AVMLuceneIndexerImpl.class);
static Log s_logger = LogFactory.getLog(AVMLuceneIndexerImpl.class);
private AVMService avmService;

5
source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneBase.java
View File

@@ -34,7 +34,8 @@ import org.alfresco.repo.search.impl.lucene.index.TransactionStatus;
import org.alfresco.repo.search.impl.lucene.index.IndexInfo.LockWork;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher;
@@ -65,7 +66,7 @@ import org.apache.lucene.search.IndexSearcher;
public abstract class AbstractLuceneBase
{
private static Logger s_logger = Logger.getLogger(AbstractLuceneBase.class);
private static Log s_logger = LogFactory.getLog(AbstractLuceneBase.class);
private IndexInfo indexInfo;

5
source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerImpl.java
View File

@@ -39,7 +39,8 @@ import javax.transaction.xa.XAResource;
import org.alfresco.repo.search.IndexerException;
import org.alfresco.repo.search.impl.lucene.index.TransactionStatus;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -159,7 +160,7 @@ public abstract class AbstractLuceneIndexerImpl<T> extends AbstractLuceneBase
* Logger
*/
@SuppressWarnings("unused")
private static Logger s_logger = Logger.getLogger(AbstractLuceneIndexerImpl.class);
private static Log s_logger = LogFactory.getLog(AbstractLuceneIndexerImpl.class);
protected static Set<String> deletePrimary(Collection<String> nodeRefs, IndexReader reader, boolean delete)
throws LuceneIndexException

5
source/java/org/alfresco/repo/search/impl/lucene/LuceneAnalyser.java
View File

@@ -39,7 +39,8 @@ import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.namespace.QName;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
@@ -53,7 +54,7 @@ import org.apache.lucene.analysis.WhitespaceAnalyzer;
public class LuceneAnalyser extends Analyzer
{
private static Logger s_logger = Logger.getLogger(LuceneAnalyser.class);
private static Log s_logger = LogFactory.getLog(LuceneAnalyser.class);
// Dictinary service to look up analyser classes by data type and locale.
private DictionaryService dictionaryService;

5
source/java/org/alfresco/repo/search/impl/lucene/LuceneQueryParser.java
View File

@@ -54,7 +54,8 @@ import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.namespace.NamespacePrefixResolver;
import org.alfresco.service.namespace.QName;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
@@ -76,7 +77,7 @@ import com.werken.saxpath.XPathReader;
public class LuceneQueryParser extends QueryParser
{
private static Logger s_logger = Logger.getLogger(LuceneQueryParser.class);
private static Log s_logger = LogFactory.getLog(LuceneQueryParser.class);
private NamespacePrefixResolver namespacePrefixResolver;

5
source/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayser.java
View File

@@ -10,13 +10,14 @@ import org.alfresco.i18n.I18NUtil;
import org.alfresco.repo.search.MLAnalysisMode;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
public class MLAnalayser extends Analyzer
{
private static Logger s_logger = Logger.getLogger(MLAnalayser.class);
private static Log s_logger = LogFactory.getLog(MLAnalayser.class);
private DictionaryService dictionaryService;

5
source/java/org/alfresco/repo/search/impl/lucene/analysis/MLTokenDuplicator.java
View File

@@ -9,7 +9,8 @@ import java.util.Iterator;
import java.util.Locale;
import org.alfresco.repo.search.MLAnalysisMode;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -23,7 +24,7 @@ import org.apache.lucene.analysis.Tokenizer;
*/
public class MLTokenDuplicator extends Tokenizer
{
private static Logger s_logger = Logger.getLogger(MLTokenDuplicator.class);
private static Log s_logger = LogFactory.getLog(MLTokenDuplicator.class);
TokenStream source;

5
source/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCountingReadOnlyIndexReaderFactory.java
View File

@@ -30,7 +30,8 @@ import java.util.HashMap;
import org.alfresco.util.EqualsHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.index.FilterIndexReader;
import org.apache.lucene.index.IndexReader;
@@ -77,7 +78,7 @@ public class ReferenceCountingReadOnlyIndexReaderFactory
public static class ReferenceCountingReadOnlyIndexReader extends FilterIndexReader implements ReferenceCounting
{
private static Logger s_logger = Logger.getLogger(ReferenceCountingReadOnlyIndexReader.class);
private static Log s_logger = LogFactory.getLog(ReferenceCountingReadOnlyIndexReader.class);
private static final long serialVersionUID = 7693185658022810428L;