You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2012/03/13 03:12:45 UTC
svn commit: r1299954 - in /lucene/dev/branches/lucene3795_lsp_spatial_module:
dev-tools/maven/modules/spatial/ modules/spatial/lib/
modules/spatial/src/java/org/apache/lucene/spatial/util/
modules/spatial/src/java/org/apache/lucene/spatial/vector/ modu...
Author: dsmiley
Date: Tue Mar 13 02:12:44 2012
New Revision: 1299954
URL: http://svn.apache.org/viewvc?rev=1299954&view=rev
Log:
LUCENE-3795 removed SLF4J dependency by logging to java.util.logging instead
Removed:
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/slf4j-LICENSE-BSD_LIKE.txt
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/slf4j-NOTICE.txt
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/slf4j-api-1.6.1.jar
Modified:
lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/maven/modules/spatial/pom.xml.template
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/maven/modules/spatial/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/maven/modules/spatial/pom.xml.template?rev=1299954&r1=1299953&r2=1299954&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/maven/modules/spatial/pom.xml.template (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/maven/modules/spatial/pom.xml.template Tue Mar 13 02:12:44 2012
@@ -50,10 +50,6 @@
<artifactId>spatial4j</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>lucene-core</artifactId>
<version>${project.version}</version>
@@ -68,12 +64,6 @@
<artifactId>lucene-analyzers-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>lucene-benchmark</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java?rev=1299954&r1=1299953&r2=1299954&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java Tue Mar 13 02:12:44 2012
@@ -21,15 +21,13 @@ import com.spatial4j.core.shape.Shape;
import org.apache.lucene.index.*;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.BytesRef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.WeakHashMap;
-
+import java.util.logging.Logger;
public abstract class ShapeFieldCacheProvider<T extends Shape> {
- static final Logger log = LoggerFactory.getLogger(ShapeFieldCacheProvider.class);
+ private Logger log = Logger.getLogger(getClass().getName());
// it may be a List<T> or T
WeakHashMap<IndexReader, ShapeFieldCache<T>> sidx = new WeakHashMap<IndexReader, ShapeFieldCache<T>>();
@@ -51,7 +49,7 @@ public abstract class ShapeFieldCachePro
}
long startTime = System.currentTimeMillis();
- log.info("Building Cache [" + reader.maxDoc() + "]");
+ log.fine("Building Cache [" + reader.maxDoc() + "]");
idx = new ShapeFieldCache<T>(reader.maxDoc(),defaultSize);
int count = 0;
DocsEnum docs = null;
@@ -76,7 +74,7 @@ public abstract class ShapeFieldCachePro
}
sidx.put(reader, idx);
long elapsed = System.currentTimeMillis() - startTime;
- log.info("Cached: [" + count + " in " + elapsed + "ms] " + idx);
+ log.fine("Cached: [" + count + " in " + elapsed + "ms] " + idx);
return idx;
}
}
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java?rev=1299954&r1=1299953&r2=1299954&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java Tue Mar 13 02:12:44 2012
@@ -37,14 +37,9 @@ import org.apache.lucene.spatial.Spatial
import org.apache.lucene.spatial.util.CachingDoubleValueSource;
import org.apache.lucene.spatial.util.NumericFieldInfo;
import org.apache.lucene.spatial.util.ValueSourceFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class TwoDoublesStrategy extends SpatialStrategy<TwoDoublesFieldInfo> {
- static final Logger log = LoggerFactory.getLogger(TwoDoublesStrategy.class);
-
private final NumericFieldInfo finfo;
private final DoubleParser parser;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java?rev=1299954&r1=1299953&r2=1299954&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java Tue Mar 13 02:12:44 2012
@@ -28,12 +28,11 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexableField;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
+import java.util.logging.Logger;
public abstract class StrategyTestCase<T extends SpatialFieldInfo> extends SpatialTestCase {
@@ -48,7 +47,7 @@ public abstract class StrategyTestCase<T
public static final String QTEST_Cities_IsWithin_BBox = "cities-IsWithin-BBox.txt";
- protected final Logger log = LoggerFactory.getLogger(getClass());
+ private Logger log = Logger.getLogger(getClass().getName());
protected final SpatialArgsParser argsParser = new SpatialArgsParser();