Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-3795 removed SLF4J dependency by logging to java.util.logging instead 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1299954 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Wayne Smiley 2012-03-13 02:12:44 +00:00
parent f2b7adab38
commit a29ad6dae9
7 changed files with 6 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev-tools/maven/modules/spatial/pom.xml.template
View File

@ -49,10 +49,6 @@
<groupId>com.spatial4j</groupId>
<artifactId>spatial4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>lucene-core</artifactId>
@ -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>

21
modules/spatial/lib/slf4j-LICENSE-BSD_LIKE.txt
View File

@ -1,21 +0,0 @@
Copyright (c) 2004-2008 QOS.ch
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

25
modules/spatial/lib/slf4j-NOTICE.txt
View File

@ -1,25 +0,0 @@
=========================================================================
== SLF4J Notice -- http://www.slf4j.org/license.html ==
=========================================================================
Copyright (c) 2004-2008 QOS.ch
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

2
modules/spatial/lib/slf4j-api-1.6.1.jar
View File

@ -1,2 +0,0 @@
AnyObjectId[42e0ad0de7773da9b94b12f503deda7f5a506015] was removed in git history.
Apache SVN contains full history.

10
modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java
View File

@ -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 ShapeFieldCacheProvider<T extends Shape> {
}
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 ShapeFieldCacheProvider<T extends Shape> {
}
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;
}
}

5
modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java
View File

@ -37,14 +37,9 @@ import org.apache.lucene.spatial.SpatialStrategy;
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;

5
modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
View File

@ -28,12 +28,11 @@ import org.apache.lucene.document.Document;
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 extends SpatialFieldInfo> extends Spati
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();