Author: markg
Date: Fri Jan 10 12:57:21 2014
New Revision: 1557107
URL: http://svn.apache.org/r1557107
Log:
OPENNLP-626
renamed packages for consistency in addons, also made small efficiencies
Added:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContext.java
- copied, changed from r1547783,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryContext.java
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContextEntry.java
- copied, changed from r1547783,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryContextEntry.java
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContextHit.java
- copied, changed from r1539319,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryContextHit.java
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryProximityScorer.java
- copied, changed from r1547783,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryProximityScorer.java
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/FuzzyStringMatchScorer.java
- copied, changed from r1541770,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/FuzzyStringMatchScorer.java
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerEntry.java
- copied, changed from r1539319,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerEntry.java
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerIndexer.java
- copied, changed from r1552610,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerIndexer.java
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerSearchCache.java
- copied, changed from r1544511,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerSearchCache.java
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerSearcher.java
- copied, changed from r1547783,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerSearcher.java
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinker.java
- copied, changed from r1547783,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GeoEntityLinker.java
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinkerSetupUtils.java
- copied, changed from r1541887,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GeoEntityLinkerSetupUtils.java
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoHashBinningScorer.java
- copied, changed from r1541014,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GeoHashBinningScorer.java
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/LinkedEntityScorer.java
- copied, changed from r1541014,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/LinkedEntityScorer.java
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/ModelBasedScorer.java
- copied, changed from r1541770,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/ModelBasedScorer.java
Modified:
opennlp/sandbox/apache-opennlp-addons/pom.xml
Modified: opennlp/sandbox/apache-opennlp-addons/pom.xml
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/pom.xml?rev=1557107&r1=1557106&r2=1557107&view=diff
==============================================================================
--- opennlp/sandbox/apache-opennlp-addons/pom.xml (original)
+++ opennlp/sandbox/apache-opennlp-addons/pom.xml Fri Jan 10 12:57:21 2014
@@ -1,28 +1,33 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.opennlp</groupId>
+ <artifactId>opennlp</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <relativePath>../opennlp/pom.xml</relativePath>
+ </parent>
- <groupId>apache-opennlp-addons</groupId>
- <artifactId>apache-opennlp-addons</artifactId>
+ <artifactId>geoentitylinker-addon</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
-<name>Apache OpenNLP Addons</name>
+ <name>geoentitylinker-addon</name>
<url>http://maven.apache.org</url>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -33,7 +38,7 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>4.5.0</version>
@@ -51,7 +56,7 @@
<version>4.5.0</version>
<optional>true</optional>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp-tools</artifactId>
<version>1.6.0-SNAPSHOT</version>
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContext.java
(from r1547783,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryContext.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContext.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContext.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryContext.java&r1=1547783&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryContext.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContext.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
import java.io.BufferedReader;
import java.io.FileReader;
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContextEntry.java
(from r1547783,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryContextEntry.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContextEntry.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContextEntry.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryContextEntry.java&r1=1547783&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryContextEntry.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContextEntry.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
import java.util.Objects;
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContextHit.java
(from r1539319,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryContextHit.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContextHit.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContextHit.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryContextHit.java&r1=1539319&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryContextHit.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryContextHit.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
/**
*Stores a "hit" on a country and the start and end of the hit
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryProximityScorer.java
(from r1547783,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryProximityScorer.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryProximityScorer.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryProximityScorer.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryProximityScorer.java&r1=1547783&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/CountryProximityScorer.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/CountryProximityScorer.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
import java.util.ArrayList;
import java.util.HashMap;
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/FuzzyStringMatchScorer.java
(from r1541770,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/FuzzyStringMatchScorer.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/FuzzyStringMatchScorer.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/FuzzyStringMatchScorer.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/FuzzyStringMatchScorer.java&r1=1541770&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/FuzzyStringMatchScorer.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/FuzzyStringMatchScorer.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
import java.util.HashSet;
import java.util.List;
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerEntry.java
(from r1539319,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerEntry.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerEntry.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerEntry.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerEntry.java&r1=1539319&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerEntry.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerEntry.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
import java.util.HashMap;
import java.util.Map;
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerIndexer.java
(from r1552610,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerIndexer.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerIndexer.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerIndexer.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerIndexer.java&r1=1552610&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerIndexer.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerIndexer.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
import java.io.BufferedReader;
import java.io.File;
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerSearchCache.java
(from r1544511,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerSearchCache.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerSearchCache.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerSearchCache.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerSearchCache.java&r1=1544511&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerSearchCache.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerSearchCache.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
import java.util.ArrayList;
import java.util.HashMap;
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerSearcher.java
(from r1547783,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerSearcher.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerSearcher.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerSearcher.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerSearcher.java&r1=1547783&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GazateerSearcher.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GazateerSearcher.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
import java.io.File;
import java.io.IOException;
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinker.java
(from r1547783,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GeoEntityLinker.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinker.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinker.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GeoEntityLinker.java&r1=1547783&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GeoEntityLinker.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinker.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
import java.util.ArrayList;
import java.util.List;
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinkerSetupUtils.java
(from r1541887,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GeoEntityLinkerSetupUtils.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinkerSetupUtils.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinkerSetupUtils.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GeoEntityLinkerSetupUtils.java&r1=1541887&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GeoEntityLinkerSetupUtils.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinkerSetupUtils.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -35,7 +35,7 @@ import opennlp.tools.doccat.DocumentSamp
import opennlp.tools.entitylinker.EntityLinkerProperties;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
-import static
org.apache.opennlp.addons.tools.entitylinker.geoentitylinker.ModelBasedScorer.RADIUS;
+import static opennlp.addons.geoentitylinker.ModelBasedScorer.RADIUS;
/**
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoHashBinningScorer.java
(from r1541014,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GeoHashBinningScorer.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoHashBinningScorer.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoHashBinningScorer.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GeoHashBinningScorer.java&r1=1541014&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/GeoHashBinningScorer.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/GeoHashBinningScorer.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
import java.util.ArrayList;
import java.util.HashMap;
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/LinkedEntityScorer.java
(from r1541014,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/LinkedEntityScorer.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/LinkedEntityScorer.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/LinkedEntityScorer.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/LinkedEntityScorer.java&r1=1541014&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/LinkedEntityScorer.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/LinkedEntityScorer.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
import java.util.List;
import opennlp.tools.entitylinker.EntityLinkerProperties;
Copied:
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/ModelBasedScorer.java
(from r1541770,
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/ModelBasedScorer.java)
URL:
http://svn.apache.org/viewvc/opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/ModelBasedScorer.java?p2=opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/ModelBasedScorer.java&p1=opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/ModelBasedScorer.java&r1=1541770&r2=1557107&rev=1557107&view=diff
==============================================================================
---
opennlp/sandbox/apache-opennlp-addons/src/main/java/org/apache/opennlp/addons/tools/entitylinker/geoentitylinker/ModelBasedScorer.java
(original)
+++
opennlp/sandbox/apache-opennlp-addons/src/main/java/opennlp/addons/geoentitylinker/ModelBasedScorer.java
Fri Jan 10 12:57:21 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.opennlp.addons.tools.entitylinker.geoentitylinker;
+package opennlp.addons.geoentitylinker;
import java.io.File;
import java.io.FileNotFoundException;
