You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2006/03/15 08:41:58 UTC
svn commit: r385991 [2/2] - in
/incubator/jackrabbit/branches/1.0/jackrabbit: ./
src/main/java/org/apache/jackrabbit/core/
src/main/java/org/apache/jackrabbit/core/config/
src/main/java/org/apache/jackrabbit/core/fs/db/
src/main/java/org/apache/jackrab...
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java Tue Mar 14 23:41:48 2006
@@ -16,7 +16,8 @@
*/
package org.apache.jackrabbit.core.query.lucene;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -35,7 +36,7 @@
class PersistentIndex extends AbstractIndex {
/** The logger instance for this class */
- private static final Logger log = Logger.getLogger(PersistentIndex.class);
+ private static final Logger log = LoggerFactory.getLogger(PersistentIndex.class);
/** Name of the write lock file */
private static final String WRITE_LOCK = IndexWriter.WRITE_LOCK_NAME;
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java Tue Mar 14 23:41:48 2006
@@ -32,7 +32,8 @@
import org.apache.jackrabbit.core.query.QueryRootNode;
import org.apache.jackrabbit.core.security.AccessManager;
import org.apache.jackrabbit.name.QName;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.lucene.search.Query;
import javax.jcr.RepositoryException;
@@ -53,7 +54,7 @@
/**
* The logger instance for this class
*/
- private static final Logger log = Logger.getLogger(QueryImpl.class);
+ private static final Logger log = LoggerFactory.getLogger(QueryImpl.class);
/**
* Represents a query that selects all nodes. E.g. in XPath: //*
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java Tue Mar 14 23:41:48 2006
@@ -21,7 +21,8 @@
import org.apache.jackrabbit.name.NamespaceResolver;
import org.apache.jackrabbit.name.NoPrefixDeclaredException;
import org.apache.jackrabbit.name.QName;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
@@ -36,7 +37,7 @@
/**
* The logger instance for this class
*/
- private static final Logger log = Logger.getLogger(QueryResultImpl.class);
+ private static final Logger log = LoggerFactory.getLogger(QueryResultImpl.class);
/**
* The item manager of the session executing the query
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/RangeQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/RangeQuery.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/RangeQuery.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/RangeQuery.java Tue Mar 14 23:41:48 2006
@@ -27,7 +27,8 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.TermEnum;
import org.apache.lucene.index.TermDocs;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.commons.collections.map.LRUMap;
import java.io.IOException;
@@ -46,7 +47,7 @@
/**
* Logger instance for this class.
*/
- private static final Logger log = Logger.getLogger(RangeQuery.class);
+ private static final Logger log = LoggerFactory.getLogger(RangeQuery.class);
/**
* Simple result cache for previously calculated hits.
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/Recovery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/Recovery.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/Recovery.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/Recovery.java Tue Mar 14 23:41:48 2006
@@ -16,7 +16,8 @@
*/
package org.apache.jackrabbit.core.query.lucene;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Set;
import java.util.HashSet;
@@ -32,7 +33,7 @@
/**
* The logger instance for this class.
*/
- private static final Logger log = Logger.getLogger(Recovery.class);
+ private static final Logger log = LoggerFactory.getLogger(Recovery.class);
/**
* The MultiIndex where to run the recovery on.
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java Tue Mar 14 23:41:48 2006
@@ -16,7 +16,8 @@
*/
package org.apache.jackrabbit.core.query.lucene;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -46,7 +47,7 @@
/**
* Logger instance for this class
*/
- private static final Logger log = Logger.getLogger(RedoLog.class);
+ private static final Logger log = LoggerFactory.getLogger(RedoLog.class);
/**
* Implements a {@link ActionCollector} that counts all entries and sets
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java Tue Mar 14 23:41:48 2006
@@ -29,7 +29,8 @@
import org.apache.jackrabbit.core.state.NodeStateIterator;
import org.apache.jackrabbit.name.NoPrefixDeclaredException;
import org.apache.jackrabbit.name.QName;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
@@ -62,7 +63,7 @@
public class SearchIndex extends AbstractQueryHandler {
/** The logger instance for this class */
- private static final Logger log = Logger.getLogger(SearchIndex.class);
+ private static final Logger log = LoggerFactory.getLogger(SearchIndex.class);
/**
* The default value for property {@link #minMergeDocs}.
@@ -714,7 +715,7 @@
*/
public void setTextFilterClasses(String filterClasses) {
List filters = new ArrayList();
- StringTokenizer tokenizer = new StringTokenizer(filterClasses, ", \t\n\r\f");
+ StringTokenizer tokenizer = new StringTokenizer(filterClasses, ",�\t\n\r\f");
while (tokenizer.hasMoreTokens()) {
String className = tokenizer.nextToken();
try {
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java Tue Mar 14 23:41:48 2006
@@ -23,7 +23,8 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.Iterator;
@@ -38,7 +39,7 @@
/**
* Logger instance for this class.
*/
- private static final Logger log = Logger.getLogger(VolatileIndex.class);
+ private static final Logger log = LoggerFactory.getLogger(VolatileIndex.class);
/**
* Default value for {@link #bufferSize}.
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardQuery.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardQuery.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardQuery.java Tue Mar 14 23:41:48 2006
@@ -29,7 +29,8 @@
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.Similarity;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.commons.collections.map.LRUMap;
import java.io.IOException;
@@ -52,7 +53,7 @@
/**
* Logger instance for this class.
*/
- private static final Logger log = Logger.getLogger(WildcardQuery.class);
+ private static final Logger log = LoggerFactory.getLogger(WildcardQuery.class);
/**
* Name of the field to search.
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java Tue Mar 14 23:41:48 2006
@@ -34,7 +34,8 @@
import org.apache.jackrabbit.name.QName;
import org.apache.jackrabbit.name.UnknownPrefixException;
import org.apache.jackrabbit.util.ISO8601;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.commons.collections.map.ReferenceMap;
import javax.jcr.query.InvalidQueryException;
@@ -57,7 +58,7 @@
/**
* logger instance for this class
*/
- private static final Logger log = Logger.getLogger(JCRSQLQueryBuilder.class);
+ private static final Logger log = LoggerFactory.getLogger(JCRSQLQueryBuilder.class);
/**
* DateFormat pattern for type
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/security/SimpleAccessManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/security/SimpleAccessManager.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/security/SimpleAccessManager.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/security/SimpleAccessManager.java Tue Mar 14 23:41:48 2006
@@ -18,7 +18,8 @@
import org.apache.jackrabbit.core.HierarchyManager;
import org.apache.jackrabbit.core.ItemId;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.AccessDeniedException;
import javax.jcr.ItemNotFoundException;
@@ -31,7 +32,7 @@
*/
public class SimpleAccessManager implements AccessManager {
- private static Logger log = Logger.getLogger(SimpleAccessManager.class);
+ private static Logger log = LoggerFactory.getLogger(SimpleAccessManager.class);
/**
* Subject whose access rights this AccessManager should reflect
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java Tue Mar 14 23:41:48 2006
@@ -16,7 +16,8 @@
*/
package org.apache.jackrabbit.core.security;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.Credentials;
import javax.jcr.SimpleCredentials;
@@ -36,7 +37,7 @@
*/
public class SimpleLoginModule implements LoginModule {
- private static Logger log = Logger.getLogger(SimpleLoginModule.class);
+ private static Logger log = LoggerFactory.getLogger(SimpleLoginModule.class);
/**
* Name of the anonymous user id option in the LoginModule configuration
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemState.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemState.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemState.java Tue Mar 14 23:41:48 2006
@@ -19,7 +19,8 @@
import org.apache.jackrabbit.core.ItemId;
import org.apache.jackrabbit.core.NodeId;
import org.apache.jackrabbit.util.WeakIdentityCollection;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -38,7 +39,7 @@
/**
* Logger instance
*/
- private static Logger log = Logger.getLogger(ItemState.class);
+ private static Logger log = LoggerFactory.getLogger(ItemState.class);
//------------------< flags defining the current status of this instance >
/**
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemStateMap.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemStateMap.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemStateMap.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemStateMap.java Tue Mar 14 23:41:48 2006
@@ -18,7 +18,8 @@
import org.apache.jackrabbit.core.ItemId;
import org.apache.jackrabbit.core.util.Dumpable;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.PrintStream;
import java.util.Collection;
@@ -34,7 +35,7 @@
public class ItemStateMap implements ItemStateStore, Dumpable {
/** Logger instance */
- private static Logger log = Logger.getLogger(ItemStateMap.class);
+ private static Logger log = LoggerFactory.getLogger(ItemStateMap.class);
/**
* the map backing this <code>ItemStateStore</code> implementation
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java Tue Mar 14 23:41:48 2006
@@ -18,7 +18,8 @@
import org.apache.jackrabbit.core.ItemId;
import org.apache.jackrabbit.core.util.Dumpable;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Set;
import java.util.Collections;
@@ -45,7 +46,7 @@
public class ItemStateReferenceCache implements ItemStateCache, Dumpable {
/** Logger instance */
- private static Logger log = Logger.getLogger(LRUItemStateCache.class);
+ private static Logger log = LoggerFactory.getLogger(LRUItemStateCache.class);
/**
* primary cache storing weak references to <code>ItemState</code>
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/LRUItemStateCache.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/LRUItemStateCache.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/LRUItemStateCache.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/LRUItemStateCache.java Tue Mar 14 23:41:48 2006
@@ -18,7 +18,8 @@
import org.apache.commons.collections.map.LRUMap;
import org.apache.jackrabbit.core.ItemId;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Collection;
import java.util.Collections;
@@ -30,7 +31,7 @@
*/
public class LRUItemStateCache implements ItemStateCache {
/** Logger instance */
- private static Logger log = Logger.getLogger(LRUItemStateCache.class);
+ private static Logger log = LoggerFactory.getLogger(LRUItemStateCache.class);
/** default maximum size of this cache */
public static final int DEFAULT_MAX_SIZE = 1000;
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeState.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeState.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeState.java Tue Mar 14 23:41:48 2006
@@ -24,7 +24,8 @@
import org.apache.jackrabbit.core.nodetype.NodeDefId;
import org.apache.jackrabbit.name.QName;
import org.apache.jackrabbit.util.WeakIdentityCollection;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -50,7 +51,7 @@
*/
static final long serialVersionUID = 4392375681805781770L;
- private static Logger log = Logger.getLogger(NodeState.class);
+ private static Logger log = LoggerFactory.getLogger(NodeState.class);
/**
* the name of this node's primary type
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java Tue Mar 14 23:41:48 2006
@@ -25,7 +25,8 @@
import org.apache.jackrabbit.core.util.Dumpable;
import org.apache.jackrabbit.name.NamespaceResolver;
import org.apache.jackrabbit.name.QName;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.InvalidItemStateException;
import javax.jcr.ItemNotFoundException;
@@ -43,7 +44,7 @@
public class SessionItemStateManager
implements UpdatableItemStateManager, Dumpable {
- private static Logger log = Logger.getLogger(SessionItemStateManager.class);
+ private static Logger log = LoggerFactory.getLogger(SessionItemStateManager.class);
/**
* State manager that allows updates
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Tue Mar 14 23:41:48 2006
@@ -33,7 +33,8 @@
import org.apache.jackrabbit.core.virtual.VirtualItemStateProvider;
import org.apache.jackrabbit.name.QName;
import org.apache.jackrabbit.uuid.UUID;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.PropertyType;
import javax.jcr.ReferentialIntegrityException;
@@ -113,7 +114,7 @@
/**
* Logger instance
*/
- private static Logger log = Logger.getLogger(SharedItemStateManager.class);
+ private static Logger log = LoggerFactory.getLogger(SharedItemStateManager.class);
/**
* cache of weak references to ItemState objects issued by this
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/TransientItemStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/TransientItemStateManager.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/TransientItemStateManager.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/TransientItemStateManager.java Tue Mar 14 23:41:48 2006
@@ -21,7 +21,8 @@
import org.apache.jackrabbit.core.PropertyId;
import org.apache.jackrabbit.core.util.Dumpable;
import org.apache.jackrabbit.name.QName;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.PrintStream;
import java.util.ArrayList;
@@ -33,7 +34,7 @@
*/
class TransientItemStateManager implements ItemStateManager, Dumpable {
- private static Logger log = Logger.getLogger(TransientItemStateManager.class);
+ private static Logger log = LoggerFactory.getLogger(TransientItemStateManager.class);
/**
* map of those states that have been removed transiently
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/XAItemStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/XAItemStateManager.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/XAItemStateManager.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/XAItemStateManager.java Tue Mar 14 23:41:48 2006
@@ -25,7 +25,8 @@
import org.apache.jackrabbit.core.value.InternalValue;
import org.apache.jackrabbit.core.virtual.VirtualItemStateProvider;
import org.apache.jackrabbit.uuid.UUID;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.ReferentialIntegrityException;
import javax.jcr.PropertyType;
@@ -41,7 +42,7 @@
/**
* Logger instance.
*/
- private static Logger log = Logger.getLogger(XAItemStateManager.class);
+ private static Logger log = LoggerFactory.getLogger(XAItemStateManager.class);
/**
* Default change log attribute name.
@@ -149,11 +150,11 @@
}
update = sharedStateMgr.beginUpdate(txLog, factory, virtualProvider);
} catch (ReferentialIntegrityException rie) {
- log.error(rie);
+ log.error(rie.getMessage(), rie);
txLog.undo(sharedStateMgr);
throw new TransactionException("Unable to prepare transaction.", rie);
} catch (ItemStateException ise) {
- log.error(ise);
+ log.error(ise.getMessage(), ise);
txLog.undo(sharedStateMgr);
throw new TransactionException("Unable to prepare transaction.", ise);
}
@@ -169,7 +170,7 @@
try {
update.end();
} catch (ItemStateException ise) {
- log.error(ise);
+ log.error(ise.getMessage(), ise);
txLog.undo(sharedStateMgr);
throw new TransactionException("Unable to commit transaction.", ise);
}
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DerbyPersistenceManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DerbyPersistenceManager.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DerbyPersistenceManager.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DerbyPersistenceManager.java Tue Mar 14 23:41:48 2006
@@ -16,7 +16,8 @@
*/
package org.apache.jackrabbit.core.state.db;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.sql.DriverManager;
import java.sql.SQLException;
@@ -60,7 +61,7 @@
/**
* Logger instance
*/
- private static Logger log = Logger.getLogger(DerbyPersistenceManager.class);
+ private static Logger log = LoggerFactory.getLogger(DerbyPersistenceManager.class);
/**
* Creates a new <code>SimpleDbPersistenceManager</code> instance.
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/SimpleDbPersistenceManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/SimpleDbPersistenceManager.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/SimpleDbPersistenceManager.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/SimpleDbPersistenceManager.java Tue Mar 14 23:41:48 2006
@@ -36,7 +36,8 @@
import org.apache.jackrabbit.core.value.BLOBFileValue;
import org.apache.jackrabbit.core.value.InternalValue;
import org.apache.jackrabbit.util.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -148,7 +149,7 @@
/**
* Logger instance
*/
- private static Logger log = Logger.getLogger(SimpleDbPersistenceManager.class);
+ private static Logger log = LoggerFactory.getLogger(SimpleDbPersistenceManager.class);
protected static final String SCHEMA_OBJECT_PREFIX_VARIABLE =
"${schemaObjectPrefix}";
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/mem/InMemPersistenceManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/mem/InMemPersistenceManager.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/mem/InMemPersistenceManager.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/mem/InMemPersistenceManager.java Tue Mar 14 23:41:48 2006
@@ -37,7 +37,8 @@
import org.apache.jackrabbit.core.value.BLOBFileValue;
import org.apache.jackrabbit.core.value.InternalValue;
import org.apache.jackrabbit.name.QName;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.PropertyType;
import java.io.BufferedInputStream;
@@ -69,7 +70,7 @@
*/
public class InMemPersistenceManager extends AbstractPersistenceManager {
- private static Logger log = Logger.getLogger(InMemPersistenceManager.class);
+ private static Logger log = LoggerFactory.getLogger(InMemPersistenceManager.class);
protected boolean initialized;
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/obj/ObjectPersistenceManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/obj/ObjectPersistenceManager.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/obj/ObjectPersistenceManager.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/obj/ObjectPersistenceManager.java Tue Mar 14 23:41:48 2006
@@ -36,7 +36,8 @@
import org.apache.jackrabbit.core.state.util.Serializer;
import org.apache.jackrabbit.core.value.BLOBFileValue;
import org.apache.jackrabbit.core.value.InternalValue;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.PropertyType;
import java.io.BufferedInputStream;
@@ -54,7 +55,7 @@
*/
public class ObjectPersistenceManager extends AbstractPersistenceManager {
- private static Logger log = Logger.getLogger(ObjectPersistenceManager.class);
+ private static Logger log = LoggerFactory.getLogger(ObjectPersistenceManager.class);
/**
* hexdigits for toString
@@ -115,7 +116,7 @@
} catch (NoSuchAlgorithmException nsae) {
// should never get here as MD5 should always be available in the JRE
String msg = "MD5 not available: ";
- log.fatal(msg, nsae);
+ log.error(msg, nsae);
throw new InternalError(msg + nsae);
}
return buildNodeFolderPath(id.getParentId()) + FileSystem.SEPARATOR + fileName;
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/xml/XMLPersistenceManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/xml/XMLPersistenceManager.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/xml/XMLPersistenceManager.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/xml/XMLPersistenceManager.java Tue Mar 14 23:41:48 2006
@@ -41,7 +41,8 @@
import org.apache.jackrabbit.core.value.InternalValue;
import org.apache.jackrabbit.name.QName;
import org.apache.jackrabbit.util.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.PropertyType;
import java.io.BufferedWriter;
@@ -66,7 +67,7 @@
*/
public class XMLPersistenceManager extends AbstractPersistenceManager {
- private static Logger log = Logger.getLogger(XMLPersistenceManager.class);
+ private static Logger log = LoggerFactory.getLogger(XMLPersistenceManager.class);
/**
* hexdigits for toString
@@ -161,7 +162,7 @@
} catch (NoSuchAlgorithmException nsae) {
// should never get here as MD5 should always be available in the JRE
String msg = "MD5 not available";
- log.fatal(msg, nsae);
+ log.error(msg, nsae);
throw new InternalError(msg + nsae);
}
return buildNodeFolderPath(id.getParentId()) + "/" + fileName;
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/value/BLOBFileValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/value/BLOBFileValue.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/value/BLOBFileValue.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/value/BLOBFileValue.java Tue Mar 14 23:41:48 2006
@@ -20,7 +20,8 @@
import org.apache.jackrabbit.core.fs.FileSystemResource;
import org.apache.jackrabbit.util.ISO8601;
import org.apache.jackrabbit.util.TransientFileFactory;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -54,7 +55,7 @@
/**
* The default logger
*/
- private static Logger log = Logger.getLogger(BLOBFileValue.class);
+ private static Logger log = LoggerFactory.getLogger(BLOBFileValue.class);
/**
* the property type
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersion.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersion.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersion.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersion.java Tue Mar 14 23:41:48 2006
@@ -22,7 +22,8 @@
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.NodeImpl;
import org.apache.jackrabbit.core.state.NodeState;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.Item;
import javax.jcr.RepositoryException;
@@ -42,7 +43,7 @@
/**
* Logger instance.
*/
- private static Logger log = Logger.getLogger(AbstractVersion.class);
+ private static Logger log = LoggerFactory.getLogger(AbstractVersion.class);
/**
* Create a new instance of this class.
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionHistory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionHistory.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionHistory.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionHistory.java Tue Mar 14 23:41:48 2006
@@ -26,7 +26,8 @@
import org.apache.jackrabbit.name.NoPrefixDeclaredException;
import org.apache.jackrabbit.name.QName;
import org.apache.jackrabbit.name.UnknownPrefixException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.Item;
import javax.jcr.RepositoryException;
@@ -47,7 +48,7 @@
/**
* Logger instance.
*/
- private static Logger log = Logger.getLogger(AbstractVersionHistory.class);
+ private static Logger log = LoggerFactory.getLogger(AbstractVersionHistory.class);
/**
* Create a new instance of this class.
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java Tue Mar 14 23:41:48 2006
@@ -24,7 +24,8 @@
import org.apache.jackrabbit.core.state.NodeState;
import org.apache.jackrabbit.name.QName;
import org.apache.jackrabbit.uuid.UUID;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
@@ -41,7 +42,7 @@
/**
* Logger instance.
*/
- private static Logger log = Logger.getLogger(AbstractVersionManager.class);
+ private static Logger log = LoggerFactory.getLogger(AbstractVersionManager.class);
/**
* State manager for the version storage.
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java Tue Mar 14 23:41:48 2006
@@ -24,7 +24,8 @@
import org.apache.jackrabbit.core.value.InternalValue;
import org.apache.jackrabbit.name.QName;
import org.apache.jackrabbit.uuid.UUID;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.PropertyType;
import javax.jcr.ReferentialIntegrityException;
@@ -46,7 +47,7 @@
/**
* default logger
*/
- private static Logger log = Logger.getLogger(InternalVersionHistory.class);
+ private static Logger log = LoggerFactory.getLogger(InternalVersionHistory.class);
/**
* the cache of the version labels
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java Tue Mar 14 23:41:48 2006
@@ -33,7 +33,8 @@
import org.apache.jackrabbit.core.virtual.VirtualNodeState;
import org.apache.jackrabbit.core.virtual.VirtualPropertyState;
import org.apache.jackrabbit.name.QName;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.RepositoryException;
@@ -45,7 +46,7 @@
/**
* the default logger
*/
- private static Logger log = Logger.getLogger(VersionItemStateProvider.class);
+ private static Logger log = LoggerFactory.getLogger(VersionItemStateProvider.class);
/**
* The version manager
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java Tue Mar 14 23:41:48 2006
@@ -37,7 +37,8 @@
import org.apache.jackrabbit.core.value.InternalValue;
import org.apache.jackrabbit.core.virtual.VirtualItemStateProvider;
import org.apache.jackrabbit.name.QName;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.PropertyType;
import javax.jcr.ReferentialIntegrityException;
@@ -61,7 +62,7 @@
/**
* the default logger
*/
- private static Logger log = Logger.getLogger(VersionManager.class);
+ private static Logger log = LoggerFactory.getLogger(VersionManager.class);
/**
* The persistence manager for the versions
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java Tue Mar 14 23:41:48 2006
@@ -35,7 +35,8 @@
import org.apache.jackrabbit.core.state.ItemStateListener;
import org.apache.jackrabbit.name.QName;
import org.apache.jackrabbit.uuid.UUID;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.RepositoryException;
import java.util.HashSet;
@@ -49,7 +50,7 @@
/**
* the default logger
*/
- private static Logger log = Logger.getLogger(AbstractVISProvider.class);
+ private static Logger log = LoggerFactory.getLogger(AbstractVISProvider.class);
/**
* the root node
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/AbstractSAXEventGenerator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/AbstractSAXEventGenerator.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/AbstractSAXEventGenerator.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/AbstractSAXEventGenerator.java Tue Mar 14 23:41:48 2006
@@ -20,7 +20,8 @@
import org.apache.jackrabbit.name.QName;
import org.apache.jackrabbit.name.SessionNamespaceResolver;
import org.apache.jackrabbit.name.NamespaceResolver;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -49,7 +50,7 @@
*/
abstract class AbstractSAXEventGenerator {
- private static Logger log = Logger.getLogger(AbstractSAXEventGenerator.class);
+ private static Logger log = LoggerFactory.getLogger(AbstractSAXEventGenerator.class);
/**
* the session to be used for resolving namespace mappings
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/DocViewImportHandler.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/DocViewImportHandler.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/DocViewImportHandler.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/DocViewImportHandler.java Tue Mar 14 23:41:48 2006
@@ -21,7 +21,8 @@
import org.apache.jackrabbit.name.QName;
import org.apache.jackrabbit.util.ISO9075;
import org.apache.jackrabbit.core.NodeId;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -38,7 +39,7 @@
*/
class DocViewImportHandler extends TargetImportHandler {
- private static Logger log = Logger.getLogger(DocViewImportHandler.class);
+ private static Logger log = LoggerFactory.getLogger(DocViewImportHandler.class);
/**
* stack of NodeInfo instances; an instance is pushed onto the stack
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/DocViewSAXEventGenerator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/DocViewSAXEventGenerator.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/DocViewSAXEventGenerator.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/DocViewSAXEventGenerator.java Tue Mar 14 23:41:48 2006
@@ -20,7 +20,8 @@
import org.apache.jackrabbit.name.QName;
import org.apache.jackrabbit.util.ISO9075;
import org.apache.jackrabbit.value.ValueHelper;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -40,7 +41,7 @@
*/
public class DocViewSAXEventGenerator extends AbstractSAXEventGenerator {
- private static Logger log = Logger.getLogger(DocViewSAXEventGenerator.class);
+ private static Logger log = LoggerFactory.getLogger(DocViewSAXEventGenerator.class);
public static final String CDATA_TYPE = "CDATA";
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/ImportHandler.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/ImportHandler.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/ImportHandler.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/ImportHandler.java Tue Mar 14 23:41:48 2006
@@ -20,7 +20,8 @@
import org.apache.jackrabbit.name.NamespaceResolver;
import org.apache.jackrabbit.name.QName;
import org.apache.jackrabbit.name.AbstractNamespaceResolver;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
@@ -50,7 +51,7 @@
*/
public class ImportHandler extends DefaultHandler {
- private static Logger log = Logger.getLogger(ImportHandler.class);
+ private static Logger log = LoggerFactory.getLogger(ImportHandler.class);
protected final Importer importer;
protected final NamespaceRegistryImpl nsReg;
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java Tue Mar 14 23:41:48 2006
@@ -28,7 +28,8 @@
import org.apache.jackrabbit.value.ReferenceValue;
import org.apache.jackrabbit.value.ValueHelper;
import org.apache.jackrabbit.uuid.UUID;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.ItemExistsException;
@@ -51,7 +52,7 @@
*/
public class SessionImporter implements Importer {
- private static Logger log = Logger.getLogger(SessionImporter.class);
+ private static Logger log = LoggerFactory.getLogger(SessionImporter.class);
private final SessionImpl session;
private final NodeImpl importTargetNode;
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java Tue Mar 14 23:41:48 2006
@@ -18,7 +18,8 @@
import org.apache.jackrabbit.name.NamespaceResolver;
import org.apache.jackrabbit.util.TransientFileFactory;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.helpers.DefaultHandler;
import java.io.File;
@@ -37,7 +38,7 @@
*/
abstract class TargetImportHandler extends DefaultHandler {
- private static Logger log = Logger.getLogger(TargetImportHandler.class);
+ private static Logger log = LoggerFactory.getLogger(TargetImportHandler.class);
protected final Importer importer;
protected final NamespaceResolver nsContext;
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java Tue Mar 14 23:41:48 2006
@@ -39,7 +39,8 @@
import org.apache.jackrabbit.util.Base64;
import org.apache.jackrabbit.util.TransientFileFactory;
import org.apache.jackrabbit.uuid.UUID;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.ItemExistsException;
@@ -65,7 +66,7 @@
*/
public class WorkspaceImporter implements Importer {
- private static Logger log = Logger.getLogger(WorkspaceImporter.class);
+ private static Logger log = LoggerFactory.getLogger(WorkspaceImporter.class);
private final NodeState importTarget;
private final WorkspaceImpl wsp;
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceExtractor.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceExtractor.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceExtractor.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceExtractor.java Tue Mar 14 23:41:48 2006
@@ -29,7 +29,8 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.helpers.XMLReaderFactory;
import org.xml.sax.helpers.DefaultHandler;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.NamespaceException;
import java.io.FileInputStream;
@@ -48,7 +49,7 @@
* to resolve namespaces.
*/
public class NamespaceExtractor {
- private static Logger log = Logger.getLogger(NamespaceExtractor.class);
+ private static Logger log = LoggerFactory.getLogger(NamespaceExtractor.class);
private final NamespaceMapping mapping = new NamespaceMapping();
private final Map basePrefixes = new HashMap();
private String defaultBasePrefix;
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java Tue Mar 14 23:41:48 2006
@@ -17,7 +17,8 @@
package org.apache.jackrabbit.core;
import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.Session;
import javax.jcr.Node;
@@ -33,7 +34,7 @@
public class ConcurrentSaveTest extends AbstractJCRTest {
/** logger instance */
- private static final Logger log = Logger.getLogger(ConcurrentSaveTest.class);
+ private static final Logger log = LoggerFactory.getLogger(ConcurrentSaveTest.class);
private final int NUM_NODES = 1000;
private Session addNodeSession;
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/converter/SchemaConverterTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/converter/SchemaConverterTest.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/converter/SchemaConverterTest.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/converter/SchemaConverterTest.java Tue Mar 14 23:41:48 2006
@@ -22,7 +22,8 @@
import org.apache.jackrabbit.util.name.NamespaceExtractor;
import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
import org.apache.jackrabbit.name.NamespaceResolver;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.*;
import java.io.*;
@@ -43,7 +44,7 @@
*/
public class SchemaConverterTest extends TestCase {
- private static Logger log = Logger.getLogger(SchemaConverterTest.class);
+ private static Logger log = LoggerFactory.getLogger(SchemaConverterTest.class);
private static final String TEST_INPUT_FILE = "applications/test/xsd-converter-test-input.xsd";
private static final String MODEL_RESULT_FILE = "applications/test/xsd-converter-model-output.cnd";
private static final String DEFAULT_PREFIX = "test";
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/test/JUnitTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/test/JUnitTest.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/test/JUnitTest.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/test/JUnitTest.java Tue Mar 14 23:41:48 2006
@@ -16,8 +16,10 @@
*/
package org.apache.jackrabbit.test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
/**
* Abstract base class for any JUnit test case.
@@ -27,7 +29,7 @@
/**
* Logger instance for test cases
*/
- private static final Logger logger = Logger.getLogger(JUnitTest.class);
+ private static final Logger logger = LoggerFactory.getLogger(JUnitTest.class);
/**
* Output stream for general messages from tests.
Modified: incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/test/LogPrintWriter.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/test/LogPrintWriter.java?rev=385991&r1=385990&r2=385991&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/test/LogPrintWriter.java (original)
+++ incubator/jackrabbit/branches/1.0/jackrabbit/src/test/java/org/apache/jackrabbit/test/LogPrintWriter.java Tue Mar 14 23:41:48 2006
@@ -16,8 +16,7 @@
*/
package org.apache.jackrabbit.test;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
+import org.slf4j.Logger;
import java.io.Writer;
import java.io.IOException;
@@ -40,11 +39,6 @@
private Logger log;
/**
- * Default Level is debug.
- */
- private Level level = Level.DEBUG;
-
- /**
* Creates a new <code>LogPrintWriter</code> which is based on a
* <code>Writer</code>.
*
@@ -90,16 +84,6 @@
this.log = log;
}
- /**
- * Sets the log level for messages written to the <code>Logger</code>
- * instance currently set in this <code>LogPrintWriter</code>.
- *
- * @param level the log level to set.
- */
- public void setMsgLevel(Level level) {
- this.level = level;
- }
-
//------------------< overrides from PrintWriter >-------------------------
public void close() {
@@ -139,7 +123,7 @@
return;
}
if (log != null) {
- log.log(level, buffer);
+ log.debug(buffer.toString());
} else {
try {
out.write(buffer.toString());