You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/01/03 06:01:48 UTC
svn commit: r1226649 - in /lucene/dev/branches/lucene3305: lucene/contrib/
modules/analysis/ modules/analysis/kuromoji/ solr/contrib/analysis-extras/
Author: rmuir
Date: Tue Jan 3 05:01:47 2012
New Revision: 1226649
URL: http://svn.apache.org/viewvc?rev=1226649&view=rev
Log:
LUCENE-3305: fix compile/build deps
Removed:
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/CHANGES.txt
Modified:
lucene/dev/branches/lucene3305/lucene/contrib/contrib-build.xml
lucene/dev/branches/lucene3305/modules/analysis/CHANGES.txt
lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/CHANGES.txt
lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/README.txt
lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/build.xml
Modified: lucene/dev/branches/lucene3305/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/lucene/contrib/contrib-build.xml?rev=1226649&r1=1226648&r2=1226649&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/branches/lucene3305/lucene/contrib/contrib-build.xml Tue Jan 3 05:01:47 2012
@@ -196,6 +196,17 @@
<property name="analyzers-stempel.uptodate" value="true"/>
</target>
+ <property name="analyzers-kuromoji.jar" value="${common.dir}/../modules/analysis/build/kuromoji/lucene-analyzers-kuromoji-${version}.jar"/>
+ <target name="check-analyzers-kuromoji-uptodate" unless="analyzers-kuromoji.uptodate">
+ <module-uptodate name="analysis/kuromoji" jarfile="${analyzers-kuromoji.jar}" property="analyzers-kuromoji.uptodate"/>
+ </target>
+ <target name="jar-analyzers-kuromoji" unless="analyzers-kuromoji.uptodate" depends="check-analyzers-kuromoji-uptodate">
+ <ant dir="${common.dir}/../modules/analysis/kuromoji" target="jar-core" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="analyzers-kuromoji.uptodate" value="true"/>
+ </target>
+
<property name="grouping.jar" value="${common.dir}/../modules/grouping/build/lucene-grouping-${version}.jar"/>
<target name="check-grouping-uptodate" unless="grouping.uptodate">
<module-uptodate name="grouping" jarfile="${grouping.jar}" property="grouping.uptodate"/>
Modified: lucene/dev/branches/lucene3305/modules/analysis/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/CHANGES.txt?rev=1226649&r1=1226648&r2=1226649&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/modules/analysis/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3305/modules/analysis/CHANGES.txt Tue Jan 3 05:01:47 2012
@@ -109,6 +109,9 @@ New Features
* LUCENE-3414: Added HunspellStemFilter which uses a provided pure Java implementation of the
Hunspell algorithm. (Chris Male)
+* LUCENE-3305: Added Kuromoji morphological analyzer for Japanese.
+ (Christian Moen, Masaru Hasegawa via Robert Muir)
+
Build
* LUCENE-2413: All analyzers in contrib/analyzers and contrib/icu were moved to the
Modified: lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/CHANGES.txt?rev=1226649&r1=1226648&r2=1226649&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/CHANGES.txt Tue Jan 3 05:01:47 2012
@@ -17,6 +17,9 @@ $Id$
the Solr 3.x ICUCollationKeyFilterFactory, and also supports
Locale-sensitive range queries. (rmuir)
+* LUCENE-3305: Added Kuromoji morphological analyzer for Japanese.
+ (Christian Moen, Masaru Hasegawa via Robert Muir)
+
================== 3.6.0 ==================
* SOLR-2919: Added parametric tailoring options to ICUCollationKeyFilterFactory.
Modified: lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/README.txt?rev=1226649&r1=1226648&r2=1226649&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/README.txt (original)
+++ lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/README.txt Tue Jan 3 05:01:47 2012
@@ -2,15 +2,16 @@ The analysis-extras plugin provides addi
upon large dependencies/dictionaries.
It includes integration with ICU for multilingual support, and
-analyzers for Chinese and Polish.
+analyzers for Chinese, Japanese, and Polish.
Relies upon the following lucene components (in lucene-libs/):
* lucene-analyzers-icu-X.Y.jar
+ * lucene-analyzers-kuromoji-X.Y.jar
* lucene-analyzers-smartcn-X.Y.jar
* lucene-analyzers-stempel-X.Y.jar
And the ICU library (in lib/):
* icu4j-X.Y.jar
-
\ No newline at end of file
+
Modified: lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/build.xml?rev=1226649&r1=1226648&r2=1226649&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/build.xml (original)
+++ lucene/dev/branches/lucene3305/solr/contrib/analysis-extras/build.xml Tue Jan 3 05:01:47 2012
@@ -27,21 +27,23 @@
<path id="classpath">
<pathelement path="${analyzers-icu.jar}"/>
+ <pathelement path="${analyzers-kuromoji.jar}"/>
<pathelement path="${analyzers-smartcn.jar}"/>
<pathelement path="${analyzers-stempel.jar}"/>
<path refid="solr.base.classpath"/>
</path>
<target name="module-jars-to-solr"
- depends="jar-analyzers-icu, jar-analyzers-smartcn, jar-analyzers-stempel">
+ depends="jar-analyzers-icu, jar-analyzers-kuromoji, jar-analyzers-smartcn, jar-analyzers-stempel">
<mkdir dir="${build.dir}/lucene-libs"/>
<copy todir="${build.dir}/lucene-libs" preservelastmodified="true" flatten="true" failonerror="true" overwrite="true">
<fileset file="${analyzers-icu.jar}"/>
+ <fileset file="${analyzers-kuromoji.jar}"/>
<fileset file="${analyzers-smartcn.jar}"/>
<fileset file="${analyzers-stempel.jar}"/>
</copy>
</target>
- <target name="compile-core" depends="jar-analyzers-icu, jar-analyzers-smartcn, jar-analyzers-stempel, solr-contrib-build.compile-core"/>
+ <target name="compile-core" depends="jar-analyzers-icu, jar-analyzers-kuromoji, jar-analyzers-smartcn, jar-analyzers-stempel, solr-contrib-build.compile-core"/>
<target name="dist" depends="module-jars-to-solr, common-solr.dist"/>
</project>