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 2013/01/08 04:40:37 UTC
svn commit: r1430130 [2/27] - in /lucene/dev/branches/lucene4547: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/libraries/
dev-tools/maven/ dev-tools/maven/solr/
dev-tools/maven/solr/contrib/analysis-extras/
dev-tools/maven/solr/contrib/cluster...
Modified: lucene/dev/branches/lucene4547/.gitignore
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/.gitignore?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/.gitignore (original)
+++ lucene/dev/branches/lucene4547/.gitignore Tue Jan 8 03:40:16 2013
@@ -5,6 +5,7 @@
/eclipse-build
/classes
/build
+/idea-build
/dist
/*~
/velocity.log
Modified: lucene/dev/branches/lucene4547/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/build.xml?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/build.xml (original)
+++ lucene/dev/branches/lucene4547/build.xml Tue Jan 8 03:40:16 2013
@@ -114,7 +114,7 @@
<property name="maven-version" value="2.2.1"/>
<target name="get-maven-poms"
- description="Copy Maven POMs from dev-tools/maven/ to the working copy root">
+ description="Copy Maven POMs from dev-tools/maven/ to maven-build/">
<copy todir="${maven-build-dir}" overwrite="true">
<fileset dir="${basedir}/dev-tools/maven"/>
<filterset begintoken="@" endtoken="@">
@@ -154,6 +154,7 @@
<subant buildpath="." antfile="extra-targets.xml" target="-run-maven-build" inheritall="false" failonerror="true">
<propertyset>
<propertyref prefix="maven-"/>
+ <propertyref builtin="commandline"/>
</propertyset>
</subant>
</target>
@@ -170,11 +171,28 @@
<target name="eclipse" depends="resolve" description="Setup Eclipse configuration">
<copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false"/>
- <copy file="dev-tools/eclipse/dot.classpath" tofile=".classpath" overwrite="true"/>
<mkdir dir=".settings"/>
<copy todir=".settings/" overwrite="true">
<fileset dir="dev-tools/eclipse/dot.settings" includes="*.prefs" />
</copy>
+
+ <pathconvert property="eclipse.fileset.sourcefolders" pathsep="|" dirsep="/">
+ <dirset dir="${basedir}/lucene" includes="**/src/java, **/src/resources, **/src/test, **/src/test-files, **/src/examples" excludes="tools/**, build/**, backwards/**" />
+ <dirset dir="${basedir}/solr" includes="**/src/java, **/src/resources, **/src/test, **/src/test-files, **/src/examples" excludes="build/**" />
+ <map from="${basedir}/" to=""/>
+ </pathconvert>
+ <!-- TODO: find a better way to exclude duplicate JAR files & fix the servlet-api mess! -->
+ <pathconvert property="eclipse.fileset.libs" pathsep="|" dirsep="/">
+ <fileset dir="${basedir}/lucene" includes="**/lib/*.jar" excludes="**/*servlet-api*.jar, analysis/uima/**, tools/**, build/**"/>
+ <fileset dir="${basedir}/solr" includes="**/lib/*.jar" excludes="core/lib/*servlet-api*.jar, contrib/analysis-extras/**, test-framework/**, build/**, dist/**, package/**" />
+ <map from="${basedir}/" to=""/>
+ </pathconvert>
+ <xslt in="${ant.file}" out=".classpath" style="dev-tools/eclipse/dot.classpath.xsl" force="true">
+ <outputproperty name="indent" value="yes"/>
+ <param name="eclipse.fileset.libs" expression="${eclipse.fileset.libs}"/>
+ <param name="eclipse.fileset.sourcefolders" expression="${eclipse.fileset.sourcefolders}"/>
+ </xslt>
+
<echo>
SUCCESS: You must right-click your project and choose Refresh.
Your project must use a Java 6 JRE.
@@ -294,7 +312,7 @@
<subant buildpath="." antfile="extra-targets.xml" target="-check-svn-working-copy" inheritall="false" failonerror="true"/>
</target>
- <target name="run-clover" description="Runs all tests to measure coverage and generates report (pass "ANT_ARGS=-Xmx1536M" as environment)" depends="clean">
+ <target name="run-clover" description="Runs all tests to measure coverage and generates report (pass "ANT_OPTS=-Xmx1536M" as environment)" depends="clean">
<antcall>
<param name="run.clover" value="true"/>
<!-- must be 1, as clover does not like parallel test runs: -->
@@ -351,7 +369,26 @@
<!-- Jenkins tasks -->
<target name="jenkins-hourly" depends="clean,test-with-heapdumps,validate,documentation-lint,jar-checksums,check-svn-working-copy"/>
- <target name="jenkins-maven-nightly" depends="clean,remove-maven-artifacts,run-maven-build,generate-maven-artifacts,validate-maven-dependencies"/>
+ <target name="jenkins-nightly">
+ <antcall>
+ <param name="tests.nightly" value="true"/>
+ <target name="jenkins-hourly"/>
+ </antcall>
+ </target>
+
+ <target name="jenkins-maven-nightly" depends="clean,clean-maven-build">
+ <!-- step 1: build, install, deploy, and validate ANT-generated maven artifacts: -->
+ <antcall>
+ <target name="remove-maven-artifacts"/>
+ <!-- this implicitely publishes the maven artifacts: -->
+ <target name="validate-maven-dependencies"/>
+ </antcall>
+ <!-- step 2: run the maven build to check that the pom templates also work to drive "mvn": -->
+ <antcall>
+ <target name="remove-maven-artifacts"/>
+ <target name="run-maven-build"/>
+ </antcall>
+ </target>
<target name="jenkins-clover" depends="run-clover"/>
</project>
Modified: lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.project
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.project?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.project (original)
+++ lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.project Tue Jan 8 03:40:16 2013
@@ -60,5 +60,14 @@
<arguments>1.0-projectRelativePath-matches-false-false-solr/dist</arguments>
</matcher>
</filter>
+ <filter>
+ <id>1353353379246</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-.svn</arguments>
+ </matcher>
+ </filter>
</filteredResources>
</projectDescription>
Modified: lucene/dev/branches/lucene4547/dev-tools/idea/.idea/libraries/JUnit.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/idea/.idea/libraries/JUnit.xml?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/idea/.idea/libraries/JUnit.xml (original)
+++ lucene/dev/branches/lucene4547/dev-tools/idea/.idea/libraries/JUnit.xml Tue Jan 8 03:40:16 2013
@@ -2,7 +2,7 @@
<library name="JUnit">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
- <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.5.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -150,11 +150,6 @@
<version>13.0.1</version>
</dependency>
<dependency>
- <groupId>com.yammer.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>2.1.2</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.7</version>
@@ -338,7 +333,7 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.4</version>
+ <version>1.7</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -353,12 +348,12 @@
<dependency>
<groupId>org.carrot2</groupId>
<artifactId>carrot2-core</artifactId>
- <version>3.5.0</version>
+ <version>3.6.2</version>
</dependency>
<dependency>
<groupId>org.carrot2</groupId>
<artifactId>morfologik-polish</artifactId>
- <version>1.5.3</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -368,7 +363,8 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.2</version>
+ <version>3.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -444,7 +440,7 @@
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
- <version>2.0.5</version>
+ <version>2.0.8</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -550,7 +546,8 @@
<runOrder>random</runOrder>
<reportFormat>plain</reportFormat>
<workingDirectory>${project.build.directory}/test</workingDirectory>
- <argLine>-Xmx512M</argLine>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <argLine>-Xmx512M -XX:MaxPermSize=256M</argLine>
<systemPropertyVariables>
<tempDir>.</tempDir>
<java.awt.headless>true</java.awt.headless>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -35,6 +35,7 @@
<module-directory>solr/contrib/analysis-extras</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -98,5 +99,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/clustering/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -35,6 +35,7 @@
<module-directory>solr/contrib/clustering</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -106,6 +107,22 @@
<groupId>org.carrot2</groupId>
<artifactId>morfologik-stemming</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jfree</groupId>
+ <artifactId>jcommon</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.uncommons.maths</groupId>
+ <artifactId>uncommons-maths</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
@@ -123,5 +140,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -35,6 +35,7 @@
<module-directory>solr/contrib/dataimporthandler-extras</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -101,5 +102,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -35,6 +35,7 @@
<module-directory>solr/contrib/dataimporthandler</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -104,6 +105,15 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/extraction/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -38,6 +38,7 @@
<module-directory>solr/contrib/extraction</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -98,5 +99,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/langid/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/langid/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/langid/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/langid/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -39,6 +39,7 @@
<module-directory>solr/contrib/langid</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -104,5 +105,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/uima/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -35,6 +35,7 @@
<module-directory>solr/contrib/uima</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -123,5 +124,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/velocity/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/velocity/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/velocity/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/velocity/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -35,6 +35,7 @@
<module-directory>solr/contrib/velocity</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -139,5 +140,16 @@
</includes>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/core/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/core/src/java/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/core/src/java/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/core/src/java/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -196,10 +196,6 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</dependency>
- <dependency>
- <groupId>com.yammer.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </dependency>
</dependencies>
<build>
<sourceDirectory>${module-path}</sourceDirectory>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/core/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/core/src/test/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/core/src/test/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/core/src/test/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@
<module-directory>solr/core</module-directory>
<top-level>../../../../..</top-level>
<module-path>${top-level}/${module-directory}/src/test</module-path>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<dependencies>
<dependency>
@@ -118,6 +119,15 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -104,7 +104,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <java.util.logging.config.file>../test-classes/maven.testlogging.properties</java.util.logging.config.file>
+ <tests.jettyConnector>${tests.jettyConnector}</tests.jettyConnector>
</systemPropertyVariables>
</configuration>
</plugin>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/solrj/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/solrj/src/java/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/solrj/src/java/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/solrj/src/java/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -63,6 +63,10 @@
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/solrj/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/solrj/src/test/pom.xml.template?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/solrj/src/test/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/solrj/src/test/pom.xml.template Tue Jan 8 03:40:16 2013
@@ -34,7 +34,7 @@
<module-directory>solr/solrj</module-directory>
<top-level>../../../../..</top-level>
<module-path>${top-level}/${module-directory}/src/test</module-path>
- <maven.install.skip>true</maven.install.skip>
+ <surefire-solr-directory>${top-level}/../../solr</surefire-solr-directory>
</properties>
<dependencies>
<dependency>
@@ -108,6 +108,15 @@
<skip>true</skip>
</configuration>
</plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>${surefire-solr-directory}/testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene4547/extra-targets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/extra-targets.xml?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/extra-targets.xml (original)
+++ lucene/dev/branches/lucene4547/extra-targets.xml Tue Jan 8 03:40:16 2013
@@ -56,6 +56,9 @@
mavenVersion="${maven-version}" failonerror="true" fork="true">
<arg value="-fae"/>
<arg value="install"/>
+ <syspropertyset>
+ <propertyref builtin="commandline"/>
+ </syspropertyset>
</mvn>
</target>
Modified: lucene/dev/branches/lucene4547/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/CHANGES.txt?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene4547/lucene/CHANGES.txt Tue Jan 8 03:40:16 2013
@@ -80,7 +80,33 @@ Changes in backwards compatibility polic
can use OrdinalPolicy.NO_PARENTS to never write any parent category ordinal
to the fulltree posting payload (but note that you need a special
FacetsAccumulator - see javadocs). (Shai Erera)
-
+
+* LUCENE-4594: Spatial PrefixTreeStrategy no longer indexes center points of
+ non-point shapes. If you want to call makeDistanceValueSource() based on
+ shape centers, you need to do this yourself in another spatial field.
+ (David Smiley)
+
+* LUCENE-4615: Replace IntArrayAllocator and FloatArrayAllocator by ArraysPool.
+ FacetArrays no longer takes those allocators; if you need to reuse the arrays,
+ you should use ReusingFacetArrays. (Shai Erera, Gilad Barkai)
+
+* LUCENE-4621: FacetIndexingParams is now a concrete class (instead of DefaultFIP).
+ Also, the entire IndexingParams chain is now immutable. If you need to override
+ a setting, you should extend the relevant class.
+ Additionally, FacetSearchParams is now immutable, and requires all FacetRequests
+ to speified at initialization time. (Shai Erera)
+
+* LUCENE-4647: CategoryDocumentBuilder and EnhancementsDocumentBuilder are replaced
+ by FacetFields and AssociationsFacetFields respectively. CategoryEnhancement and
+ AssociationEnhancement were removed in favor of a simplified CategoryAssociation
+ interface, with CategoryIntAssociation and CategoryFloatAssociation
+ implementations.
+ NOTE: indexes that contain category enhancements/associations are not supported
+ by the new code and should be recreated. (Shai Erera)
+
+* LUCENE-4659: Massive cleanup to CategoryPath API. Additionally, CategoryPath is
+ now immutable, so you don't need to clone() it. (Shai Erera)
+
New Features
* LUCENE-4226: New experimental StoredFieldsFormat that compresses chunks of
@@ -138,7 +164,14 @@ New Features
Wikipedia category pages and non-category pages into separate line files.
extractWikipedia.alg was changed to use this task, so now it creates two
files. (Doron Cohen)
-
+
+* LUCENE-4290: Added PostingsHighlighter to the highlighter module. It uses
+ offsets from the postings lists to highlight documents. (Robert Muir)
+
+* LUCENE-4628: Added CommonTermsQuery that executes high-frequency terms
+ in a optional sub-query to prevent slow queries due to "common" terms
+ like stopwords. (Simon Willnauer)
+
API Changes
* LUCENE-4399: Deprecated AppendingCodec. Lucene's term dictionaries
@@ -165,6 +198,19 @@ API Changes
* LUCENE-4591: CompressingStoredFields{Writer,Reader} now accept a segment
suffix as a constructor parameter. (Renaud Delbru via Adrien Grand)
+* LUCENE-4605: Added DocsEnum.FLAG_NONE which can be passed instead of 0 as
+ the flag to .docs() and .docsAndPositions(). (Shai Erera)
+
+* LUCENE-4617: Remove FST.pack() method. Previously to make a packed FST,
+ you had to make a Builder with willPackFST=true (telling it you will later pack it),
+ create your fst with finish(), and then call pack() to get another FST.
+ Instead just pass true for doPackFST to Builder and finish() returns a packed FST.
+ (Robert Muir)
+
+* LUCENE-4663: Deprecate IndexSearcher.document(int, Set). This was not intended
+ to be final, nor named document(). Use IndexSearcher.doc(int, Set) instead.
+ (Robert Muir)
+
Bug Fixes
* LUCENE-1822: BaseFragListBuilder hard-coded 6 char margin is too naive.
@@ -246,6 +292,39 @@ Bug Fixes
* LUCENE-4596: fix a concurrency bug in DirectoryTaxonomyWriter.
(Shai Erera)
+* LUCENE-4594: Spatial PrefixTreeStrategy would index center-points in addition
+ to the shape to index if it was non-point, in the same field. But sometimes
+ the center-point isn't actually in the shape (consider a LineString), and for
+ highly precise shapes it could cause makeDistanceValueSource's cache to load
+ parts of the shape's boundary erroneously too. So center points aren't
+ indexed any more; you should use another spatial field. (David Smiley)
+
+* LUCENE-4629: IndexWriter misses to delete documents if a document block is
+ indexed and the Iterator throws an exception. Documents were only rolled back
+ if the actual indexing process failed. (Simon Willnauer)
+
+* LUCENE-4608: Handle large number of requested fragments better.
+ (Martijn van Groningen)
+
+* LUCENE-4633: DirectoryTaxonomyWriter.replaceTaxonomy did not refresh its
+ internal reader, which could cause an existing category to be added twice.
+ (Shai Erera)
+
+* LUCENE-4461: If you added the same FacetRequest more than once, you would get
+ inconsistent results. (Gilad Barkai via Shai Erera)
+
+* LUCENE-4656: Fix regression in IndexWriter to work with empty TokenStreams
+ that have no TermToBytesRefAttribute (commonly provided by CharTermAttribute),
+ e.g., oal.analysis.miscellaneous.EmptyTokenStream.
+ (Uwe Schindler, Adrien Grand, Robert Muir)
+
+* LUCENE-4660: ConcurrentMergeScheduler was taking too long to
+ un-pause incoming threads it had paused when too many merges were
+ queued up. (Mike McCandless)
+
+* LUCENE-4662: Add missing elided articles and prepositions to FrenchAnalyzer's
+ DEFAULT_ARTICLES list passed to ElisionFilter. (David Leunen via Steve Rowe)
+
Changes in Runtime Behavior
* LUCENE-4586: Change default ResultMode of FacetRequest to PER_NODE_IN_TREE.
@@ -310,6 +389,10 @@ Optimizations
* LUCENE-4598: PayloadIterator no longer uses top-level IndexReader to iterate on the
posting's payload. (Shai Erera, Michael McCandless)
+
+* LUCENE-4661: Drop default maxThreadCount to 1 and maxMergeCount to 2
+ in ConcurrentMergeScheduler, for faster merge performance on
+ spinning-magnet drives (Mike McCandless)
Documentation
@@ -318,6 +401,9 @@ Documentation
Build
+* LUCENE-4650: Upgrade randomized testing to version 2.0.8: make the
+ test framework more robust under low memory conditions. (Dawid Weiss)
+
* LUCENE-4603: Upgrade randomized testing to version 2.0.5: print forked
JVM PIDs on heartbeat from hung tests (Dawid Weiss)
Modified: lucene/dev/branches/lucene4547/lucene/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/NOTICE.txt?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/NOTICE.txt (original)
+++ lucene/dev/branches/lucene4547/lucene/NOTICE.txt Tue Jan 8 03:40:16 2013
@@ -1,5 +1,5 @@
Apache Lucene
-Copyright 2012 The Apache Software Foundation
+Copyright 2013 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -37,6 +37,7 @@ import org.apache.lucene.analysis.util.T
*/
public class ArabicNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
+ @Override
public ArabicNormalizationFilter create(TokenStream input) {
return new ArabicNormalizationFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -37,6 +37,7 @@ import org.apache.lucene.analysis.util.T
public class ArabicStemFilterFactory extends TokenFilterFactory {
+ @Override
public ArabicStemFilter create(TokenStream input) {
return new ArabicStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class BulgarianStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new BulgarianStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class BrazilianStemFilterFactory extends TokenFilterFactory {
+ @Override
public BrazilianStemFilter create(TokenStream in) {
return new BrazilianStemFilter(in);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -43,6 +43,7 @@ import java.util.regex.Pattern;
Set<String> escapedTags = null;
Pattern TAG_NAME_PATTERN = Pattern.compile("[^\\s,]+");
+ @Override
public HTMLStripCharFilter create(Reader input) {
HTMLStripCharFilter charFilter;
if (null == escapedTags) {
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -50,6 +50,7 @@ public class MappingCharFilterFactory ex
private String mapping;
// TODO: this should use inputstreams from the loader, not File!
+ @Override
public void inform(ResourceLoader loader) throws IOException {
mapping = args.get("mapping");
@@ -77,6 +78,7 @@ public class MappingCharFilterFactory ex
}
}
+ @Override
public Reader create(Reader input) {
// if the map is null, it means there's actually no mappings... just return the original stream
// as there is nothing to do here.
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilter.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilter.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilter.java Tue Jan 8 03:40:16 2013
@@ -58,6 +58,7 @@ public final class CJKWidthFilter extend
super(input);
}
+ @Override
public boolean incrementToken() throws IOException {
if (input.incrementToken()) {
char text[] = termAtt.buffer();
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -42,6 +42,7 @@ import org.apache.lucene.analysis.util.*
public class CommonGramsFilterFactory extends TokenFilterFactory implements
ResourceLoaderAware {
+ @Override
public void inform(ResourceLoader loader) throws IOException {
String commonWordFiles = args.get("words");
ignoreCase = getBoolean("ignoreCase", false);
@@ -69,6 +70,7 @@ public class CommonGramsFilterFactory ex
return commonWords;
}
+ @Override
public CommonGramsFilter create(TokenStream input) {
CommonGramsFilter commonGrams = new CommonGramsFilter(luceneMatchVersion, input, commonWords);
return commonGrams;
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -50,6 +50,7 @@ public class CommonGramsQueryFilterFacto
assureMatchVersion();
}
+ @Override
public void inform(ResourceLoader loader) throws IOException {
String commonWordFiles = args.get("words");
ignoreCase = getBoolean("ignoreCase", false);
@@ -82,6 +83,7 @@ public class CommonGramsQueryFilterFacto
/**
* Create a CommonGramsFilter and wrap it with a CommonGramsQueryFilter
*/
+ @Override
public CommonGramsQueryFilter create(TokenStream input) {
CommonGramsFilter commonGrams = new CommonGramsFilter(luceneMatchVersion, input, commonWords);
CommonGramsQueryFilter commonGramsQuery = new CommonGramsQueryFilter(
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -56,9 +56,11 @@ public class DictionaryCompoundWordToken
maxSubwordSize= getInt("maxSubwordSize",CompoundWordTokenFilterBase.DEFAULT_MAX_SUBWORD_SIZE);
onlyLongestMatch = getBoolean("onlyLongestMatch",true);
}
+ @Override
public void inform(ResourceLoader loader) throws IOException {
dictionary = super.getWordSet(loader, dictFile, false);
}
+ @Override
public TokenStream create(TokenStream input) {
// if the dictionary is null, it means it was empty
return dictionary == null ? input : new DictionaryCompoundWordTokenFilter(luceneMatchVersion,input,dictionary,minWordSize,minSubwordSize,maxSubwordSize,onlyLongestMatch);
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -85,6 +85,7 @@ public class HyphenationCompoundWordToke
onlyLongestMatch = getBoolean("onlyLongestMatch", false);
}
+ @Override
public void inform(ResourceLoader loader) throws IOException {
InputStream stream = null;
try {
@@ -102,6 +103,7 @@ public class HyphenationCompoundWordToke
}
}
+ @Override
public HyphenationCompoundWordTokenFilter create(TokenStream input) {
return new HyphenationCompoundWordTokenFilter(luceneMatchVersion, input, hyphenator, dictionary, minWordSize, minSubwordSize, maxSubwordSize, onlyLongestMatch);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java Tue Jan 8 03:40:16 2013
@@ -414,6 +414,7 @@ public class HyphenationTree extends Ter
* case characters, in this case a class for letter 'a', for example, should
* be defined as "aA", the first character being the normalization char.
*/
+ @Override
public void addClass(String chargroup) {
if (chargroup.length() > 0) {
char equivChar = chargroup.charAt(0);
@@ -435,6 +436,7 @@ public class HyphenationTree extends Ter
* @param hyphenatedword a vector of alternating strings and
* {@link Hyphen hyphen} objects.
*/
+ @Override
public void addException(String word, ArrayList<Object> hyphenatedword) {
stoplist.put(word, hyphenatedword);
}
@@ -449,6 +451,7 @@ public class HyphenationTree extends Ter
* priority of hyphenating at a given point within the pattern. It
* should contain only digit characters. (i.e. '0' to '9').
*/
+ @Override
public void addPattern(String pattern, String ivalue) {
int k = ivalues.find(ivalue);
if (k <= 0) {
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java Tue Jan 8 03:40:16 2013
@@ -515,6 +515,7 @@ public class TernaryTree implements Clon
run();
}
+ @Override
public String nextElement() {
String res = new String(curkey);
cur = up();
@@ -529,6 +530,7 @@ public class TernaryTree implements Clon
return 0;
}
+ @Override
public boolean hasMoreElements() {
return (cur != -1);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java Tue Jan 8 03:40:16 2013
@@ -33,6 +33,7 @@ import java.io.Reader;
*
*/
public class KeywordTokenizerFactory extends TokenizerFactory {
+ @Override
public KeywordTokenizer create(Reader input) {
return new KeywordTokenizer(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java Tue Jan 8 03:40:16 2013
@@ -41,6 +41,7 @@ public class LetterTokenizerFactory exte
assureMatchVersion();
}
+ @Override
public LetterTokenizer create(Reader input) {
return new LetterTokenizer(luceneMatchVersion, input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -43,6 +43,7 @@ public class LowerCaseFilterFactory exte
assureMatchVersion();
}
+ @Override
public LowerCaseFilter create(TokenStream input) {
return new LowerCaseFilter(luceneMatchVersion,input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizerFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizerFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizerFactory.java Tue Jan 8 03:40:16 2013
@@ -42,6 +42,7 @@ public class LowerCaseTokenizerFactory e
assureMatchVersion();
}
+ @Override
public LowerCaseTokenizer create(Reader input) {
return new LowerCaseTokenizer(luceneMatchVersion,input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java Tue Jan 8 03:40:16 2013
@@ -40,6 +40,7 @@ public class WhitespaceTokenizerFactory
assureMatchVersion();
}
+ @Override
public WhitespaceTokenizer create(Reader input) {
return new WhitespaceTokenizer(luceneMatchVersion,input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -33,6 +33,7 @@ import org.apache.lucene.analysis.util.T
* </fieldType></pre>
*/
public class CzechStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new CzechStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class GermanLightStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new GermanLightStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class GermanMinimalStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new GermanMinimalStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -36,6 +36,7 @@ import org.apache.lucene.analysis.util.T
*/
public class GermanNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
+ @Override
public TokenStream create(TokenStream input) {
return new GermanNormalizationFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class GermanStemFilterFactory extends TokenFilterFactory {
+ @Override
public GermanStemFilter create(TokenStream in) {
return new GermanStemFilter(in);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -48,10 +48,12 @@ public class GreekLowerCaseFilterFactory
+ "Please process your documents as Unicode instead.");
}
+ @Override
public GreekLowerCaseFilter create(TokenStream in) {
return new GreekLowerCaseFilter(luceneMatchVersion, in);
}
+ @Override
public AbstractAnalysisFactory getMultiTermComponent() {
return this;
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -35,6 +35,7 @@ import org.apache.lucene.analysis.util.T
*/
public class GreekStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new GreekStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class EnglishMinimalStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new EnglishMinimalStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -43,6 +43,7 @@ public class EnglishPossessiveFilterFact
assureMatchVersion();
}
+ @Override
public TokenStream create(TokenStream input) {
return new EnglishPossessiveFilter(luceneMatchVersion, input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -27,6 +27,7 @@ import org.apache.lucene.analysis.util.T
*/
public class KStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenFilter create(TokenStream input) {
return new KStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class PorterStemFilterFactory extends TokenFilterFactory {
+ @Override
public PorterStemFilter create(TokenStream input) {
return new PorterStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class SpanishLightStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new SpanishLightStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -36,6 +36,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class PersianNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
+ @Override
public PersianNormalizationFilter create(TokenStream input) {
return new PersianNormalizationFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class FinnishLightStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new FinnishLightStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java Tue Jan 8 03:40:16 2013
@@ -59,7 +59,7 @@ public final class FrenchAnalyzer extend
/** Default set of articles for ElisionFilter */
public static final CharArraySet DEFAULT_ARTICLES = CharArraySet.unmodifiableSet(
new CharArraySet(Version.LUCENE_CURRENT, Arrays.asList(
- "l", "m", "t", "qu", "n", "s", "j"), true));
+ "l", "m", "t", "qu", "n", "s", "j", "d", "c", "jusqu", "quoiqu", "lorsqu", "puisqu"), true));
/**
* Contains words that should be indexed but not stemmed.
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -35,6 +35,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class FrenchLightStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new FrenchLightStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -35,6 +35,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class FrenchMinimalStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new FrenchMinimalStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class GalicianMinimalStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new GalicianMinimalStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class GalicianStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new GalicianStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -35,6 +35,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class HindiNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
+ @Override
public TokenStream create(TokenStream input) {
return new HindiNormalizationFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -33,6 +33,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class HindiStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new HindiStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class HungarianLightStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new HungarianLightStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java Tue Jan 8 03:40:16 2013
@@ -447,6 +447,7 @@ public class HunspellDictionary {
/**
* {@inheritDoc}
*/
+ @Override
public char[] parseFlags(String rawFlags) {
return rawFlags.toCharArray();
}
@@ -460,6 +461,7 @@ public class HunspellDictionary {
/**
* {@inheritDoc}
*/
+ @Override
public char[] parseFlags(String rawFlags) {
String[] rawFlagParts = rawFlags.trim().split(",");
char[] flags = new char[rawFlagParts.length];
@@ -484,6 +486,7 @@ public class HunspellDictionary {
/**
* {@inheritDoc}
*/
+ @Override
public char[] parseFlags(String rawFlags) {
if (rawFlags.length() == 0) {
return new char[0];
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -67,6 +67,7 @@ public class HunspellStemFilterFactory e
*
* @param loader ResourceLoader used to load the files
*/
+ @Override
public void inform(ResourceLoader loader) throws IOException {
assureMatchVersion();
String dictionaryArg = args.get(PARAM_DICTIONARY);
@@ -116,6 +117,7 @@ public class HunspellStemFilterFactory e
* @param tokenStream TokenStream that will be filtered
* @return HunspellStemFilter that filters the TokenStream
*/
+ @Override
public TokenStream create(TokenStream tokenStream) {
return new HunspellStemFilter(tokenStream, dictionary);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -44,6 +44,7 @@ public class IndonesianStemFilterFactory
stemDerivational = getBoolean("stemDerivational", true);
}
+ @Override
public TokenStream create(TokenStream input) {
return new IndonesianStemFilter(input, stemDerivational);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -35,6 +35,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class IndicNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
+ @Override
public TokenStream create(TokenStream input) {
return new IndicNormalizationFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class ItalianLightStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new ItalianLightStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -33,6 +33,7 @@ import org.apache.lucene.analysis.util.T
* </fieldType></pre>
*/
public class LatvianStemFilterFactory extends TokenFilterFactory {
+ @Override
public TokenStream create(TokenStream input) {
return new LatvianStemFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -35,6 +35,7 @@ import org.apache.lucene.analysis.TokenS
*
*/
public class ASCIIFoldingFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
+ @Override
public ASCIIFoldingFilter create(TokenStream input) {
return new ASCIIFoldingFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -133,6 +133,7 @@ public class CapitalizationFilterFactory
}
}
+ @Override
public CapitalizationFilter create(TokenStream input) {
return new CapitalizationFilter(input, onlyFirstWord, keep,
forceFirstLetter, okPrefix, minWordLength, maxWordCount, maxTokenLength);
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -33,6 +33,7 @@ import org.apache.lucene.analysis.util.T
*
*/
public class HyphenatedWordsFilterFactory extends TokenFilterFactory {
+ @Override
public HyphenatedWordsFilter create(TokenStream input) {
return new HyphenatedWordsFilter(input);
}
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java Tue Jan 8 03:40:16 2013
@@ -44,6 +44,7 @@ public class KeepWordFilterFactory exten
assureMatchVersion();
}
+ @Override
public void inform(ResourceLoader loader) throws IOException {
String wordFiles = args.get("words");
ignoreCase = getBoolean("ignoreCase", false);
@@ -85,6 +86,7 @@ public class KeepWordFilterFactory exten
return words;
}
+ @Override
public TokenStream create(TokenStream input) {
// if the set is null, it means it was empty
return words == null ? input : new KeepWordFilter(enablePositionIncrements, input, words);