You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2015/08/12 01:08:43 UTC
svn commit: r1695401 [1/12] - in /lucene/dev/branches/branch_5x: ./
dev-tools/ dev-tools/idea/.idea/ lucene/ lucene/analysis/
lucene/analysis/common/ lucene/analysis/icu/ lucene/analysis/stempel/
lucene/analysis/uima/ lucene/benchmark/ lucene/core/ luc...
Author: uschindler
Date: Tue Aug 11 23:08:41 2015
New Revision: 1695401
URL: http://svn.apache.org/r1695401
Log:
Merged revision(s) 1695395 from lucene/dev/trunk:
LUCENE-6732: Remove tabs in JS and XML files
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/build.xml
lucene/dev/branches/branch_5x/dev-tools/ (props changed)
lucene/dev/branches/branch_5x/dev-tools/idea/.idea/projectCodeStyle.xml
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/analysis/build.xml
lucene/dev/branches/branch_5x/lucene/analysis/common/build.xml
lucene/dev/branches/branch_5x/lucene/analysis/icu/build.xml
lucene/dev/branches/branch_5x/lucene/analysis/stempel/build.xml
lucene/dev/branches/branch_5x/lucene/analysis/uima/build.xml
lucene/dev/branches/branch_5x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_5x/lucene/benchmark/build.xml
lucene/dev/branches/branch_5x/lucene/build.xml (contents, props changed)
lucene/dev/branches/branch_5x/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/build.xml
lucene/dev/branches/branch_5x/lucene/demo/ (props changed)
lucene/dev/branches/branch_5x/lucene/demo/build.xml
lucene/dev/branches/branch_5x/lucene/demo/src/resources/org/apache/lucene/demo/xmlparser/WEB-INF/web.xml
lucene/dev/branches/branch_5x/lucene/module-build.xml (contents, props changed)
lucene/dev/branches/branch_5x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_5x/lucene/queryparser/build.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanFilter.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/CachedFilter.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/ConstantScoreQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DisjunctionMaxQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DuplicateFilterQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/FuzzyLikeThisQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/LikeThisQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/MatchAllDocsQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NestedBooleanQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NumericRangeFilterQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NumericRangeQueryQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/RangeFilterQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsFilterQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQuery.xml
lucene/dev/branches/branch_5x/lucene/queryparser/xmldtddocbuild.xml
lucene/dev/branches/branch_5x/lucene/replicator/ (props changed)
lucene/dev/branches/branch_5x/lucene/replicator/build.xml
lucene/dev/branches/branch_5x/lucene/replicator/ivy.xml
lucene/dev/branches/branch_5x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_5x/lucene/suggest/build.xml
lucene/dev/branches/branch_5x/lucene/tools/ (props changed)
lucene/dev/branches/branch_5x/lucene/tools/custom-tasks.xml
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/build.xml (contents, props changed)
lucene/dev/branches/branch_5x/solr/common-build.xml (contents, props changed)
lucene/dev/branches/branch_5x/solr/contrib/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/expressions.xml
lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/fieldFacetExtras.xml
lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/fieldFacets.xml
lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/functions.xml
lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/noFacets.xml
lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/queryFacets.xml
lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/rangeFacets.xml
lucene/dev/branches/branch_5x/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/build.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/build.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-end-to-end.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-with-datasource.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-with-transformer.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/single-entity-data-config.xml
lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/contrib/langid/build.xml
lucene/dev/branches/branch_5x/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/schema.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/schema.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/test-documents/testXML.xml
lucene/dev/branches/branch_5x/solr/contrib/uima/src/resources/org/apache/uima/desc/HmmTagger.xml
lucene/dev/branches/branch_5x/solr/contrib/uima/src/resources/org/apache/uima/desc/TextCategorizationAEDescriptor.xml
lucene/dev/branches/branch_5x/solr/contrib/uima/src/resources/org/apache/uima/desc/WhitespaceTokenizer.xml
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema11.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache-with-delaying-searchcomponent.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/example/ (props changed)
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/schema.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/schema.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/rss-data-config.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/schema.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/schema.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/tika/conf/schema.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/example/exampledocs/mem.xml
lucene/dev/branches/branch_5x/solr/example/files/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/example/files/conf/velocity/js/jquery.autocomplete.js
lucene/dev/branches/branch_5x/solr/example/files/conf/velocity/js/jquery.tx3-tag-cloud.js
lucene/dev/branches/branch_5x/solr/server/ (props changed)
lucene/dev/branches/branch_5x/solr/server/build.xml
lucene/dev/branches/branch_5x/solr/server/solr/configsets/basic_configs/conf/schema.xml
lucene/dev/branches/branch_5x/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/schema.xml
lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/jquery.autocomplete.js
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/docs2.xml
lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml
lucene/dev/branches/branch_5x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_5x/solr/test-framework/build.xml
lucene/dev/branches/branch_5x/solr/webapp/ (props changed)
lucene/dev/branches/branch_5x/solr/webapp/build.xml
lucene/dev/branches/branch_5x/solr/webapp/web/WEB-INF/weblogic.xml
lucene/dev/branches/branch_5x/solr/webapp/web/js/lib/ZeroClipboard.js
lucene/dev/branches/branch_5x/solr/webapp/web/js/lib/jquery.blockUI.js
lucene/dev/branches/branch_5x/solr/webapp/web/js/lib/jquery.form.js
lucene/dev/branches/branch_5x/solr/webapp/web/js/lib/jquery.jstree.js
lucene/dev/branches/branch_5x/solr/webapp/web/js/require.js
lucene/dev/branches/branch_5x/solr/webapp/web/js/scripts/segments.js
lucene/dev/branches/branch_5x/solr/webapp/web/libs/jquery.jstree.js
lucene/dev/branches/branch_5x/solr/webapp/web/libs/ngtimeago.js
Modified: lucene/dev/branches/branch_5x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/build.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/build.xml (original)
+++ lucene/dev/branches/branch_5x/build.xml Tue Aug 11 23:08:41 2015
@@ -131,8 +131,7 @@
import org.apache.tools.ant.BuildException;
def extensions = [
- 'java', 'jflex', 'py', 'pl', 'g4', 'jj', 'html'
- // TODO: js, xml
+ 'java', 'jflex', 'py', 'pl', 'g4', 'jj', 'html', 'js', 'xml'
];
def invalidPatterns = [
(~$/@author\b/$) : '@author javadoc tag',
@@ -170,6 +169,7 @@
include(name: '*.' + it)
}
exclude(name: '**/build/**')
+ exclude(name: 'build.xml') // ourselves :-)
}
}.each{ f ->
def text = f.getText('UTF-8');
Modified: lucene/dev/branches/branch_5x/dev-tools/idea/.idea/projectCodeStyle.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/dev-tools/idea/.idea/projectCodeStyle.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/dev-tools/idea/.idea/projectCodeStyle.xml (original)
+++ lucene/dev/branches/branch_5x/dev-tools/idea/.idea/projectCodeStyle.xml Tue Aug 11 23:08:41 2015
@@ -21,7 +21,7 @@
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
<value />
</option>
- <option name="IMPORT_LAYOUT_TABLE">
+ <option name="IMPORT_LAYOUT_TABLE">
<value>
<package name="javax" withSubpackages="true" static="false" />
<package name="java" withSubpackages="true" static="false" />
Modified: lucene/dev/branches/branch_5x/lucene/analysis/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/build.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/build.xml Tue Aug 11 23:08:41 2015
@@ -21,12 +21,12 @@
<description>
Additional Analyzers
- - common: Additional Analyzers
+ - common: Additional Analyzers
- icu: Analyzers that use functionality from ICU
- - kuromoji: Japanese Morphological Analyzer
- - morfologik: Morfologik Stemmer
- - smartcn: Smart Analyzer for Simplified Chinese Text
- - stempel: Algorithmic Stemmer for Polish
+ - kuromoji: Japanese Morphological Analyzer
+ - morfologik: Morfologik Stemmer
+ - smartcn: Smart Analyzer for Simplified Chinese Text
+ - stempel: Algorithmic Stemmer for Polish
- uima: UIMA Analysis module
</description>
@@ -120,15 +120,15 @@
<target name="-dist-maven">
<forall-analyzers target="-dist-maven"/>
- </target>
+ </target>
<target name="-validate-maven-dependencies">
<forall-analyzers target="-validate-maven-dependencies"/>
- </target>
+ </target>
<target name="javadocs">
<forall-analyzers target="javadocs"/>
- </target>
+ </target>
<target name="javadocs-index.html">
<forall-analyzers target="javadocs-index.html"/>
@@ -149,7 +149,7 @@
<target name="-append-module-dependencies-properties">
<forall-analyzers target="-append-module-dependencies-properties"/>
</target>
-
+
<target name="check-forbidden-apis">
<forall-analyzers target="check-forbidden-apis"/>
</target>
Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/build.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/build.xml Tue Aug 11 23:08:41 2015
@@ -28,7 +28,7 @@
<property name="rat.additional-includes" value="src/tools/**"/>
<import file="../analysis-module-build.xml"/>
-
+
<target name="jflex" depends="-install-jflex,clean-jflex,-jflex-StandardAnalyzer,-jflex-UAX29URLEmailTokenizer,
-jflex-wiki-tokenizer,-jflex-HTMLStripCharFilter,-jflex-legacy"/>
@@ -166,7 +166,7 @@
fork="true"
failonerror="true">
<classpath>
- <pathelement location="${build.dir}/classes/tools"/>
+ <pathelement location="${build.dir}/classes/tools"/>
</classpath>
<arg value="${tld.zones}"/>
<arg value="${tld.output}"/>
Modified: lucene/dev/branches/branch_5x/lucene/analysis/icu/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/icu/build.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/icu/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/icu/build.xml Tue Aug 11 23:08:41 2015
@@ -59,7 +59,7 @@
</target>
<property name="gennorm2.src.files"
- value="nfc.txt nfkc.txt nfkc_cf.txt BasicFoldings.txt DiacriticFolding.txt DingbatFolding.txt HanRadicalFolding.txt NativeDigitFolding.txt"/>
+ value="nfc.txt nfkc.txt nfkc_cf.txt BasicFoldings.txt DiacriticFolding.txt DingbatFolding.txt HanRadicalFolding.txt NativeDigitFolding.txt"/>
<property name="gennorm2.tmp" value="${build.dir}/gennorm2/utr30.tmp"/>
<property name="gennorm2.dst" value="${resources.dir}/org/apache/lucene/analysis/icu/utr30.nrm"/>
<target name="gennorm2" depends="gen-utr30-data-files">
@@ -85,7 +85,7 @@ are part of the ICU4C package. See http:
<property name="rbbi.src.dir" location="src/data/uax29"/>
<property name="rbbi.dst.dir" location="${resources.dir}/org/apache/lucene/analysis/icu/segmentation"/>
-
+
<target name="genrbbi" depends="compile-tools">
<mkdir dir="${rbbi.dst.dir}"/>
<java
@@ -94,8 +94,8 @@ are part of the ICU4C package. See http:
fork="true"
failonerror="true">
<classpath>
- <path refid="icujar"/>
- <pathelement location="${build.dir}/classes/tools"/>
+ <path refid="icujar"/>
+ <pathelement location="${build.dir}/classes/tools"/>
</classpath>
<assertions>
<enable package="org.apache.lucene"/>
Modified: lucene/dev/branches/branch_5x/lucene/analysis/stempel/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/stempel/build.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/stempel/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/stempel/build.xml Tue Aug 11 23:08:41 2015
@@ -29,6 +29,6 @@
<pathelement path="${analyzers-common.jar}"/>
<path refid="base.classpath"/>
</path>
-
+
<target name="compile-core" depends="jar-analyzers-common, common.compile-core"/>
</project>
Modified: lucene/dev/branches/branch_5x/lucene/analysis/uima/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/uima/build.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/uima/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/uima/build.xml Tue Aug 11 23:08:41 2015
@@ -22,7 +22,7 @@
<description>
Analysis integration with Apache UIMA
</description>
-
+
<property name="tests.userdir" value="src/test-files"/>
<!-- TODO: why is this limited to one JVM? -->
<property name="tests.jvms.override" value="1" />
Modified: lucene/dev/branches/branch_5x/lucene/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/benchmark/build.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/benchmark/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/benchmark/build.xml Tue Aug 11 23:08:41 2015
@@ -46,9 +46,9 @@
<available file="temp/enwiki-20070527-pages-articles.xml.bz2" property="enwiki.exists"/>
<available file="temp/enwiki-20070527-pages-articles.xml" property="enwiki.expanded"/>
<available file="${working.dir}/enwiki.txt" property="enwiki.extracted"/>
- <available file="temp/${top.100k.words.archive.filename}"
+ <available file="temp/${top.100k.words.archive.filename}"
property="top.100k.words.archive.present"/>
- <available file="${working.dir}/top100k-out"
+ <available file="${working.dir}/top100k-out"
property="top.100k.word.files.expanded"/>
</target>
@@ -137,27 +137,27 @@
<untar src="temp/mini_newsgroups.tar" dest="${working.dir}"/>
</target>
- <property name="top.100k.words.archive.filename"
- value="top.100k.words.de.en.fr.uk.wikipedia.2009-11.tar.bz2"/>
- <property name="top.100k.words.archive.base.url"
- value="http://people.apache.org/~rmuir/wikipedia"/>
- <target name="get-top-100k-words-archive" unless="top.100k.words.archive.present">
- <mkdir dir="temp"/>
- <get src="${top.100k.words.archive.base.url}/${top.100k.words.archive.filename}"
- dest="temp/${top.100k.words.archive.filename}"/>
- </target>
- <target name="expand-top-100k-word-files" unless="top.100k.word.files.expanded">
- <mkdir dir="${working.dir}/top100k-out"/>
- <untar src="temp/${top.100k.words.archive.filename}"
- overwrite="true" compression="bzip2" dest="${working.dir}/top100k-out"/>
- </target>
-
- <target name="top-100k-wiki-word-files" depends="check-files">
- <mkdir dir="${working.dir}"/>
- <antcall target="get-top-100k-words-archive"/>
- <antcall target="expand-top-100k-word-files"/>
- </target>
-
+ <property name="top.100k.words.archive.filename"
+ value="top.100k.words.de.en.fr.uk.wikipedia.2009-11.tar.bz2"/>
+ <property name="top.100k.words.archive.base.url"
+ value="http://people.apache.org/~rmuir/wikipedia"/>
+ <target name="get-top-100k-words-archive" unless="top.100k.words.archive.present">
+ <mkdir dir="temp"/>
+ <get src="${top.100k.words.archive.base.url}/${top.100k.words.archive.filename}"
+ dest="temp/${top.100k.words.archive.filename}"/>
+ </target>
+ <target name="expand-top-100k-word-files" unless="top.100k.word.files.expanded">
+ <mkdir dir="${working.dir}/top100k-out"/>
+ <untar src="temp/${top.100k.words.archive.filename}"
+ overwrite="true" compression="bzip2" dest="${working.dir}/top100k-out"/>
+ </target>
+
+ <target name="top-100k-wiki-word-files" depends="check-files">
+ <mkdir dir="${working.dir}"/>
+ <antcall target="get-top-100k-words-archive"/>
+ <antcall target="expand-top-100k-word-files"/>
+ </target>
+
<target name="get-files" depends="check-files">
<mkdir dir="temp"/>
<antcall target="get-reuters"/>
@@ -222,44 +222,44 @@
</java>
</target>
- <property name="collation.alg.file" location="conf/collation.alg"/>
- <property name="collation.output.file"
- value="${working.dir}/collation.benchmark.output.txt"/>
- <property name="collation.jira.output.file"
- value="${working.dir}/collation.bm2jira.output.txt"/>
-
- <path id="collation.runtime.classpath">
- <path refid="run.classpath"/>
+ <property name="collation.alg.file" location="conf/collation.alg"/>
+ <property name="collation.output.file"
+ value="${working.dir}/collation.benchmark.output.txt"/>
+ <property name="collation.jira.output.file"
+ value="${working.dir}/collation.bm2jira.output.txt"/>
+
+ <path id="collation.runtime.classpath">
+ <path refid="run.classpath"/>
<pathelement path="${analyzers-icu.jar}"/>
- </path>
-
- <target name="collation" depends="compile,jar-analyzers-icu,top-100k-wiki-word-files">
- <echo>Running benchmark with alg file: ${collation.alg.file}</echo>
- <java fork="true" classname="org.apache.lucene.benchmark.byTask.Benchmark"
- maxmemory="${task.mem}" output="${collation.output.file}">
- <classpath refid="collation.runtime.classpath"/>
- <arg file="${collation.alg.file}"/>
- </java>
- <echo>Benchmark output is in file: ${collation.output.file}</echo>
- <echo>Converting to JIRA table format...</echo>
- <exec executable="${perl.exe}" output="${collation.jira.output.file}" failonerror="true">
+ </path>
+
+ <target name="collation" depends="compile,jar-analyzers-icu,top-100k-wiki-word-files">
+ <echo>Running benchmark with alg file: ${collation.alg.file}</echo>
+ <java fork="true" classname="org.apache.lucene.benchmark.byTask.Benchmark"
+ maxmemory="${task.mem}" output="${collation.output.file}">
+ <classpath refid="collation.runtime.classpath"/>
+ <arg file="${collation.alg.file}"/>
+ </java>
+ <echo>Benchmark output is in file: ${collation.output.file}</echo>
+ <echo>Converting to JIRA table format...</echo>
+ <exec executable="${perl.exe}" output="${collation.jira.output.file}" failonerror="true">
<arg value="-CSD"/>
- <arg value="scripts/collation.bm2jira.pl"/>
- <arg value="${collation.output.file}"/>
- </exec>
- <echo>Benchmark output in JIRA table format is in file: ${collation.jira.output.file}</echo>
- </target>
-
+ <arg value="scripts/collation.bm2jira.pl"/>
+ <arg value="${collation.output.file}"/>
+ </exec>
+ <echo>Benchmark output in JIRA table format is in file: ${collation.jira.output.file}</echo>
+ </target>
+
<property name="shingle.alg.file" location="conf/shingle.alg"/>
<property name="shingle.output.file"
value="${working.dir}/shingle.benchmark.output.txt"/>
<property name="shingle.jira.output.file"
value="${working.dir}/shingle.bm2jira.output.txt"/>
-
+
<path id="shingle.runtime.classpath">
<path refid="run.classpath"/>
</path>
-
+
<target name="shingle" depends="compile,get-files">
<echo>Running benchmark with alg file: ${shingle.alg.file}</echo>
<java fork="true" classname="org.apache.lucene.benchmark.byTask.Benchmark"
Modified: lucene/dev/branches/branch_5x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/build.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/build.xml Tue Aug 11 23:08:41 2015
@@ -78,7 +78,7 @@
<!-- Validation here depends on compile-tools: but we want to compile modules' tools too -->
<target name="compile-tools" depends="common.compile-tools">
- <modules-crawl target="compile-tools" failonerror="true"/>
+ <modules-crawl target="compile-tools" failonerror="true"/>
</target>
<target name="check-licenses" depends="compile-tools,resolve,load-custom-tasks" description="Validate license stuff.">
@@ -97,7 +97,7 @@
<lib-versions-check-macro dir="${common.dir}/.."
centralized.versions.file="${common.dir}/ivy-versions.properties"
ivy.settings.file="${common.dir}/ivy-settings.xml"
- ivy.resolution-cache.dir="${ivy.resolution-cache.dir}"
+ ivy.resolution-cache.dir="${ivy.resolution-cache.dir}"
common.build.dir="${common.build.dir}"
ignore.conflicts.file="${common.dir}/ivy-ignore-conflicts.properties"/>
</target>
@@ -237,7 +237,7 @@
<fileset dir="site/html"/>
</copy>
</target>
-
+
<target name="javadocs-modules" description="Generate javadoc for modules classes">
<modules-crawl target="javadocs"
failonerror="true"/>
@@ -281,7 +281,7 @@
<patternset refid="binary.build.dist.patterns"/>
</zipfileset>
</zip>
- <make-checksums file="${dist.dir}/lucene-${version}.zip"/>
+ <make-checksums file="${dist.dir}/lucene-${version}.zip"/>
</target>
<!-- ================================================================== -->
@@ -435,7 +435,7 @@
<modules-crawl target="-validate-maven-dependencies"/>
</sequential>
</target>
-
+
<!-- ================================================================== -->
<!-- support for signing the artifacts using gpg -->
<!-- ================================================================== -->
Modified: lucene/dev/branches/branch_5x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/common-build.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/common-build.xml Tue Aug 11 23:08:41 2015
@@ -221,7 +221,7 @@
<include name="**/lib/*.jar"/>
</fileset>
</path>
-
+
<property name="changes.src.dir" location="${common.dir}/site/changes"/>
<property name="changes.target.dir" location="${common.dir}/build/docs/changes"/>
@@ -573,7 +573,7 @@
</pathconvert>
<macrodef name="m2-deploy" description="Builds a Maven artifact">
- <element name="artifact-attachments" optional="yes"/>
+ <element name="artifact-attachments" optional="yes"/>
<element name="parent-poms" optional="yes"/>
<element name="credentials" optional="yes"/>
<attribute name="pom.xml"/>
@@ -631,7 +631,7 @@
</macrodef>
<macrodef name="build-manifest" description="Builds a manifest file">
- <attribute name="title"/>
+ <attribute name="title"/>
<attribute name="implementation.title"/>
<attribute name="manifest.file" default="${manifest.file}"/>
<element name="additional-manifest-attributes" optional="true"/>
@@ -684,11 +684,11 @@
</manifest>
</sequential>
</macrodef>
-
+
<macrodef name="jarify" description="Builds a JAR file">
- <attribute name="basedir" default="${build.dir}/classes/java"/>
- <attribute name="destfile" default="${build.dir}/${final.name}.jar"/>
- <attribute name="title" default="Lucene Search Engine: ${ant.project.name}"/>
+ <attribute name="basedir" default="${build.dir}/classes/java"/>
+ <attribute name="destfile" default="${build.dir}/${final.name}.jar"/>
+ <attribute name="title" default="Lucene Search Engine: ${ant.project.name}"/>
<attribute name="excludes" default="**/pom.xml,**/*.iml"/>
<attribute name="metainf.source.dir" default="${common.dir}"/>
<attribute name="implementation.title" default="org.apache.lucene"/>
@@ -703,7 +703,7 @@
<jarify-additional-manifest-attributes />
</additional-manifest-attributes>
</build-manifest>
-
+
<jar destfile="@{destfile}"
basedir="@{basedir}"
manifest="@{manifest.file}"
@@ -721,7 +721,7 @@
<attribute name="module-src-name" default="@{name}"/>
<sequential>
<uptodate property="@{property}" targetfile="@{jarfile}">
- <srcfiles dir="${common.dir}/@{module-src-name}/src/java" includes="**/*.java"/>
+ <srcfiles dir="${common.dir}/@{module-src-name}/src/java" includes="**/*.java"/>
</uptodate>
</sequential>
</macrodef>
@@ -729,7 +729,7 @@
<property name="lucene-core.jar" value="${common.dir}/build/core/lucene-core-${version}.jar"/>
<target name="check-lucene-core-uptodate" unless="lucene-core.uptodate">
<uptodate property="lucene-core.uptodate" targetfile="${lucene-core.jar}">
- <srcfiles dir="${common.dir}/core/src/java" includes="**/*.java"/>
+ <srcfiles dir="${common.dir}/core/src/java" includes="**/*.java"/>
</uptodate>
</target>
<target name="jar-lucene-core" unless="lucene-core.uptodate" depends="check-lucene-core-uptodate">
@@ -812,12 +812,12 @@
</target>
<macrodef name="compile-test-macro" description="Compiles junit tests.">
- <attribute name="srcdir"/>
- <attribute name="destdir"/>
- <attribute name="test.classpath"/>
+ <attribute name="srcdir"/>
+ <attribute name="destdir"/>
+ <attribute name="test.classpath"/>
<attribute name="javac.source" default="${javac.source}"/>
<attribute name="javac.target" default="${javac.target}"/>
- <sequential>
+ <sequential>
<compile
srcdir="@{srcdir}"
destdir="@{destdir}"
@@ -830,7 +830,7 @@
<copy todir="@{destdir}">
<fileset dir="@{srcdir}" excludes="**/*.java"/>
</copy>
- </sequential>
+ </sequential>
</macrodef>
<target name="test-updatecache" description="Overwrite tests' timings cache for balancing." depends="install-junit4-taskdef">
@@ -1646,7 +1646,7 @@ ${tests-output}/junit4-*.suites - pe
<!-- TODO, this is really unintuitive how we depend on a target that does not exist -->
<target name="javadocs">
- <fail message="You must redefine the javadocs task to do something!!!!!"/>
+ <fail message="You must redefine the javadocs task to do something!!!!!"/>
</target>
<target name="install-maven-tasks" unless="maven-tasks.uptodate" depends="ivy-availability-check,ivy-configure">
@@ -1841,7 +1841,7 @@ ${ant.project.name}.test.dependencies=${
</target>
<target name="rat-sources" depends="rat-sources-typedef"
- description="runs the tasks over source and test files">
+ description="runs the tasks over source and test files">
<!-- create a temp file for the log to go to -->
<tempfile property="rat.sources.logfile"
prefix="rat"
@@ -2075,7 +2075,7 @@ ${ant.project.name}.test.dependencies=${
<macrodef name="invoke-javadoc">
<element name="sources" optional="yes"/>
<attribute name="destdir"/>
- <attribute name="title" default="${Name} ${version} API"/>
+ <attribute name="title" default="${Name} ${version} API"/>
<attribute name="overview" default="${src.dir}/overview.html"/>
<attribute name="linksource" default="no"/>
<sequential>
@@ -2108,7 +2108,7 @@ ${ant.project.name}.test.dependencies=${
description="WARNING: This API is experimental and might change in incompatible ways in the next release."/>
<tag name="lucene.internal"
description="NOTE: This API is for internal purposes only and might change in incompatible ways in the next release."/>
- <link offline="true" packagelistLoc="${javadoc.dir}"/>
+ <link offline="true" packagelistLoc="${javadoc.dir}"/>
<link offline="true" href="${javadoc.link}" packagelistLoc="${javadoc.packagelist.dir}/java7"/>
<bottom><![CDATA[
<i>Copyright © ${year} Apache Software Foundation. All Rights Reserved.</i>
@@ -2127,9 +2127,9 @@ ${ant.project.name}.test.dependencies=${
})();
</script>
]]></bottom>
-
- <sources />
-
+
+ <sources />
+
<classpath refid="javadoc.classpath"/>
<arg line="${-javadoc.doclint.args}"/>
</javadoc>
@@ -2515,7 +2515,7 @@ ${ant.project.name}.test.dependencies=${
public final class PegDownFilter extends ChainableReaderFilter {
@Override
- public String filter(String markdownSource) {
+ public String filter(String markdownSource) {
PegDownProcessor processor = new PegDownProcessor(
Extensions.ABBREVIATIONS | Extensions.AUTOLINKS |
Extensions.FENCED_CODE_BLOCKS | Extensions.SMARTS
@@ -2565,13 +2565,13 @@ ${ant.project.name}.test.dependencies=${
</macrodef>
<target name="regenerate"/>
-
+
<macrodef name="check-broken-links">
<attribute name="dir"/>
<sequential>
<exec dir="." executable="${python32.exe}" failonerror="true">
- <!-- Tell Python not to write any bytecode cache into the filesystem: -->
- <arg value="-B"/>
+ <!-- Tell Python not to write any bytecode cache into the filesystem: -->
+ <arg value="-B"/>
<arg value="${dev-tools.dir}/scripts/checkJavadocLinks.py"/>
<arg value="@{dir}"/>
</exec>
@@ -2583,8 +2583,8 @@ ${ant.project.name}.test.dependencies=${
<attribute name="level" default="class"/>
<sequential>
<exec dir="." executable="${python32.exe}" failonerror="true">
- <!-- Tell Python not to write any bytecode cache into the filesystem: -->
- <arg value="-B"/>
+ <!-- Tell Python not to write any bytecode cache into the filesystem: -->
+ <arg value="-B"/>
<arg value="${dev-tools.dir}/scripts/checkJavaDocs.py"/>
<arg value="@{dir}"/>
<arg value="@{level}"/>
Modified: lucene/dev/branches/branch_5x/lucene/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/build.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/core/build.xml Tue Aug 11 23:08:41 2015
@@ -63,20 +63,20 @@
<target name="-dist-maven" depends="-dist-maven-src-java"/>
<macrodef name="createLevAutomaton">
- <attribute name="n"/>
- <sequential>
+ <attribute name="n"/>
+ <sequential>
<exec dir="src/java/org/apache/lucene/util/automaton"
executable="${python.exe}" failonerror="true">
- <!-- Tell Python not to write any bytecode cache into the filesystem: -->
- <arg value="-B"/>
+ <!-- Tell Python not to write any bytecode cache into the filesystem: -->
+ <arg value="-B"/>
<arg value="createLevAutomata.py"/>
<arg value="@{n}"/>
<arg value="True"/>
</exec>
<exec dir="src/java/org/apache/lucene/util/automaton"
executable="${python.exe}" failonerror="true">
- <!-- Tell Python not to write any bytecode cache into the filesystem: -->
- <arg value="-B"/>
+ <!-- Tell Python not to write any bytecode cache into the filesystem: -->
+ <arg value="-B"/>
<arg value="createLevAutomata.py"/>
<arg value="@{n}"/>
<arg value="False"/>
Modified: lucene/dev/branches/branch_5x/lucene/demo/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/demo/build.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/demo/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/demo/build.xml Tue Aug 11 23:08:41 2015
@@ -47,9 +47,9 @@
<links>
<link href="../analyzers-common"/>
<link href="../queryparser"/>
- <link href="../queries"/>
- <link href="../facet"/>
- <link href="../expressions"/>
+ <link href="../queries"/>
+ <link href="../facet"/>
+ <link href="../expressions"/>
</links>
</invoke-module-javadoc>
</target>
Modified: lucene/dev/branches/branch_5x/lucene/demo/src/resources/org/apache/lucene/demo/xmlparser/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/demo/src/resources/org/apache/lucene/demo/xmlparser/WEB-INF/web.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/demo/src/resources/org/apache/lucene/demo/xmlparser/WEB-INF/web.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/demo/src/resources/org/apache/lucene/demo/xmlparser/WEB-INF/web.xml Tue Aug 11 23:08:41 2015
@@ -16,34 +16,34 @@
limitations under the License.
-->
<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>
- LuceneXmlQueryWebDemo</display-name>
- <servlet>
- <description>
- Servlet demonstrating XMLQueryParser</description>
- <display-name>
- FormBasedXmlQueryDemo</display-name>
- <servlet-name>FormBasedXmlQueryDemo</servlet-name>
- <servlet-class>
- org.apache.lucene.xmlparser.webdemo.FormBasedXmlQueryDemo</servlet-class>
- <init-param>
- <description>
- Name of query file held in /WEB-INF</description>
- <param-name>xslFile</param-name>
- <param-value>query.xsl</param-value>
- </init-param>
- <init-param>
- <description>
- Default field used in standard Lucene QueryParser used in UserQuery tag</description>
- <param-name>defaultStandardQueryParserField</param-name>
- <param-value>jobDescription</param-value>
- </init-param>
- </servlet>
- <servlet-mapping>
- <servlet-name>FormBasedXmlQueryDemo</servlet-name>
- <url-pattern>/FormBasedXmlQueryDemo</url-pattern>
- </servlet-mapping>
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
+ <display-name>
+ LuceneXmlQueryWebDemo</display-name>
+ <servlet>
+ <description>
+ Servlet demonstrating XMLQueryParser</description>
+ <display-name>
+ FormBasedXmlQueryDemo</display-name>
+ <servlet-name>FormBasedXmlQueryDemo</servlet-name>
+ <servlet-class>
+ org.apache.lucene.xmlparser.webdemo.FormBasedXmlQueryDemo</servlet-class>
+ <init-param>
+ <description>
+ Name of query file held in /WEB-INF</description>
+ <param-name>xslFile</param-name>
+ <param-value>query.xsl</param-value>
+ </init-param>
+ <init-param>
+ <description>
+ Default field used in standard Lucene QueryParser used in UserQuery tag</description>
+ <param-name>defaultStandardQueryParserField</param-name>
+ <param-value>jobDescription</param-value>
+ </init-param>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>FormBasedXmlQueryDemo</servlet-name>
+ <url-pattern>/FormBasedXmlQueryDemo</url-pattern>
+ </servlet-mapping>
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
</web-app>
Modified: lucene/dev/branches/branch_5x/lucene/module-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/module-build.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/module-build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/module-build.xml Tue Aug 11 23:08:41 2015
@@ -63,7 +63,7 @@
<target name="javadocs" depends="compile-core,javadocs-lucene-core,check-javadocs-uptodate"
unless="javadocs-uptodate-${name}">
<invoke-module-javadoc/>
- </target>
+ </target>
<macrodef name="invoke-module-javadoc">
<!-- additional links for dependencies to other modules -->
@@ -74,7 +74,7 @@
<mkdir dir="${javadoc.dir}/${name}"/>
<invoke-javadoc
destdir="${javadoc.dir}/${name}"
- title="${Name} ${version} ${name} API"
+ title="${Name} ${version} ${name} API"
linksource="@{linksource}">
<sources>
<link href="../core/"/>
@@ -130,7 +130,7 @@
</ant>
<property name="queryparser-javadocs.uptodate" value="true"/>
</target>
-
+
<property name="join.jar" value="${common.dir}/build/join/lucene-join-${version}.jar"/>
<target name="check-join-uptodate" unless="join.uptodate">
<module-uptodate name="join" jarfile="${join.jar}" property="join.uptodate"/>
@@ -138,9 +138,9 @@
<target name="jar-join" unless="join.uptodate" depends="check-join-uptodate">
<ant dir="${common.dir}/join" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- <property name="join.uptodate" value="true"/>
- </target>
+ </ant>
+ <property name="join.uptodate" value="true"/>
+ </target>
<property name="join-javadoc.jar" value="${common.dir}/build/join/lucene-join-${version}-javadoc.jar"/>
<target name="check-join-javadocs-uptodate" unless="join-javadocs.uptodate">
@@ -180,7 +180,7 @@
<module-uptodate name="queries" jarfile="${queries.jar}" property="queries.uptodate"/>
</target>
<target name="jar-queries" unless="queries.uptodate" depends="check-queries-uptodate">
- <ant dir="${common.dir}/queries" target="jar-core" inheritAll="false">
+ <ant dir="${common.dir}/queries" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="queries.uptodate" value="true"/>
@@ -268,7 +268,7 @@
<module-uptodate name="analysis/icu" jarfile="${analyzers-icu.jar}" property="analyzers-icu.uptodate"/>
</target>
<target name="jar-analyzers-icu" unless="analyzers-icu.uptodate" depends="check-analyzers-icu-uptodate">
- <ant dir="${common.dir}/analysis/icu" target="jar-core" inheritAll="false">
+ <ant dir="${common.dir}/analysis/icu" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="analyzers-icu.uptodate" value="true"/>
@@ -290,7 +290,7 @@
<module-uptodate name="analysis/phonetic" jarfile="${analyzers-phonetic.jar}" property="analyzers-phonetic.uptodate"/>
</target>
<target name="jar-analyzers-phonetic" unless="analyzers-phonetic.uptodate" depends="check-analyzers-phonetic-uptodate">
- <ant dir="${common.dir}/analysis/phonetic" target="jar-core" inheritAll="false">
+ <ant dir="${common.dir}/analysis/phonetic" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
</target>
@@ -311,7 +311,7 @@
<module-uptodate name="analysis/smartcn" jarfile="${analyzers-smartcn.jar}" property="analyzers-smartcn.uptodate"/>
</target>
<target name="jar-analyzers-smartcn" unless="analyzers-smartcn.uptodate" depends="check-analyzers-smartcn-uptodate">
- <ant dir="${common.dir}/analysis/smartcn" target="jar-core" inheritAll="false">
+ <ant dir="${common.dir}/analysis/smartcn" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="analyzers-smartcn.uptodate" value="true"/>
@@ -333,7 +333,7 @@
<module-uptodate name="analysis/stempel" jarfile="${analyzers-stempel.jar}" property="analyzers-stempel.uptodate"/>
</target>
<target name="jar-analyzers-stempel" unless="analyzers-stempel.uptodate" depends="check-analyzers-stempel-uptodate">
- <ant dir="${common.dir}/analysis/stempel" target="jar-core" inheritAll="false">
+ <ant dir="${common.dir}/analysis/stempel" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="analyzers-stempel.uptodate" value="true"/>
@@ -355,7 +355,7 @@
<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}/analysis/kuromoji" target="jar-core" inheritAll="false">
+ <ant dir="${common.dir}/analysis/kuromoji" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="analyzers-kuromoji.uptodate" value="true"/>
@@ -491,7 +491,7 @@
<module-uptodate name="grouping" jarfile="${grouping.jar}" property="grouping.uptodate"/>
</target>
<target name="jar-grouping" unless="grouping.uptodate" depends="check-grouping-uptodate">
- <ant dir="${common.dir}/grouping" target="jar-core" inheritAll="false">
+ <ant dir="${common.dir}/grouping" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="grouping.uptodate" value="true"/>
@@ -557,7 +557,7 @@
<module-uptodate name="misc" jarfile="${misc.jar}" property="misc.uptodate"/>
</target>
<target name="jar-misc" unless="misc.uptodate" depends="check-misc-uptodate">
- <ant dir="${common.dir}/misc" target="jar-core" inheritAll="false">
+ <ant dir="${common.dir}/misc" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="misc.uptodate" value="true"/>
@@ -579,7 +579,7 @@
<module-uptodate name="sandbox" jarfile="${sandbox.jar}" property="sandbox.uptodate"/>
</target>
<target name="jar-sandbox" unless="sandbox.uptodate" depends="check-sandbox-uptodate">
- <ant dir="${common.dir}/sandbox" target="jar-core" inheritAll="false">
+ <ant dir="${common.dir}/sandbox" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="sandbox.uptodate" value="true"/>
@@ -601,7 +601,7 @@
<module-uptodate name="spatial3d" jarfile="${spatial3d.jar}" property="spatial3d.uptodate"/>
</target>
<target name="jar-spatial3d" unless="spatial3d.uptodate" depends="check-spatial3d-uptodate">
- <ant dir="${common.dir}/spatial3d" target="jar-core" inheritAll="false">
+ <ant dir="${common.dir}/spatial3d" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="spatial3d.uptodate" value="true"/>
@@ -623,7 +623,7 @@
<module-uptodate name="spatial" jarfile="${spatial.jar}" property="spatial.uptodate"/>
</target>
<target name="jar-spatial" unless="spatial.uptodate" depends="check-spatial-uptodate">
- <ant dir="${common.dir}/spatial" target="jar-core" inheritAll="false">
+ <ant dir="${common.dir}/spatial" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="spatial.uptodate" value="true"/>
@@ -645,7 +645,7 @@
<module-uptodate name="suggest" jarfile="${suggest.jar}" property="suggest.uptodate"/>
</target>
<target name="jar-suggest" unless="suggest.uptodate" depends="check-suggest-uptodate">
- <ant dir="${common.dir}/suggest" target="jar-core" inheritAll="false">
+ <ant dir="${common.dir}/suggest" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="suggest.uptodate" value="true"/>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/build.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/build.xml Tue Aug 11 23:08:41 2015
@@ -63,19 +63,19 @@
<!-- Change the incorrect public ctors for QueryParser to be protected instead -->
<replaceregexp file="src/java/org/apache/lucene/queryparser/classic/QueryParser.java"
- byline="true"
- match="public QueryParser\(CharStream "
- replace="protected QueryParser(CharStream "/>
+ byline="true"
+ match="public QueryParser\(CharStream "
+ replace="protected QueryParser(CharStream "/>
<replaceregexp file="src/java/org/apache/lucene/queryparser/classic/QueryParser.java"
- byline="true"
- match="public QueryParser\(QueryParserTokenManager "
- replace="protected QueryParser(QueryParserTokenManager "/>
+ byline="true"
+ match="public QueryParser\(QueryParserTokenManager "
+ replace="protected QueryParser(QueryParserTokenManager "/>
<generalReplaces dir="src/java/org/apache/lucene/queryparser/classic"/>
</sequential>
</target>
<target name="javacc-surround" depends="resolve-javacc" description="generate surround query parser">
- <invoke-javacc target="src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj"
+ <invoke-javacc target="src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj"
outputDir="src/java/org/apache/lucene/queryparser/surround/parser"
/>
<generalReplaces dir="src/java/org/apache/lucene/queryparser/surround/parser"/>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanFilter.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanFilter.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanFilter.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanFilter.xml Tue Aug 11 23:08:41 2015
@@ -16,26 +16,26 @@
limitations under the License.
-->
<FilteredQuery>
- <Query>
- <MatchAllDocsQuery/>
- </Query>
-
- <Filter>
- <!--
- This query illustrates how a BooleanFilter can be used to combine
- multiple filters in the same way BooleanQueries can be combined
- with must, should and mustnot clauses
- -->
- <BooleanFilter>
- <Clause occurs="should">
- <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
- </Clause>
- <Clause occurs="mustNot">
- <TermsFilter fieldName="contents">Emcore</TermsFilter>
- </Clause>
- </BooleanFilter>
-
- </Filter>
-
+ <Query>
+ <MatchAllDocsQuery/>
+ </Query>
+
+ <Filter>
+ <!--
+ This query illustrates how a BooleanFilter can be used to combine
+ multiple filters in the same way BooleanQueries can be combined
+ with must, should and mustnot clauses
+ -->
+ <BooleanFilter>
+ <Clause occurs="should">
+ <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
+ </Clause>
+ <Clause occurs="mustNot">
+ <TermsFilter fieldName="contents">Emcore</TermsFilter>
+ </Clause>
+ </BooleanFilter>
+
+ </Filter>
+
</FilteredQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanQuery.xml Tue Aug 11 23:08:41 2015
@@ -16,13 +16,13 @@
limitations under the License.
-->
<BooleanQuery fieldName="contents">
- <Clause occurs="should">
- <TermQuery>merger</TermQuery>
- </Clause>
- <Clause occurs="mustnot">
- <TermQuery>sumitomo</TermQuery>
- </Clause>
- <Clause occurs="must">
- <TermQuery>bank</TermQuery>
- </Clause>
+ <Clause occurs="should">
+ <TermQuery>merger</TermQuery>
+ </Clause>
+ <Clause occurs="mustnot">
+ <TermQuery>sumitomo</TermQuery>
+ </Clause>
+ <Clause occurs="must">
+ <TermQuery>bank</TermQuery>
+ </Clause>
</BooleanQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingQuery.xml Tue Aug 11 23:08:41 2015
@@ -16,18 +16,18 @@
limitations under the License.
-->
<BoostingQuery>
- <!-- Find docs about banks, preferably merger info and preferably not "World bank" -->
- <Query>
- <BooleanQuery fieldName="contents">
- <Clause occurs="should">
- <TermQuery>merger</TermQuery>
- </Clause>
- <Clause occurs="must">
- <TermQuery>bank</TermQuery>
- </Clause>
- </BooleanQuery>
- </Query>
- <BoostQuery boost="0.01">
- <UserQuery>"world bank"</UserQuery>
- </BoostQuery>
+ <!-- Find docs about banks, preferably merger info and preferably not "World bank" -->
+ <Query>
+ <BooleanQuery fieldName="contents">
+ <Clause occurs="should">
+ <TermQuery>merger</TermQuery>
+ </Clause>
+ <Clause occurs="must">
+ <TermQuery>bank</TermQuery>
+ </Clause>
+ </BooleanQuery>
+ </Query>
+ <BoostQuery boost="0.01">
+ <UserQuery>"world bank"</UserQuery>
+ </BoostQuery>
</BoostingQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/CachedFilter.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/CachedFilter.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/CachedFilter.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/CachedFilter.xml Tue Aug 11 23:08:41 2015
@@ -16,42 +16,42 @@
limitations under the License.
-->
<FilteredQuery>
- <Query>
- <BooleanQuery fieldName="contents">
- <Clause occurs="should">
- <TermQuery>merger</TermQuery>
- </Clause>
- <Clause occurs="mustnot">
- <TermQuery >sumitomo</TermQuery>
- </Clause>
- </BooleanQuery>
- </Query>
-
- <Filter>
- <!--
- CachedFilter elements can contain any Query or Filter.
- CachedFilters are cached in an LRU Cache keyed on the contained query/filter object.
- Using this will speed up overall performance for repeated uses of the same expensive
- query/filter. The sorts of queries likely to benefit from caching need not necessarily be
- complex - e.g. simple TermQuerys with a large DF (document frequency) can be expensive
- on large indexes. A good example of this might be a term query on a field with only 2 possible
- values - "true" or "false". In a large index, querying or filtering on this field requires
- reading millions of document ids from disk which can more usefully be cached as a
- QueryFilter bitset.
-
- For Queries/Filters to be cached and reused the object must implement hashcode and
- equals methods correctly so that duplicate queries/filters can be detected in the cache.
-
- The CoreParser.maxNumCachedFilters property can be used to control the size
- of the LRU Cache established during the construction of CoreParser instances.
- -->
- <CachedFilter>
- <!-- Example query to be cached for fast, repeated use -->
- <TermQuery fieldName="contents">bank</TermQuery>
- <!-- Alternatively, a filter object can be cached ....
- <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
- -->
- </CachedFilter>
- </Filter>
-
+ <Query>
+ <BooleanQuery fieldName="contents">
+ <Clause occurs="should">
+ <TermQuery>merger</TermQuery>
+ </Clause>
+ <Clause occurs="mustnot">
+ <TermQuery >sumitomo</TermQuery>
+ </Clause>
+ </BooleanQuery>
+ </Query>
+
+ <Filter>
+ <!--
+ CachedFilter elements can contain any Query or Filter.
+ CachedFilters are cached in an LRU Cache keyed on the contained query/filter object.
+ Using this will speed up overall performance for repeated uses of the same expensive
+ query/filter. The sorts of queries likely to benefit from caching need not necessarily be
+ complex - e.g. simple TermQuerys with a large DF (document frequency) can be expensive
+ on large indexes. A good example of this might be a term query on a field with only 2 possible
+ values - "true" or "false". In a large index, querying or filtering on this field requires
+ reading millions of document ids from disk which can more usefully be cached as a
+ QueryFilter bitset.
+
+ For Queries/Filters to be cached and reused the object must implement hashcode and
+ equals methods correctly so that duplicate queries/filters can be detected in the cache.
+
+ The CoreParser.maxNumCachedFilters property can be used to control the size
+ of the LRU Cache established during the construction of CoreParser instances.
+ -->
+ <CachedFilter>
+ <!-- Example query to be cached for fast, repeated use -->
+ <TermQuery fieldName="contents">bank</TermQuery>
+ <!-- Alternatively, a filter object can be cached ....
+ <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
+ -->
+ </CachedFilter>
+ </Filter>
+
</FilteredQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/ConstantScoreQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/ConstantScoreQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/ConstantScoreQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/ConstantScoreQuery.xml Tue Aug 11 23:08:41 2015
@@ -16,5 +16,5 @@
limitations under the License.
-->
<ConstantScoreQuery>
- <RangeQuery fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
+ <RangeQuery fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
</ConstantScoreQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DisjunctionMaxQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DisjunctionMaxQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DisjunctionMaxQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DisjunctionMaxQuery.xml Tue Aug 11 23:08:41 2015
@@ -17,8 +17,8 @@
-->
<DisjunctionMaxQuery>
- <TermQuery fieldName="a">merger</TermQuery>
- <DisjunctionMaxQuery tieBreaker="1.2">
- <TermQuery fieldName="b">verger</TermQuery>
- </DisjunctionMaxQuery>
+ <TermQuery fieldName="a">merger</TermQuery>
+ <DisjunctionMaxQuery tieBreaker="1.2">
+ <TermQuery fieldName="b">verger</TermQuery>
+ </DisjunctionMaxQuery>
</DisjunctionMaxQuery>
\ No newline at end of file
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DuplicateFilterQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DuplicateFilterQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DuplicateFilterQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DuplicateFilterQuery.xml Tue Aug 11 23:08:41 2015
@@ -16,19 +16,19 @@
limitations under the License.
-->
<FilteredQuery>
- <Query>
- <BooleanQuery fieldName="contents">
- <Clause occurs="should">
- <TermQuery>money</TermQuery>
- </Clause>
- <Clause occurs="must">
- <TermQuery fieldName="date">19870408</TermQuery>
- </Clause>
- </BooleanQuery>
- </Query>
- <Filter>
- <!-- Filters to last document with this date -->
- <DuplicateFilter fieldName="date" keepMode="last"/>
- </Filter>
-
+ <Query>
+ <BooleanQuery fieldName="contents">
+ <Clause occurs="should">
+ <TermQuery>money</TermQuery>
+ </Clause>
+ <Clause occurs="must">
+ <TermQuery fieldName="date">19870408</TermQuery>
+ </Clause>
+ </BooleanQuery>
+ </Query>
+ <Filter>
+ <!-- Filters to last document with this date -->
+ <DuplicateFilter fieldName="date" keepMode="last"/>
+ </Filter>
+
</FilteredQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/FuzzyLikeThisQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/FuzzyLikeThisQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/FuzzyLikeThisQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/FuzzyLikeThisQuery.xml Tue Aug 11 23:08:41 2015
@@ -16,8 +16,8 @@
limitations under the License.
-->
<FuzzyLikeThisQuery>
- <!-- Matches on misspelt "Sumitomo" bank -->
- <Field fieldName="contents">
- Sumitimo bank
- </Field>
+ <!-- Matches on misspelt "Sumitomo" bank -->
+ <Field fieldName="contents">
+ Sumitimo bank
+ </Field>
</FuzzyLikeThisQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/LikeThisQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/LikeThisQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/LikeThisQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/LikeThisQuery.xml Tue Aug 11 23:08:41 2015
@@ -17,17 +17,17 @@
-->
<LikeThisQuery percentTermsToMatch="5" stopWords="Reuter" minDocFreq="2">
IRAQI TROOPS REPORTED PUSHING BACK IRANIANS Iraq said today its troops were pushing Iranian forces out of
- positions they had initially occupied when they launched a new offensive near the southern port of
- Basra early yesterday. A High Command communique said Iraqi troops had won a significant victory
- and were continuing to advance. Iraq said it had foiled a three-pronged thrust some 10 km
- (six miles) from Basra, but admitted the Iranians had occupied ground held by the Mohammed al-Qassem
- unit, one of three divisions attacked. The communique said Iranian Revolutionary Guards were under
- assault from warplanes, helicopter gunships, heavy artillery and tanks. "Our forces are continuing
- their advance until they purge the last foothold" occupied by the Iranians, it said.
- (Iran said its troops had killed or wounded more than 4,000 Iraqis and were stabilising their new positions.)
- The Baghdad communique said Iraqi planes also destroyed oil installations at Iran's southwestern Ahvaz field
- during a raid today. It denied an Iranian report that an Iraqi jet was shot down.
- Iraq also reported a naval battle at the northern tip of the Gulf. Iraqi naval units and forces defending an
- offshore terminal sank six Iranian out of 28 Iranian boats attempting to attack an offshore terminal,
- the communique said. Reuter 3;
+ positions they had initially occupied when they launched a new offensive near the southern port of
+ Basra early yesterday. A High Command communique said Iraqi troops had won a significant victory
+ and were continuing to advance. Iraq said it had foiled a three-pronged thrust some 10 km
+ (six miles) from Basra, but admitted the Iranians had occupied ground held by the Mohammed al-Qassem
+ unit, one of three divisions attacked. The communique said Iranian Revolutionary Guards were under
+ assault from warplanes, helicopter gunships, heavy artillery and tanks. "Our forces are continuing
+ their advance until they purge the last foothold" occupied by the Iranians, it said.
+ (Iran said its troops had killed or wounded more than 4,000 Iraqis and were stabilising their new positions.)
+ The Baghdad communique said Iraqi planes also destroyed oil installations at Iran's southwestern Ahvaz field
+ during a raid today. It denied an Iranian report that an Iraqi jet was shot down.
+ Iraq also reported a naval battle at the northern tip of the Gulf. Iraqi naval units and forces defending an
+ offshore terminal sank six Iranian out of 28 Iranian boats attempting to attack an offshore terminal,
+ the communique said. Reuter 3;
</LikeThisQuery>
\ No newline at end of file
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/MatchAllDocsQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/MatchAllDocsQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/MatchAllDocsQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/MatchAllDocsQuery.xml Tue Aug 11 23:08:41 2015
@@ -16,10 +16,10 @@
limitations under the License.
-->
<BooleanQuery>
- <Clause occurs="must">
- <MatchAllDocsQuery/>
- </Clause>
- <Clause occurs="filter">
- <RangeQuery fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
- </Clause>
+ <Clause occurs="must">
+ <MatchAllDocsQuery/>
+ </Clause>
+ <Clause occurs="filter">
+ <RangeQuery fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
+ </Clause>
</BooleanQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NestedBooleanQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NestedBooleanQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NestedBooleanQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NestedBooleanQuery.xml Tue Aug 11 23:08:41 2015
@@ -16,21 +16,21 @@
limitations under the License.
-->
<!--
- This query was added to demonstrate nested boolean queries - there
- was a bug in the XML parser which added ALL child <Clause> tags to
- the top level tags ie. took child and grandchild elements instead
- of just child elements. This was due to the use of the
- Element.getElementsByTagName() call in BooleanQueryBuilder
--->
-<BooleanQuery fieldName="contents">
- <Clause occurs="should">
- <BooleanQuery fieldName="contents">
- <Clause occurs="must">
- <TermQuery>doesNotExistButShouldBeOKBecauseOtherClauseExists</TermQuery>
- </Clause>
- </BooleanQuery>
- </Clause>
- <Clause occurs="should">
- <TermQuery>bank</TermQuery>
- </Clause>
+ This query was added to demonstrate nested boolean queries - there
+ was a bug in the XML parser which added ALL child <Clause> tags to
+ the top level tags ie. took child and grandchild elements instead
+ of just child elements. This was due to the use of the
+ Element.getElementsByTagName() call in BooleanQueryBuilder
+-->
+<BooleanQuery fieldName="contents">
+ <Clause occurs="should">
+ <BooleanQuery fieldName="contents">
+ <Clause occurs="must">
+ <TermQuery>doesNotExistButShouldBeOKBecauseOtherClauseExists</TermQuery>
+ </Clause>
+ </BooleanQuery>
+ </Clause>
+ <Clause occurs="should">
+ <TermQuery>bank</TermQuery>
+ </Clause>
</BooleanQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NumericRangeFilterQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NumericRangeFilterQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NumericRangeFilterQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NumericRangeFilterQuery.xml Tue Aug 11 23:08:41 2015
@@ -16,22 +16,22 @@
limitations under the License.
-->
<FilteredQuery>
- <Query>
- <BooleanQuery fieldName="contents">
- <Clause occurs="should">
- <TermQuery>merger</TermQuery>
- </Clause>
- <Clause occurs="mustnot">
- <TermQuery >sumitomo</TermQuery>
- </Clause>
- <Clause occurs="must">
- <TermQuery>bank</TermQuery>
- </Clause>
- </BooleanQuery>
- </Query>
-
- <Filter>
- <NumericRangeFilter fieldName="date2" lowerTerm="19870409" upperTerm="19870412"/>
- </Filter>
-
+ <Query>
+ <BooleanQuery fieldName="contents">
+ <Clause occurs="should">
+ <TermQuery>merger</TermQuery>
+ </Clause>
+ <Clause occurs="mustnot">
+ <TermQuery >sumitomo</TermQuery>
+ </Clause>
+ <Clause occurs="must">
+ <TermQuery>bank</TermQuery>
+ </Clause>
+ </BooleanQuery>
+ </Query>
+
+ <Filter>
+ <NumericRangeFilter fieldName="date2" lowerTerm="19870409" upperTerm="19870412"/>
+ </Filter>
+
</FilteredQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NumericRangeQueryQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NumericRangeQueryQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NumericRangeQueryQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NumericRangeQueryQuery.xml Tue Aug 11 23:08:41 2015
@@ -16,16 +16,16 @@
limitations under the License.
-->
<BooleanQuery fieldName="contents">
- <Clause occurs="should">
- <TermQuery>merger</TermQuery>
- </Clause>
- <Clause occurs="mustnot">
- <TermQuery >sumitomo</TermQuery>
- </Clause>
- <Clause occurs="must">
- <TermQuery>bank</TermQuery>
- </Clause>
- <Clause occurs="must">
- <NumericRangeQuery fieldName="date2" lowerTerm="19870409" upperTerm="19870412"/>
- </Clause>
+ <Clause occurs="should">
+ <TermQuery>merger</TermQuery>
+ </Clause>
+ <Clause occurs="mustnot">
+ <TermQuery >sumitomo</TermQuery>
+ </Clause>
+ <Clause occurs="must">
+ <TermQuery>bank</TermQuery>
+ </Clause>
+ <Clause occurs="must">
+ <NumericRangeQuery fieldName="date2" lowerTerm="19870409" upperTerm="19870412"/>
+ </Clause>
</BooleanQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/RangeFilterQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/RangeFilterQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/RangeFilterQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/RangeFilterQuery.xml Tue Aug 11 23:08:41 2015
@@ -16,22 +16,22 @@
limitations under the License.
-->
<FilteredQuery>
- <Query>
- <BooleanQuery fieldName="contents">
- <Clause occurs="should">
- <TermQuery>merger</TermQuery>
- </Clause>
- <Clause occurs="mustnot">
- <TermQuery >sumitomo</TermQuery>
- </Clause>
- <Clause occurs="must">
- <TermQuery>bank</TermQuery>
- </Clause>
- </BooleanQuery>
- </Query>
-
- <Filter>
- <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
- </Filter>
-
+ <Query>
+ <BooleanQuery fieldName="contents">
+ <Clause occurs="should">
+ <TermQuery>merger</TermQuery>
+ </Clause>
+ <Clause occurs="mustnot">
+ <TermQuery >sumitomo</TermQuery>
+ </Clause>
+ <Clause occurs="must">
+ <TermQuery>bank</TermQuery>
+ </Clause>
+ </BooleanQuery>
+ </Query>
+
+ <Filter>
+ <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
+ </Filter>
+
</FilteredQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanQuery.xml Tue Aug 11 23:08:41 2015
@@ -16,40 +16,40 @@
limitations under the License.
-->
<SpanOr fieldName="contents">
- <SpanNear slop="8" inOrder="false" >
- <SpanOr>
- <SpanTerm>killed</SpanTerm>
- <SpanTerm>died</SpanTerm>
- <SpanTerm>dead</SpanTerm>
- </SpanOr>
- <SpanOr>
- <!-- a less verbose way of declaring SpanTerm declarations - these are analyzed
- into a series of Tokens which are added as SpanTerm elements of a SpanOr
- -->
- <SpanOrTerms>miner miners</SpanOrTerms>
- <!-- finds mine near worker or workers -->
- <SpanNear slop="6" inOrder="false">
- <SpanTerm>mine</SpanTerm>
- <SpanOrTerms>worker workers</SpanOrTerms>
+ <SpanNear slop="8" inOrder="false" >
+ <SpanOr>
+ <SpanTerm>killed</SpanTerm>
+ <SpanTerm>died</SpanTerm>
+ <SpanTerm>dead</SpanTerm>
+ </SpanOr>
+ <SpanOr>
+ <!-- a less verbose way of declaring SpanTerm declarations - these are analyzed
+ into a series of Tokens which are added as SpanTerm elements of a SpanOr
+ -->
+ <SpanOrTerms>miner miners</SpanOrTerms>
+ <!-- finds mine near worker or workers -->
+ <SpanNear slop="6" inOrder="false">
+ <SpanTerm>mine</SpanTerm>
+ <SpanOrTerms>worker workers</SpanOrTerms>
<BoostingTermQuery>heavy</BoostingTermQuery>
</SpanNear>
- </SpanOr>
- </SpanNear>
- <SpanFirst end="10">
- <SpanOrTerms>fire burn</SpanOrTerms>
- </SpanFirst>
- <!-- Other Span examples....
-
- <SpanNot>
- <Include>
- <SpanNear slop="2" inOrder="2">
- <SpanTerm>social</SpanTerm>
- <SpanTerm>services</SpanTerm>
- </SpanNear>
- </Include>
- <Exclude>
- <SpanTerm>public</SpanTerm>
- </Exclude>
- </SpanNot>
- -->
+ </SpanOr>
+ </SpanNear>
+ <SpanFirst end="10">
+ <SpanOrTerms>fire burn</SpanOrTerms>
+ </SpanFirst>
+ <!-- Other Span examples....
+
+ <SpanNot>
+ <Include>
+ <SpanNear slop="2" inOrder="2">
+ <SpanTerm>social</SpanTerm>
+ <SpanTerm>services</SpanTerm>
+ </SpanNear>
+ </Include>
+ <Exclude>
+ <SpanTerm>public</SpanTerm>
+ </Exclude>
+ </SpanNot>
+ -->
</SpanOr>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsFilterQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsFilterQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsFilterQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsFilterQuery.xml Tue Aug 11 23:08:41 2015
@@ -16,31 +16,31 @@
limitations under the License.
-->
<FilteredQuery>
- <Query>
- <BooleanQuery fieldName="contents">
- <Clause occurs="should">
- <TermQuery>merger</TermQuery>
- </Clause>
- <Clause occurs="must">
- <TermQuery>bank</TermQuery>
- </Clause>
- </BooleanQuery>
- </Query>
- <Filter>
- <!-- TermsFilter uses an analyzer to tokenize Field text and creates a filter for docs which
- have ANY of the supplied terms. Unlike a RangeFilter this can be used for filtering on
- multiple terms that are not necessarily in a sequence. An example might be a list of primary
- keys from a database query result or perhaps a choice of "category" labels picked by the end
- user.
- As a filter, this is much faster than the equivalent query (a BooleanQuery with many
- "should" TermQueries)
-
- This example might be just a list of Saturdays ie not a contiguous range of values
- which can be handled by rangefilter
- -->
- <TermsFilter fieldName="date">
- 19870601 19870608 19870615
- </TermsFilter>
- </Filter>
-
+ <Query>
+ <BooleanQuery fieldName="contents">
+ <Clause occurs="should">
+ <TermQuery>merger</TermQuery>
+ </Clause>
+ <Clause occurs="must">
+ <TermQuery>bank</TermQuery>
+ </Clause>
+ </BooleanQuery>
+ </Query>
+ <Filter>
+ <!-- TermsFilter uses an analyzer to tokenize Field text and creates a filter for docs which
+ have ANY of the supplied terms. Unlike a RangeFilter this can be used for filtering on
+ multiple terms that are not necessarily in a sequence. An example might be a list of primary
+ keys from a database query result or perhaps a choice of "category" labels picked by the end
+ user.
+ As a filter, this is much faster than the equivalent query (a BooleanQuery with many
+ "should" TermQueries)
+
+ This example might be just a list of Saturdays ie not a contiguous range of values
+ which can be handled by rangefilter
+ -->
+ <TermsFilter fieldName="date">
+ 19870601 19870608 19870615
+ </TermsFilter>
+ </Filter>
+
</FilteredQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsQuery.xml Tue Aug 11 23:08:41 2015
@@ -15,12 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
- <!-- TermsQuery uses an analyzer to tokenize text and creates a BooleanQuery with nested
- "should" TermQueries for each of the tokens encountered. This can be used for user input
- which may include content or characters that would otherwise be illegal query syntax when
- using the standard lucene query parser. Of course the downside is that none of the query
- operators (AND NOT ~ ^ : etc) will have an effect. For some scenarios queries are
- not formed by people familiar with Lucene query syntax and they can inadvertently type illegal
- query syntax so in these cases this is an appropriate and simple alternative
- -->
+ <!-- TermsQuery uses an analyzer to tokenize text and creates a BooleanQuery with nested
+ "should" TermQueries for each of the tokens encountered. This can be used for user input
+ which may include content or characters that would otherwise be illegal query syntax when
+ using the standard lucene query parser. Of course the downside is that none of the query
+ operators (AND NOT ~ ^ : etc) will have an effect. For some scenarios queries are
+ not formed by people familiar with Lucene query syntax and they can inadvertently type illegal
+ query syntax so in these cases this is an appropriate and simple alternative
+ -->
<TermsQuery fieldName="contents">sumitomo bank</TermsQuery>
\ No newline at end of file
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQuery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQuery.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQuery.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQuery.xml Tue Aug 11 23:08:41 2015
@@ -16,10 +16,10 @@
limitations under the License.
-->
<BooleanQuery>
- <Clause occurs="must">
- <UserQuery>"Bank of England"</UserQuery>
- </Clause>
- <Clause occurs="filter">
- <RangeQuery fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
- </Clause>
+ <Clause occurs="must">
+ <UserQuery>"Bank of England"</UserQuery>
+ </Clause>
+ <Clause occurs="filter">
+ <RangeQuery fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
+ </Clause>
</BooleanQuery>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/xmldtddocbuild.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/xmldtddocbuild.xml?rev=1695401&r1=1695400&r2=1695401&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/xmldtddocbuild.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/xmldtddocbuild.xml Tue Aug 11 23:08:41 2015
@@ -19,7 +19,7 @@
<project name="DTDDocAnt" default="main">
- <import file="../../lucene/module-build.xml"/>
+ <import file="../../lucene/module-build.xml"/>
<description>
This file generates DTDdocumentation