You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2013/03/11 14:19:02 UTC
svn commit: r1455131 [1/7] - in /stanbol/branches/stanbol-solr4: commons/
commons/frameworkfragment/ commons/solr/core/
commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/
commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/uti...
Author: rwesten
Date: Mon Mar 11 13:18:59 2013
New Revision: 1455131
URL: http://svn.apache.org/r1455131
Log:
STANBOL-966: Commit if the patch version 6; Also includes current state of STANBOL-980
Added:
stanbol/branches/stanbol-solr4/commons/solr/extras/kuromoji/ (with props)
stanbol/branches/stanbol-solr4/commons/solr/extras/kuromoji/README.md
stanbol/branches/stanbol-solr4/commons/solr/extras/kuromoji/pom.xml
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/ (with props)
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/pom.xml
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/src/
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/src/main/
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/src/main/resources/
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/src/main/resources/config/
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/src/main/resources/config/org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.lucene.LuceneLabelTokenizer-kuromoji.config
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/ (with props)
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/pom.xml
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/java/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/java/org/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/java/org/apache/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/java/org/apache/stanbol/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/java/org/apache/stanbol/enhancer/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/java/org/apache/stanbol/enhancer/engines/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/java/org/apache/stanbol/enhancer/engines/kuromoji/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/java/org/apache/stanbol/enhancer/engines/kuromoji/Constants.java
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/KuromojiNlpEngine.java
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/NerData.java
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/resources/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/resources/OSGI-INF/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/resources/OSGI-INF/metatype/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/resources/OSGI-INF/metatype/metatype.properties
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/main/resources/nostoptags.txt
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/test/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/test/java/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/test/java/org/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/enhancer/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/enhancer/engines/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/enhancer/engines/kuromoji/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/ClasspathDataFileProvider.java
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/MockComponentContext.java
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/TestKuromojiNlpEngine.java
stanbol/branches/stanbol-solr4/enhancement-engines/kuromoji-nlp/src/test/resources/
stanbol/branches/stanbol-solr4/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/mapping-FoldToASCII.txt
stanbol/branches/stanbol-solr4/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/stopwords_en.txt
stanbol/branches/stanbol-solr4/entityhub/yard/solr/src/main/resources/solr/core/kuromoji.solrindex.zip (with props)
stanbol/branches/stanbol-solr4/entityhub/yard/solr/src/main/resources/solr/core/paoding.solrindex.outdated (with props)
stanbol/branches/stanbol-solr4/integration-tests/src/test/resources/log4j.properties (with props)
stanbol/branches/stanbol-solr4/launchers/bundlelists/language-extras/kuromoji/ (with props)
stanbol/branches/stanbol-solr4/launchers/bundlelists/language-extras/kuromoji/README.md
stanbol/branches/stanbol-solr4/launchers/bundlelists/language-extras/kuromoji/pom.xml (with props)
stanbol/branches/stanbol-solr4/launchers/bundlelists/language-extras/kuromoji/src/
stanbol/branches/stanbol-solr4/launchers/bundlelists/language-extras/kuromoji/src/main/
stanbol/branches/stanbol-solr4/launchers/bundlelists/language-extras/kuromoji/src/main/bundles/
stanbol/branches/stanbol-solr4/launchers/bundlelists/language-extras/kuromoji/src/main/bundles/list.xml
Removed:
stanbol/branches/stanbol-solr4/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/admin-extra.html
stanbol/branches/stanbol-solr4/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/elevate.xml
stanbol/branches/stanbol-solr4/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/xslt/
stanbol/branches/stanbol-solr4/entityhub/yard/solr/src/main/resources/solr/core/paoding.solrindex.zip
Modified:
stanbol/branches/stanbol-solr4/commons/frameworkfragment/pom.xml
stanbol/branches/stanbol-solr4/commons/pom.xml
stanbol/branches/stanbol-solr4/commons/solr/core/pom.xml
stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java
stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/StanbolResourceLoader.java
stanbol/branches/stanbol-solr4/commons/solr/extras/smartcn/pom.xml
stanbol/branches/stanbol-solr4/commons/solr/extras/stempel/pom.xml
stanbol/branches/stanbol-solr4/commons/solr/install/pom.xml
stanbol/branches/stanbol-solr4/commons/solr/managed/pom.xml
stanbol/branches/stanbol-solr4/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
stanbol/branches/stanbol-solr4/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java
stanbol/branches/stanbol-solr4/commons/solr/web/pom.xml
stanbol/branches/stanbol-solr4/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/DelegatingSolrDispatchFilter.java
stanbol/branches/stanbol-solr4/contenthub/ldpath/pom.xml
stanbol/branches/stanbol-solr4/contenthub/search/featured/pom.xml
stanbol/branches/stanbol-solr4/contenthub/search/solr/pom.xml
stanbol/branches/stanbol-solr4/contenthub/store/solr/pom.xml
stanbol/branches/stanbol-solr4/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrStoreImpl.java
stanbol/branches/stanbol-solr4/contenthub/web/pom.xml
stanbol/branches/stanbol-solr4/development/archetypes/enhancement-engine/ (props changed)
stanbol/branches/stanbol-solr4/development/archetypes/statefull-webmodule/ (props changed)
stanbol/branches/stanbol-solr4/development/archetypes/stateless-webmodule/ (props changed)
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/pom.xml
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/LuceneLabelTokenizer.java
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/LuceneLabelTokenizerTest.java
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/TokenizerAndTokenFIlterTest.java
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-paoding/pom.xml
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-smartcn/src/main/resources/config/org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.lucene.LuceneLabelTokenizer-smartcn.config
stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/pom.xml
stanbol/branches/stanbol-solr4/enhancement-engines/entitytagging/pom.xml
stanbol/branches/stanbol-solr4/enhancement-engines/paoding-token/pom.xml
stanbol/branches/stanbol-solr4/enhancement-engines/paoding-token/src/main/java/org/apache/stanbol/enhancer/engines/paoding/token/PaodingTokenizerEngine.java
stanbol/branches/stanbol-solr4/enhancement-engines/pom.xml
stanbol/branches/stanbol-solr4/enhancement-engines/sentiment-wordclassifier/pom.xml
stanbol/branches/stanbol-solr4/enhancement-engines/sentiment-wordclassifier/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/classifiers/SentiWordNet.java
stanbol/branches/stanbol-solr4/enhancement-engines/smartcn-token/pom.xml
stanbol/branches/stanbol-solr4/enhancement-engines/smartcn-token/src/main/java/org/apache/stanbol/enhancer/engines/smartcn/impl/SmartcnSentenceEngine.java
stanbol/branches/stanbol-solr4/enhancement-engines/smartcn-token/src/main/java/org/apache/stanbol/enhancer/engines/smartcn/impl/SmartcnTokenizerEngine.java
stanbol/branches/stanbol-solr4/enhancement-engines/topic/engine/pom.xml
stanbol/branches/stanbol-solr4/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/it/AssertEntityhubJson.java
stanbol/branches/stanbol-solr4/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/it/EntityhubTestBase.java
stanbol/branches/stanbol-solr4/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/mapping-ISOLatin1Accent.txt
stanbol/branches/stanbol-solr4/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/protwords.txt
stanbol/branches/stanbol-solr4/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/schema.xml
stanbol/branches/stanbol-solr4/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/solrconfig.xml
stanbol/branches/stanbol-solr4/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/spellings.txt
stanbol/branches/stanbol-solr4/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/stopwords.txt
stanbol/branches/stanbol-solr4/entityhub/indexing/destination/solryard/src/test/resources/testConfigs/withSolrConf/indexing/config/simple/conf/synonyms.txt
stanbol/branches/stanbol-solr4/entityhub/ldpath/pom.xml
stanbol/branches/stanbol-solr4/entityhub/yard/solr/pom.xml
stanbol/branches/stanbol-solr4/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrYard.java
stanbol/branches/stanbol-solr4/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java
stanbol/branches/stanbol-solr4/entityhub/yard/solr/src/main/resources/solr/core/default.solrindex.zip
stanbol/branches/stanbol-solr4/entityhub/yard/solr/src/main/resources/solr/core/entityhub.solrindex.zip
stanbol/branches/stanbol-solr4/entityhub/yard/solr/src/main/resources/solr/core/smartcn.solrindex.zip
stanbol/branches/stanbol-solr4/integration-tests/pom.xml
stanbol/branches/stanbol-solr4/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
stanbol/branches/stanbol-solr4/integration-tests/src/test/java/org/apache/stanbol/entityhub/it/EntityhubTest.java
stanbol/branches/stanbol-solr4/launchers/bundlelists/pom.xml
stanbol/branches/stanbol-solr4/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/branches/stanbol-solr4/launchers/full/pom.xml
stanbol/branches/stanbol-solr4/parent/pom.xml
Modified: stanbol/branches/stanbol-solr4/commons/frameworkfragment/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/frameworkfragment/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/frameworkfragment/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/commons/frameworkfragment/pom.xml Mon Mar 11 13:18:59 2013
@@ -89,7 +89,10 @@
are set to 1.4.0 as specified for Java SE 6 by
http://docs.oracle.com/javase/6/docs/technotes/guides/xml/jaxp/index.html
-->
+ <!-- The packages com.sun.management.* are referenced by zookeper -->
<Export-Package>
+ com.sun.management,
+ com.sun.management.jmx,
com.sun.xml.bind.v2.model.runtime,
com.sun.xml.bind.v2.model.core,
com.sun.xml.bind.v2.runtime,
Modified: stanbol/branches/stanbol-solr4/commons/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/commons/pom.xml Mon Mar 11 13:18:59 2013
@@ -93,6 +93,7 @@
<module>solr/defaults</module>
<module>solr/extras/smartcn</module> <!-- support for the smartcn (Chinese) analyzer -->
<module>solr/extras/paoding</module> <!-- alternative support for Chinese -->
+ <module>solr/extras/kuromoji</module> <!-- support for Japanese -->
<module>solr/extras/stempel</module> <!-- support for the Polish stemmer -->
<module>jobs</module> <!-- Stanbol Background Jobs Framework -->
Modified: stanbol/branches/stanbol-solr4/commons/solr/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/core/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/core/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/commons/solr/core/pom.xml Mon Mar 11 13:18:59 2013
@@ -70,93 +70,43 @@
</Export-Package>
<!-- used instead of Export-Package to preserve the jars -->
<_exportcontents>
- org.apache.solr.client.solrj;version=${solr-version},
- org.apache.solr.client.solrj.beans;version=${solr-version},
- org.apache.solr.client.solrj.impl;version=${solr-version},
- org.apache.solr.client.solrj.request;version=${solr-version},
- org.apache.solr.client.solrj.response;version=${solr-version},
- org.apache.solr.client.solrj.util;version=${solr-version},
- org.apache.solr.client.solrj.embedded;version=${solr-version},
- org.apache.solr.common;version=${solr-version},
- org.apache.solr.common.luke;version=${solr-version},
- org.apache.solr.common.params;version=${solr-version},
- org.apache.solr.common.util;version=${solr-version},
- org.apache.solr.servlet;version=${solr-version},
- org.apache.solr.core;version=${solr-version},
- org.apache.solr.handler.*;version=${solr-version},
- org.apache.solr.request;version=${solr-version},
- org.apache.solr.response;version=${solr-version},
- org.apache.solr.schema;version=${solr-version},
- org.apache.solr.search.*;version=${solr-version},
- org.apache.solr.update.*;version=${solr-version},
- org.apache.solr.util.*;version=${solr-version},
+ org.apache.solr.*;version=${solr-version},
org.apache.solr.analysis;-split-package:=merge-last;version=${solr-version},
org.apache.lucene.*;version=${solr-version}
</_exportcontents>
- <!-- NOTE:
- * The exclusion of javax.xml.stream assumes that only serialised
- java objects are used as serialisation to and from the SolrServer
- and therefore no XML API is needed
- * The exclusion of some "org.apache.lucene.analysis." is to
- avoid the inclusion of big dependencies (other than ICU) for
- the "solr-analysis-extras" bundle -->
+ <!-- packages marked with resolution:=optional are not provided by
+ this module. Users that need them will need to provide bundles
+ exporting those frameworks -->
<Import-Package>
- !org.mortbay.jetty.*,
- !org.mortbay.log,
- !com.sun.msv.*,
- !org.relaxng.datatype,
- !org.apache.tika.*,
- !javax.servlet.jsp.*,
- !org.apache.commons.digester.*,
- !org.apache.commons.validator.*,
- !org.apache.log.*,
- !org.apache.struts.*,
- !org.apache.tools.ant.*,
- !org.dom4j.*,
- !org.jdom.*,
- !antlr.*,
- !com.werken.*,
- !org.apache.oro.*,
+ org.slf4j.impl;resolution:=optional,
+ org.apache.log4j.jmx;resolution:=optional,
+ org.apache.log4j.spi;resolution:=optional,
+ org.jboss.netty.*;resolution:=optional,
+ jline.*;resolution:=optional,
+ org.apache.tika.*;resolution:=optional,
org.apache.lucene.analysis.cn.smart.*;resolution:=optional,
org.apache.lucene.analysis.pl.*;resolution:=optional,
org.apache.lucene.analysis.ja.*;resolution:=optional,
org.apache.lucene.analysis.stempel.*;resolution:=optional,
org.apache.lucene.search.grouping.*;resolution:=optional,
+ org.apache.zookeeper.*;resolution:=optional,
+ org.eclipse.jetty.*;resolution:=optional,
org.egothor.stemmer.*;resolution:=optional,
javax.servlet.*; version="[2.5.0,4.0.0)",
- org.apache.stanbol.commons.solr,
- org.apache.stanbol.commons.solr.utils,
- org.apache.solr.client.solrj,
- org.apache.solr.client.solrj.beans,
- org.apache.solr.client.solrj.impl,
- org.apache.solr.client.solrj.request,
- org.apache.solr.client.solrj.response,
- org.apache.solr.client.solrj.util,
- org.apache.solr.client.solrj.embedded,
- org.apache.solr.common,
- org.apache.solr.common.luke,
- org.apache.solr.common.params,
- org.apache.solr.common.util,
- org.apache.solr.servlet,
- org.apache.solr.core,
- org.apache.solr.handler.*,
- org.apache.solr.request,
- org.apache.solr.response,
- org.apache.solr.schema,
- org.apache.solr.search.*,
- org.apache.solr.update.*,
- org.apache.solr.util.*,
- org.apache.solr.analysis,
- org.apache.lucene.*,
+ org.tartarus.snowball;resolution:=optional,
+ morfologik.*;resolution:=optional,
*
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
<Embed-Dependency>
solr-solrj, solr-core, solr-dataimporthandler,
- solr-analysis-extras, commons-httpclient,
- lucene-core, lucene-analyzers, lucene-highlighter, lucene-memory,
+ solr-analysis-extras,
+ lucene-core, lucene-analyzers-common, lucene-highlighter,
lucene-spatial, lucene-spellchecker, lucene-misc, lucene-queries,
- lucene-icu, lucene-phonetic, lucene-grouping
+ lucene-icu, lucene-analyzers-icu, lucene-memory,
+ lucene-phonetic, lucene-grouping, lucene-codecs,
+ lucene-queryparser, lucene-sandbox, lucene-suggest,
+ zookeeper
</Embed-Dependency>
</instructions>
</configuration>
@@ -181,11 +131,6 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
</dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
<!-- Solr/Lucene dependencies (needed for using embedded Solr servers) -->
<dependency>
@@ -206,7 +151,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers</artifactId>
+ <artifactId>lucene-analyzers-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -218,6 +163,10 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-codecs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
<artifactId>lucene-misc</artifactId>
</dependency>
<dependency>
@@ -226,7 +175,15 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spellchecker</artifactId>
+ <artifactId>lucene-queryparser</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-suggest</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-sandbox</artifactId>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -234,20 +191,20 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-icu</artifactId>
+ <artifactId>lucene-analyzers-icu</artifactId>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-phonetic</artifactId>
+ <artifactId>lucene-analyzers-phonetic</artifactId>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-grouping</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.regexp</artifactId>
- </dependency>
+ </dependency -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -264,21 +221,27 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
- </dependency>
+ </dependency -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+ </dependency -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
</dependency>
-<!-- NOTE: With Solr/Lucene 3.6.1 there is no longer a Lucene specific
- Xerces. Because of that we can use the XML stuff exported by the
- System Bundle from the JDK-->
+
<!-- The Solr-Core depends on the Servlet API and in case of running an
EmbeddedSolrServer the servlet-api is not available.
However this bundle assumes that servlet-api and portlet-api are
@@ -294,14 +257,8 @@
<scope>provided</scope>
</dependency>
- <!-- Solr has support of velocity templating (respone writer). This is not
- used by the Entityhub, but the related classes are direct part of the
- solr distribution. SolrCores can not be initialised without velocity!
- Because of this the velocity and velocity-tools jars need to be
- included however all additional dependencies are excluded. This allows
- to init Solr, but this will not allow to use the velocity related
- Response writer.
- To enable velocity one would need to add another 10+ dependencies. -->
+ <!-- Solr has support of velocity templating (respone writer). Dependency
+ is marked as optional for OSGI imported packages-->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
Modified: stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java (original)
+++ stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java Mon Mar 11 13:18:59 2013
@@ -636,7 +636,7 @@ public class SolrServerAdapter {
* @return the name under witch the SolrCore is registered. This can be
* also retrieved by using {@link ServiceReference#getProperty(String)
* gerServiceReference().getProperty(String)} with the key
- * {@link SolrConstants#NAME}.
+ * {@link SolrConstants#PROPERTY_CORE_NAME}.
*/
public String getName() {
return name;
Modified: stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java (original)
+++ stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java Mon Mar 11 13:18:59 2013
@@ -19,24 +19,21 @@ package org.apache.stanbol.commons.solr.
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.iterators.FilterIterator;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.LineIterator;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.solr.common.ResourceLoader;
+import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileProvider;
/**
* SolrResourceLoader that supports loading resources via the Apache Stanbol
* {@link DataFileProvider}<p>
- * This does NOT implement the {@link #newInstance(String, String...)} method.
+ * This does NOT implement the {@link #newInstance(String, Class)} method.
* Calls will throw an {@link UnsupportedOperationException}.
* Users that need to also load classes should combine this implementation with
* the {@link StanbolResourceLoader} that supports instantiation of classes via
@@ -75,7 +72,6 @@ public class DataFileResourceLoader impl
return dfp.getInputStream(null, resource, null);
}
- @Override
public List<String> getLines(String resource) throws IOException {
List<String> lines = new ArrayList<String>();
LineIterator it = IOUtils.lineIterator(openResource(resource), "UTF-8");
@@ -90,10 +86,10 @@ public class DataFileResourceLoader impl
/**
* Not implemented!
* @throws UnsupportedOperationException on every call to this mehtod
- * @see StanbolResourceLoader#newInstance(String, String...)
+ * @see StanbolResourceLoader#newInstance(String, Class)
*/
@Override
- public Object newInstance(String cname, String... subpackages) throws UnsupportedOperationException {
+ public <T> T newInstance(String cname, Class<T> expectedType) throws UnsupportedOperationException {
throw new UnsupportedOperationException("Loading of ClassFiles is not supported");
}
Modified: stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/StanbolResourceLoader.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/StanbolResourceLoader.java?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/StanbolResourceLoader.java (original)
+++ stanbol/branches/stanbol-solr4/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/StanbolResourceLoader.java Mon Mar 11 13:18:59 2013
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.LineIterator;
-import org.apache.solr.common.ResourceLoader;
+import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileProvider;
@@ -33,14 +33,13 @@ import org.slf4j.LoggerFactory;
/**
* Solr {@link ResourceLoader} implementation that supports adding an parent as
* well as parsing the classloader used for
- * {@link #newInstance(String, String...)}.<p>
+ * {@link #newInstance(String, Class)}.<p>
* This implementation can be used in combination with the
* {@link DataFileResourceLoader} to allow providing resources via the
* Stanbol {@link DataFileProvider} infrastructure.<p>
- * The {@link #newInstance(String, String...)} method uses the same algorithm as
- * the {@link SolrResourceLoader#newInstance(String, String...)} method to
- * build candidate class names. It also supports the default packages if
- * <code>null</code> or an empty array is parsed as second parameter.
+ * The {@link #newInstance(String, Class)} method uses the same algorithm as
+ * the {@link SolrResourceLoader#newInstance(String, Class)} method to
+ * build candidate class names. It supports the default packages.
* @author Rupert Westenthaler
*
*/
@@ -103,7 +102,6 @@ public class StanbolResourceLoader imple
return in;
}
- @Override
public List<String> getLines(String resource) throws IOException {
List<String> lines = new ArrayList<String>();
LineIterator it = IOUtils.lineIterator(openResource(resource), "UTF-8");
@@ -117,36 +115,33 @@ public class StanbolResourceLoader imple
}
@Override
- public Object newInstance(String cname, String... subpackages) {
+ public <T> T newInstance(String cname, Class<T> expectedType) {
String parentMessage = null;
if(parent != null){
try {
- return parent.newInstance(cname, subpackages);
+ return parent.newInstance(cname, expectedType);
} catch (SecurityException e) { //do not catch security related exceptions
throw e;
} catch (RuntimeException e) {
parentMessage = e.getMessage();
}
}
- if (subpackages == null || subpackages.length == 0 || subpackages == packages) {
- subpackages = packages;
- }
- Class clazz = null;
+ Class<T> clazz = null;
// first try cname == full name
try {
- clazz = classloader.loadClass(cname);
- } catch (ClassNotFoundException e) {
+ clazz = (Class<T>) classloader.loadClass(cname);
+ } catch (Exception e) {
String newName = cname;
if (newName.startsWith(project)) {
newName = cname.substring(project.length() + 1);
}
- for (String subpackage : subpackages) {
+ for (String subpackage : packages) {
try {
String name = base + '.' + subpackage + newName;
log.trace("Trying class name " + name);
- clazz = classloader.loadClass(name);
+ clazz = (Class<T>) classloader.loadClass(name);
break;
- } catch (ClassNotFoundException e1) {
+ } catch (Exception e1) {
// ignore... assume first exception is best.
}
}
Propchange: stanbol/branches/stanbol-solr4/commons/solr/extras/kuromoji/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 11 13:18:59 2013
@@ -0,0 +1,7 @@
+.settings
+
+target
+
+.classpath
+
+.project
Added: stanbol/branches/stanbol-solr4/commons/solr/extras/kuromoji/README.md
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/extras/kuromoji/README.md?rev=1455131&view=auto
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/extras/kuromoji/README.md (added)
+++ stanbol/branches/stanbol-solr4/commons/solr/extras/kuromoji/README.md Mon Mar 11 13:18:59 2013
@@ -0,0 +1,67 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+Bundle adding support for the Kuromoji Analyzer
+=============================================
+
+If installed to Apache Stanbol it will allow Solr Cores managed by Apache Stanbol ('org.apache.stanbol.commons.solr.core' module) to support fieldType definitions referring to Kuromoji analyzers.
+
+Kuromoji has a search mode (default) that does segmentation useful for search. A heuristic is used to segment compounds into its parts and the compound itself is kept as synonym.
+
+Valid values for attribute mode are:
+
+* normal: regular segmentation
+* search: segmentation useful for search with synonyms compounds (default)
+* extended: same as search mode, but unigrams unknown words (experimental)
+
+For some applications it might be good to use search mode for indexing and normal mode for queries to reduce recall and prevent parts of compounds from being matched and highlighted. Use <analyzer type="index"> and <analyzer type="query"> for this and mode normal in query.
+
+Kuromoji also has a convenient user dictionary feature that allows overriding the statistical model with your own entries for segmentation, part-of-speech tags and readings without a need to specify weights. Notice that user dictionaries have not been subject to extensive testing.
+
+User dictionary attributes are:
+
+* userDictionary: user dictionary filename
+* userDictionaryEncoding: user dictionary encoding (default is UTF-8)
+
+See lang/userdict_ja.txt for a sample user dictionary file. Punctuation characters are discarded by default. Use discardPunctuation="false" to keep them.
+
+See http://wiki.apache.org/solr/JapaneseLanguageSupport for more on Japanese language support.
+
+ :::xml
+ <fieldType name="text_ja" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="false">
+ <analyzer>
+ <!--
+ -->
+ <tokenizer class="solr.JapaneseTokenizerFactory" mode="search"/>
+ <!--<tokenizer class="solr.JapaneseTokenizerFactory" mode="search" userDictionary="lang/userdict_ja.txt"/>-->
+ <!-- Reduces inflected verbs and adjectives to their base/dictionary forms (è¾æ¸å½¢) -->
+ <filter class="solr.JapaneseBaseFormFilterFactory"/>
+ <!-- Removes tokens with certain part-of-speech tags -->
+ <filter class="solr.JapanesePartOfSpeechStopFilterFactory" tags="lang/stoptags_ja.txt" enablePositionIncrements="true"/>
+ <!-- Normalizes full-width romaji to half-width and half-width kana to full-width (Unicode NFKC subset) -->
+ <filter class="solr.CJKWidthFilterFactory"/>
+ <!-- Removes common tokens typically not useful for search, but have a negative effect on ranking -->
+ <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ja.txt" enablePositionIncrements="true" />
+ <!-- Normalizes common katakana spelling variations by removing any last long sound character (U+30FC) -->
+ <filter class="solr.JapaneseKatakanaStemFilterFactory" minimumLength="4"/>
+ <!-- Lower-cases romaji characters -->
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldType>
+
+Installing this bundle is required because Solr when running within OSGI can not load classes from Jar files located in the '{instanceDir}/lib' Directory.
Added: stanbol/branches/stanbol-solr4/commons/solr/extras/kuromoji/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/extras/kuromoji/pom.xml?rev=1455131&view=auto
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/extras/kuromoji/pom.xml (added)
+++ stanbol/branches/stanbol-solr4/commons/solr/extras/kuromoji/pom.xml Mon Mar 11 13:18:59 2013
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the
+ NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF
+ licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file
+ except in compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing
+ permissions and limitations under the License.
+ -->
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>4-SNAPSHOT</version>
+ <relativePath>../../../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.solr.extras.kuromoji</artifactId>
+ <version>0.12.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Commons Solr Extras: Lucene Kuromoji Bundle</name>
+ <description>
+ This provides an Bundle for processing Japanese Texts with Lucene
+ </description>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/commons/solr/extras/kuromoji
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/commons/solr/extras/kuromoji
+ </developerConnection>
+ <url>http://stanbol.apache.org</url>
+ </scm>
+
+ <build>
+ <!-- make it an OSGi bundle -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>lucene-analyzers-kuromoji</Embed-Dependency>
+ <Import-Package>
+ org.apache.lucene.analysis.ja,
+ org.apache.lucene.analysis.ja.dict,
+ org.apache.lucene.analysis.ja.tokenattributes,
+ org.apache.lucene.analysis.ja.util,
+ *
+ </Import-Package>
+ <!-- used instead of Export-Package to preserve the jars -->
+ <_exportcontents>
+ org.apache.lucene.analysis.ja;version=${solr-version},
+ org.apache.lucene.analysis.ja.dict;version=${solr-version},
+ org.apache.lucene.analysis.ja.tokenattributes;version=${solr-version},
+ org.apache.lucene.analysis.ja.util;version=${solr-version}
+ </_exportcontents>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-kuromoji</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: stanbol/branches/stanbol-solr4/commons/solr/extras/smartcn/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/extras/smartcn/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/extras/smartcn/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/commons/solr/extras/smartcn/pom.xml Mon Mar 11 13:18:59 2013
@@ -50,7 +50,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Embed-Dependency>lucene-smartcn</Embed-Dependency>
+ <Embed-Dependency>lucene-analyzers-smartcn</Embed-Dependency>
<Import-Package>
org.apache.lucene.analysis.cn.smart,
org.apache.lucene.analysis.cn.smart.hhmm,
@@ -58,8 +58,8 @@
</Import-Package>
<!-- used instead of Export-Package to preserve the jars -->
<_exportcontents>
- org.apache.lucene.analysis.cn.smart;version=3.6.1,
- org.apache.lucene.analysis.cn.smart.hhmm;version=3.6.1
+ org.apache.lucene.analysis.cn.smart;version=${solr-version},
+ org.apache.lucene.analysis.cn.smart.hhmm;version=${solr-version}
</_exportcontents>
</instructions>
</configuration>
@@ -78,8 +78,8 @@
<dependencies>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-smartcn</artifactId>
- <version>3.6.1</version>
+ <artifactId>lucene-analyzers-smartcn</artifactId>
+ <!--<version>3.6.1</version>-->
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers</artifactId>
+ <artifactId>lucene-analyzers-common</artifactId>
</dependency>
</dependencies>
Modified: stanbol/branches/stanbol-solr4/commons/solr/extras/stempel/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/extras/stempel/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/extras/stempel/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/commons/solr/extras/stempel/pom.xml Mon Mar 11 13:18:59 2013
@@ -50,7 +50,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Embed-Dependency>lucene-stempel</Embed-Dependency>
+ <Embed-Dependency>lucene-analyzers-stempel</Embed-Dependency>
<Import-Package>
org.apache.lucene.analysis.pl,
org.apache.lucene.analysis.stempel,
@@ -59,9 +59,9 @@
</Import-Package>
<!-- used instead of Export-Package to preserve the jars -->
<_exportcontents>
- org.apache.lucene.analysis.pl;version=3.6.1,
- org.apache.lucene.analysis.stempel;version=3.6.1,
- org.egothor.stemmer;version=3.6.1
+ org.apache.lucene.analysis.pl;version=${solr-version},
+ org.apache.lucene.analysis.stempel;version=${solr-version},
+ org.egothor.stemmer;version=${solr-version}
</_exportcontents>
</instructions>
</configuration>
@@ -80,8 +80,7 @@
<dependencies>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-stempel</artifactId>
- <version>3.6.1</version>
+ <artifactId>lucene-analyzers-stempel</artifactId>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -89,7 +88,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers</artifactId>
+ <artifactId>lucene-analyzers-common</artifactId>
</dependency>
</dependencies>
Modified: stanbol/branches/stanbol-solr4/commons/solr/install/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/install/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/install/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/commons/solr/install/pom.xml Mon Mar 11 13:18:59 2013
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.managed</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- for the Solr Index Installer -->
<dependency>
Modified: stanbol/branches/stanbol-solr4/commons/solr/managed/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/managed/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/managed/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/commons/solr/managed/pom.xml Mon Mar 11 13:18:59 2013
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- dependency>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/branches/stanbol-solr4/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java (original)
+++ stanbol/branches/stanbol-solr4/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java Mon Mar 11 13:18:59 2013
@@ -57,7 +57,6 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.solr.core.SolrCore;
import org.apache.stanbol.commons.solr.IndexReference;
import org.apache.stanbol.commons.solr.SolrConstants;
import org.apache.stanbol.commons.solr.SolrServerAdapter;
Modified: stanbol/branches/stanbol-solr4/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java (original)
+++ stanbol/branches/stanbol-solr4/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java Mon Mar 11 13:18:59 2013
@@ -217,16 +217,7 @@ public class StandaloneManagedSolrServer
}
server = new CoreContainer(managedSolrDir.getAbsolutePath());
File solrXml = new File(managedSolrDir,"solr.xml");
- try {
- server.load(managedSolrDir.getAbsolutePath(), solrXml);
- } catch (ParserConfigurationException e) {
- throw new IllegalStateException("Unable to initialise XML parsers for parsing 'solr.xml'",e);
- } catch (IOException e) {
- throw new IllegalStateException("Unable to access Solr base directory '"+managedSolrDir+"'!",e);
- } catch (SAXException e) {
- throw new IllegalStateException("Error while parsing 'solr.xml' within " +
- "directory '"+managedSolrDir+"'!",e);
- }
+ server.load(managedSolrDir.getAbsolutePath(), solrXml);
server.setPersistent(true);
}
private void shutdown() {
@@ -460,18 +451,7 @@ public class StandaloneManagedSolrServer
SolrCore core;
CoreDescriptor coreDescriptor = new CoreDescriptor(server,
coreName, coreDir.getAbsolutePath());
- try {
- core = server.create(coreDescriptor);
- } catch (ParserConfigurationException e) {
- throw new IllegalStateException("Unable to configure XML parser for parsing" +
- "configurations for SolrCore '"+coreName+"'(dir:+"+coreDir+")!",e);
- } catch (IOException e) {
- throw new IllegalStateException("Unable to initialise SolrCore '"+
- coreName+"'(dir:+"+coreDir+")!",e);
- } catch (SAXException e) {
- throw new IllegalStateException("Unable to parse configuratin for SolrCore '"+
- coreName+"'(dir:+"+coreDir+")!",e);
- }
+ core = server.create(coreDescriptor);
//this will also replace an existing core with the same name
server.register(coreName, core, false);
server.persist(); //store the new/updated SolrCore in the solr.xml
Modified: stanbol/branches/stanbol-solr4/commons/solr/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/web/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/web/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/commons/solr/web/pom.xml Mon Mar 11 13:18:59 2013
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-solr4/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/DelegatingSolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/DelegatingSolrDispatchFilter.java?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/DelegatingSolrDispatchFilter.java (original)
+++ stanbol/branches/stanbol-solr4/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/DelegatingSolrDispatchFilter.java Mon Mar 11 13:18:59 2013
@@ -58,7 +58,7 @@ public abstract class DelegatingSolrDisp
*/
private Initializer initialiser = new Initializer() {
@Override
- public CoreContainer initialize() throws IOException, ParserConfigurationException, SAXException {
+ public CoreContainer initialize() {
//support multiple calls
if(delegate != null){
ungetCoreContainer(); //cleanup current
Modified: stanbol/branches/stanbol-solr4/contenthub/ldpath/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/contenthub/ldpath/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/contenthub/ldpath/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/contenthub/ldpath/pom.xml Mon Mar 11 13:18:59 2013
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.contenthub.store.solr</artifactId>
- <version>0.10.0</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -80,12 +80,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.managed</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- Not relased yet. No other option -->
<dependency>
Modified: stanbol/branches/stanbol-solr4/contenthub/search/featured/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/contenthub/search/featured/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/contenthub/search/featured/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/contenthub/search/featured/pom.xml Mon Mar 11 13:18:59 2013
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.contenthub.store.solr</artifactId>
- <version>0.10.0</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: stanbol/branches/stanbol-solr4/contenthub/search/solr/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/contenthub/search/solr/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/contenthub/search/solr/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/contenthub/search/solr/pom.xml Mon Mar 11 13:18:59 2013
@@ -62,12 +62,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.contenthub.store.solr</artifactId>
- <version>0.10.0</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.managed</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-solr4/contenthub/store/solr/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/contenthub/store/solr/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/contenthub/store/solr/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/contenthub/store/solr/pom.xml Mon Mar 11 13:18:59 2013
@@ -72,12 +72,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.managed</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- Solr/Lucene dependencies (needed for using embedded Solr servers) -->
Modified: stanbol/branches/stanbol-solr4/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrStoreImpl.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrStoreImpl.java?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrStoreImpl.java (original)
+++ stanbol/branches/stanbol-solr4/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrStoreImpl.java Mon Mar 11 13:18:59 2013
@@ -34,8 +34,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import javax.ws.rs.core.MediaType;
-
import org.apache.clerezza.rdf.core.Literal;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.Resource;
@@ -104,7 +102,7 @@ public class SolrStoreImpl implements So
private static final Logger log = LoggerFactory.getLogger(SolrStoreImpl.class);
private static final Set<String> SUPPORTED_MIMETYPES = Collections.unmodifiableSet(new HashSet<String>(
- Arrays.asList(MediaType.TEXT_HTML, MediaType.TEXT_PLAIN, MediaType.TEXT_XML)));
+ Arrays.asList("text/html", "text/plain", "text/xml")));
@Reference
private ManagedSolrServer managedSolrServer;
Modified: stanbol/branches/stanbol-solr4/contenthub/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/contenthub/web/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/contenthub/web/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/contenthub/web/pom.xml Mon Mar 11 13:18:59 2013
@@ -108,15 +108,10 @@
<artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
<version>0.11.0</version>
</dependency>
- <!-- dependency> - anyway provided by commons.solr.managed
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.11.0</version>
- </dependency -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.managed</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Propchange: stanbol/branches/stanbol-solr4/development/archetypes/enhancement-engine/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 11 13:18:59 2013
@@ -1 +1,3 @@
target
+
+.project
Propchange: stanbol/branches/stanbol-solr4/development/archetypes/statefull-webmodule/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 11 13:18:59 2013
@@ -1 +1,5 @@
target
+
+.settings
+
+.project
Propchange: stanbol/branches/stanbol-solr4/development/archetypes/stateless-webmodule/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 11 13:18:59 2013
@@ -1 +1,5 @@
target
+
+.settings
+
+.project
Propchange: stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 11 13:18:59 2013
@@ -0,0 +1,7 @@
+.project
+
+.classpath
+
+.settings
+
+target
Added: stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/pom.xml?rev=1455131&view=auto
==============================================================================
--- stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/pom.xml (added)
+++ stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/pom.xml Mon Mar 11 13:18:59 2013
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<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/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>apache-stanbol-enhancement-engines-entitylinking</artifactId>
+ <version>0.10.1-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.kuromoji</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Enhancement Engine : Entity Linking LabelTokenizer : Kuromoji Japanese</name>
+ <description>
+ Configuration for the Lucene LabelTokenizer based on the Kuromoji Analyzer
+ for Japanese
+ </description>
+
+ <inceptionYear>2013</inceptionYear>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/branches/STANBOL-913/entityhublinking/labeltokenizer-kuromoji
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/branches/STANBOL-913/entityhublinking/labeltokenizer-kuromoji
+ </developerConnection>
+ <url>http://stanbol.apache.org/</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Install-Path>config</Install-Path>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- AL20 License -->
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
+ <exclude>src/main/resources/config/org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.lucene.LuceneLabelTokenizer-kuromoji.config</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency> <!-- depend on the module the config is for -->
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.lucene</artifactId>
+ <version>0.10.1-SNAPSHOT</version>
+ </dependency>
+ <dependency> <!-- depend on the kuromoji analyzer module -->
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.solr.extras.kuromoji</artifactId>
+ <version>0.12.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
Added: stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/src/main/resources/config/org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.lucene.LuceneLabelTokenizer-kuromoji.config
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/src/main/resources/config/org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.lucene.LuceneLabelTokenizer-kuromoji.config?rev=1455131&view=auto
==============================================================================
--- stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/src/main/resources/config/org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.lucene.LuceneLabelTokenizer-kuromoji.config (added)
+++ stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-kuromoji/src/main/resources/config/org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.lucene.LuceneLabelTokenizer-kuromoji.config Mon Mar 11 13:18:59 2013
@@ -0,0 +1,4 @@
+enhancer.engines.entitylinking.labeltokenizer.languages=["ja"]
+enhancer.engine.linking.labeltokenizer.lucene.charFilterFactory=""
+enhancer.engine.linking.labeltokenizer.lucene.tokenizerFactory="org.apache.lucene.analysis.ja.JapaneseTokenizerFactory"
+service.ranking=I"100"
Modified: stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/pom.xml Mon Mar 11 13:18:59 2013
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/LuceneLabelTokenizer.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/LuceneLabelTokenizer.java?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/LuceneLabelTokenizer.java (original)
+++ stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/LuceneLabelTokenizer.java Mon Mar 11 13:18:59 2013
@@ -16,6 +16,7 @@
*/
package org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.lucene;
+import java.io.CharArrayReader;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
@@ -37,16 +38,17 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.apache.lucene.analysis.CharReader;
+import org.apache.lucene.analysis.CharFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
+import org.apache.lucene.analysis.util.AbstractAnalysisFactory;
+import org.apache.lucene.analysis.util.CharFilterFactory;
+import org.apache.lucene.analysis.util.ResourceLoader;
+import org.apache.lucene.analysis.util.ResourceLoaderAware;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
+import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.util.Version;
-import org.apache.solr.analysis.CharFilterFactory;
-import org.apache.solr.analysis.TokenFilterFactory;
-import org.apache.solr.analysis.TokenizerFactory;
-import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.SolrException;
-import org.apache.solr.util.plugin.ResourceLoaderAware;
import org.apache.stanbol.commons.solr.utils.StanbolResourceLoader;
import org.apache.stanbol.enhancer.engines.entitylinking.LabelTokenizer;
import org.apache.stanbol.enhancer.nlp.utils.LanguageConfiguration;
@@ -69,28 +71,28 @@ import org.slf4j.LoggerFactory;
@Property(name=Constants.SERVICE_RANKING,intValue=0)
})
public class LuceneLabelTokenizer implements LabelTokenizer {
-
+
private Logger log = LoggerFactory.getLogger(LuceneLabelTokenizer.class);
private static final String[] EMPTY = new String[]{};
@Reference(cardinality=ReferenceCardinality.OPTIONAL_UNARY)
private ResourceLoader parentResourceLoader;
-
+
protected ResourceLoader resourceLoader;
-
-
+
+
public static final String PROPERTY_CHAR_FILTER_FACTORY = "enhancer.engine.linking.labeltokenizer.lucene.charFilterFactory";
public static final String PROPERTY_TOKENIZER_FACTORY = "enhancer.engine.linking.labeltokenizer.lucene.tokenizerFactory";
public static final String PROPERTY_TOKEN_FILTER_FACTORY = "enhancer.engine.linking.labeltokenizer.lucene.tokenFilterFactory";
-
+
static final String DEFAULT_CLASS_NAME_CONFIG = "{full-qualified-class-name}";
-
+
private CharFilterFactory charFilterFactory;
private TokenizerFactory tokenizerFactory;
private List<TokenFilterFactory> filterFactories = new ArrayList<TokenFilterFactory>();
private LanguageConfiguration langConf = new LanguageConfiguration(SUPPORTED_LANUAGES, new String[]{});
-
+
@Activate
protected void activate(ComponentContext ctx) throws ConfigurationException {
//init the Solr ResourceLoader used for initialising the components
@@ -102,30 +104,32 @@ public class LuceneLabelTokenizer implem
PROPERTY_CHAR_FILTER_FACTORY, value.toString());
Object factoryObject;
try {
- factoryObject = resourceLoader.newInstance(charFilterConfig.getKey(), (String[])null);
+ factoryObject = resourceLoader.newInstance(charFilterConfig.getKey(), Object.class);
} catch (SolrException e) {
throw new ConfigurationException(PROPERTY_CHAR_FILTER_FACTORY, "Unable to instantiate the "
+ "class '"+charFilterConfig.getKey()+"'!", e);
}
-
+
if(factoryObject instanceof CharFilterFactory){
charFilterFactory = (CharFilterFactory)factoryObject;
Map<String,String> config = charFilterConfig.getValue();
- if(!config.containsKey("luceneMatchVersion")){
- config.put("luceneMatchVersion", Version.LUCENE_36.toString());
- }
+ addLuceneMatchVersionIfNotPresent(config, charFilterFactory);
charFilterFactory.init(config);
if(factoryObject instanceof ResourceLoaderAware){
- ((ResourceLoaderAware)factoryObject).inform(resourceLoader);
+ try {
+ ((ResourceLoaderAware)factoryObject).inform(resourceLoader);
+ } catch (IOException e) {
+ throw new ConfigurationException(PROPERTY_CHAR_FILTER_FACTORY, "Could not load configuration");
+ }
}
} else {
throw new ConfigurationException(PROPERTY_CHAR_FILTER_FACTORY, "The parsed class '"
+ charFilterConfig.getKey() +"' is not assignable to "+CharFilterFactory.class);
- }
+ }
} else {
charFilterFactory = null;
}
-
+
//now initialise the TokenizerFactory (required)
value = ctx.getProperties().get(PROPERTY_TOKENIZER_FACTORY);
if(value == null || value.toString().isEmpty() || DEFAULT_CLASS_NAME_CONFIG.equals(value)){
@@ -136,26 +140,28 @@ public class LuceneLabelTokenizer implem
Object factoryObject;
try {
- factoryObject = resourceLoader.newInstance(tokenizerConfig.getKey(), (String[])null);
+ factoryObject = resourceLoader.newInstance(tokenizerConfig.getKey(), Object.class);
} catch (SolrException e) {
throw new ConfigurationException(PROPERTY_TOKENIZER_FACTORY, "Unable to instantiate the "
+ "class '"+tokenizerConfig.getKey()+"'!", e);
}
-
+
if(factoryObject instanceof TokenizerFactory){
tokenizerFactory = (TokenizerFactory)factoryObject;
Map<String,String> config = tokenizerConfig.getValue();
- if(!config.containsKey("luceneMatchVersion")){
- config.put("luceneMatchVersion", Version.LUCENE_36.toString());
- }
+ addLuceneMatchVersionIfNotPresent(config, tokenizerFactory);
tokenizerFactory.init(config);
} else {
throw new ConfigurationException(PROPERTY_TOKENIZER_FACTORY, "The instance "
- + factoryObject + "of the parsed parsed class '" + tokenizerConfig.getKey()
+ + factoryObject + "of the parsed parsed class '" + tokenizerConfig.getKey()
+ "' is not assignable to "+TokenizerFactory.class);
}
if(factoryObject instanceof ResourceLoaderAware){
- ((ResourceLoaderAware)factoryObject).inform(resourceLoader);
+ try {
+ ((ResourceLoaderAware)factoryObject).inform(resourceLoader);
+ } catch (IOException e) {
+ throw new ConfigurationException(PROPERTY_TOKENIZER_FACTORY, "Could not load configuration");
+ }
}
//initialise the list of Token Filters
@@ -185,18 +191,16 @@ public class LuceneLabelTokenizer implem
PROPERTY_CHAR_FILTER_FACTORY, filterConfigLine);
Object filterFactoryObject;
try {
- filterFactoryObject = resourceLoader.newInstance(filterConfig.getKey(), (String[])null);
+ filterFactoryObject = resourceLoader.newInstance(filterConfig.getKey(), Object.class);
} catch (SolrException e) {
throw new ConfigurationException(PROPERTY_TOKEN_FILTER_FACTORY, "Unable to instantiate the "
+ "class '"+filterConfig.getKey()+"'!", e);
}
-
+
if(filterFactoryObject instanceof TokenFilterFactory){
TokenFilterFactory tff = (TokenFilterFactory)filterFactoryObject;
Map<String,String> config = filterConfig.getValue();
- if(!config.containsKey("luceneMatchVersion")){
- config.put("luceneMatchVersion", Version.LUCENE_36.toString());
- }
+ addLuceneMatchVersionIfNotPresent(config,tff);
tff.init(config);
filterFactories.add(tff);
} else {
@@ -204,7 +208,11 @@ public class LuceneLabelTokenizer implem
+ filterConfig.getKey() +"' is not assignable to "+TokenFilterFactory.class);
}
if(filterFactoryObject instanceof ResourceLoaderAware){
- ((ResourceLoaderAware)filterFactoryObject).inform(resourceLoader);
+ try {
+ ((ResourceLoaderAware)filterFactoryObject).inform(resourceLoader);
+ } catch (IOException e) {
+ throw new ConfigurationException(PROPERTY_TOKEN_FILTER_FACTORY, "Could not load configuration");
+ }
}
}
//init the language configuration
@@ -215,7 +223,16 @@ public class LuceneLabelTokenizer implem
}
langConf.setConfiguration(ctx.getProperties());
}
-
+
+ private void addLuceneMatchVersionIfNotPresent(Map<String, String> config, AbstractAnalysisFactory factory) {
+ if(!config.containsKey("luceneMatchVersion")){
+ config.put("luceneMatchVersion", Version.LUCENE_41.toString());
+ }
+ if(factory.getLuceneMatchVersion() == null){
+ factory.setLuceneMatchVersion(Version.LUCENE_41);
+ }
+ }
+
@Deactivate
protected void deactivate(ComponentContext ctx){
resourceLoader = null;
@@ -224,7 +241,7 @@ public class LuceneLabelTokenizer implem
filterFactories.clear();
langConf.setDefault();
}
-
+
@Override
public String[] tokenize(String label, String language) {
if(label == null){
@@ -239,16 +256,17 @@ public class LuceneLabelTokenizer implem
TokenStream tokenizer;
if(charFilterFactory != null){
tokenizer = tokenizerFactory.create(charFilterFactory.create(
- CharReader.get(reader)));
+ reader));
} else {
tokenizer = tokenizerFactory.create(reader);
}
//build the analysing chain
for(TokenFilterFactory filterFactory : filterFactories){
- tokenizer = filterFactory.create(tokenizer);
+ tokenizer = filterFactory.create(tokenizer);
}
List<String> tokens = new ArrayList<String>(8);
try {
+ tokenizer.reset();
while(tokenizer.incrementToken()){
OffsetAttribute offset = tokenizer.addAttribute(OffsetAttribute.class);
tokens.add(label.substring(offset.startOffset(), offset.endOffset()));
@@ -259,12 +277,12 @@ public class LuceneLabelTokenizer implem
log.error("IOException while reading from a StringReader :(",e);
return null;
}
- return tokens.toArray(new String[tokens.size()]);
+ return tokens.toArray(new String[tokens.size()]);
} else {
log.trace("Language {} not configured to be supported",language);
return null;
}
-
+
}
/**
* Parses the configured component including parameters formatted like
@@ -272,7 +290,7 @@ public class LuceneLabelTokenizer implem
* {component};{param}={value};{param1}={value1};
* </pre></code>
* This can be used to parse the same configuration as within the XML schema
- *
+ *
* @param property
* @param line
* @return
@@ -286,11 +304,11 @@ public class LuceneLabelTokenizer implem
throw new ConfigurationException(property, "The component name MUST NOT be NULL "
+ "(illegal formatted line: '"+line+"')!");
}
- return Collections.singletonMap(component,sepIndex >= 0 && sepIndex < line.length()-2 ?
+ return Collections.singletonMap(component,sepIndex >= 0 && sepIndex < line.length()-2 ?
parseParameters(property,line.substring(sepIndex+1, line.length()).trim()) :
new HashMap<String,String>()).entrySet().iterator().next();
}
-
+
/**
* Parses optional parameters <code>{key}[={value}];{key2}[={value2}]</code>. Using
* the same key multiple times will override the previouse value
@@ -305,14 +323,14 @@ public class LuceneLabelTokenizer implem
param = param.trim();
int equalsPos = param.indexOf('=');
if(equalsPos == 0){
- throw new ConfigurationException(property,
+ throw new ConfigurationException(property,
"Parameter '"+param+"' has empty key!");
}
String key = equalsPos > 0 ? param.substring(0, equalsPos).trim() : param;
String value;
if(equalsPos > 0){
if(equalsPos < param.length()-2) {
- value = param.substring(equalsPos+1).trim();
+ value = param.substring(equalsPos+1).trim();
} else {
value = "";
}
Modified: stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/LuceneLabelTokenizerTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/LuceneLabelTokenizerTest.java?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/LuceneLabelTokenizerTest.java (original)
+++ stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/LuceneLabelTokenizerTest.java Mon Mar 11 13:18:59 2013
@@ -31,7 +31,7 @@ import org.osgi.service.component.Compon
public class LuceneLabelTokenizerTest {
- private static final Object TOKENIZER_FACTORY_CLASS = "org.apache.solr.analysis.WhitespaceTokenizerFactory";
+ private static final Object TOKENIZER_FACTORY_CLASS = "org.apache.lucene.analysis.core.WhitespaceTokenizerFactory";
private static LuceneLabelTokenizer luceneLabelTokenizer;
@BeforeClass
Modified: stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/TokenizerAndTokenFIlterTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/TokenizerAndTokenFIlterTest.java?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/TokenizerAndTokenFIlterTest.java (original)
+++ stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/TokenizerAndTokenFIlterTest.java Mon Mar 11 13:18:59 2013
@@ -32,9 +32,9 @@ import org.osgi.service.component.Compon
public class TokenizerAndTokenFIlterTest {
- private static final Object TOKENIZER_FACTORY_CLASS = "org.apache.solr.analysis.SmartChineseSentenceTokenizerFactory";
+ private static final Object TOKENIZER_FACTORY_CLASS = "org.apache.lucene.analysis.cn.smart.SmartChineseSentenceTokenizerFactory";
private static final String[] TOKEN_FILTER_FACTORY_CLASSES = new String[]{
- "org.apache.solr.analysis.SmartChineseWordTokenFilterFactory"
+ "org.apache.lucene.analysis.cn.smart.SmartChineseWordTokenFilterFactory"
};
private static LuceneLabelTokenizer luceneLabelTokenizer;
Modified: stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-paoding/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-paoding/pom.xml?rev=1455131&r1=1455130&r2=1455131&view=diff
==============================================================================
--- stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-paoding/pom.xml (original)
+++ stanbol/branches/stanbol-solr4/enhancement-engines/entitylinking/labeltokenizer-paoding/pom.xml Mon Mar 11 13:18:59 2013
@@ -78,7 +78,18 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.extras.paoding</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
+ </dependency>
+ <!-- Paoding does not yet support Solr4 -->
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>3.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
+ <version>3.6.1</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>