You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ch...@apache.org on 2011/08/20 06:58:00 UTC
svn commit: r1159846 - in /lucene/dev/trunk: dev-tools/eclipse/
dev-tools/idea/.idea/ dev-tools/idea/lucene/contrib/highlighter/
dev-tools/idea/lucene/contrib/queries/ dev-tools/idea/lucene/contrib/sandbox/
dev-tools/idea/lucene/contrib/spatial/ dev-to...
Author: chrism
Date: Sat Aug 20 04:57:58 2011
New Revision: 1159846
URL: http://svn.apache.org/viewvc?rev=1159846&view=rev
Log:
LUCENE-3381: Sandboxed remaining contrib queries
Added:
lucene/dev/trunk/dev-tools/idea/lucene/contrib/sandbox/
lucene/dev/trunk/dev-tools/idea/lucene/contrib/sandbox/sandbox.iml
lucene/dev/trunk/dev-tools/maven/lucene/contrib/sandbox/
lucene/dev/trunk/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template
lucene/dev/trunk/lucene/contrib/sandbox/
lucene/dev/trunk/lucene/contrib/sandbox/build.xml
lucene/dev/trunk/lucene/contrib/sandbox/lib/
lucene/dev/trunk/lucene/contrib/sandbox/lib/jakarta-regexp-1.4.jar
- copied unchanged from r1159839, lucene/dev/trunk/lucene/contrib/queries/lib/jakarta-regexp-1.4.jar
lucene/dev/trunk/lucene/contrib/sandbox/lib/jakarta-regexp-LICENSE-ASL.txt
- copied unchanged from r1159839, lucene/dev/trunk/lucene/contrib/queries/lib/jakarta-regexp-LICENSE-ASL.txt
lucene/dev/trunk/lucene/contrib/sandbox/lib/jakarta-regexp-NOTICE.txt
- copied unchanged from r1159839, lucene/dev/trunk/lucene/contrib/queries/lib/jakarta-regexp-NOTICE.txt
lucene/dev/trunk/lucene/contrib/sandbox/src/
lucene/dev/trunk/lucene/contrib/sandbox/src/java/
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
- copied, changed from r1159839, lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/DuplicateFilter.java
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
- copied, changed from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java
- copied, changed from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedStringComparator.java
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeFilter.java
- copied, changed from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedTermRangeFilter.java
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeQuery.java
- copied, changed from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedTermRangeQuery.java
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeTermsEnum.java
- copied, changed from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedTermRangeTermsEnum.java
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/
- copied from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/
lucene/dev/trunk/lucene/contrib/sandbox/src/java/overview.html
lucene/dev/trunk/lucene/contrib/sandbox/src/test/
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
- copied, changed from r1159839, lucene/dev/trunk/modules/queries/src/test/org/apache/lucene/queries/DuplicateFilterTest.java
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java
- copied, changed from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java
- copied, changed from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TestSlowCollationMethods.java
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/
- copied from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/similar/
- copied from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/
Removed:
lucene/dev/trunk/dev-tools/idea/lucene/contrib/queries/
lucene/dev/trunk/dev-tools/maven/lucene/contrib/queries/
lucene/dev/trunk/lucene/contrib/queries/
lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/DuplicateFilter.java
lucene/dev/trunk/modules/queries/src/test/org/apache/lucene/queries/DuplicateFilterTest.java
Modified:
lucene/dev/trunk/dev-tools/eclipse/dot.classpath
lucene/dev/trunk/dev-tools/idea/.idea/modules.xml
lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml
lucene/dev/trunk/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml
lucene/dev/trunk/dev-tools/idea/lucene/contrib/spatial/spatial.iml
lucene/dev/trunk/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml
lucene/dev/trunk/dev-tools/idea/solr/solr.iml
lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/contrib/contrib-build.xml
lucene/dev/trunk/lucene/contrib/highlighter/build.xml
lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/JakartaRegexpCapabilities.java
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/JavaUtilRegexCapabilities.java
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexCapabilities.java
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQuery.java
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQueryCapable.java
lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestJakartaRegexpCapabilities.java
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java
lucene/dev/trunk/lucene/contrib/spatial/build.xml
lucene/dev/trunk/lucene/contrib/xml-query-parser/build.xml
lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/DuplicateFilterBuilder.java
lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/FuzzyLikeThisQueryBuilder.java
lucene/dev/trunk/solr/common-build.xml
Modified: lucene/dev/trunk/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/dot.classpath?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Sat Aug 20 04:57:58 2011
@@ -14,8 +14,8 @@
<classpathentry kind="src" path="lucene/contrib/memory/src/test"/>
<classpathentry kind="src" path="lucene/contrib/misc/src/java"/>
<classpathentry kind="src" path="lucene/contrib/misc/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/queries/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/queries/src/test"/>
+ <classpathentry kind="src" path="lucene/contrib/sandbox/src/java"/>
+ <classpathentry kind="src" path="lucene/contrib/sandbox/src/test"/>
<classpathentry kind="src" path="lucene/contrib/spatial/src/java"/>
<classpathentry kind="src" path="lucene/contrib/spatial/src/test"/>
<classpathentry kind="src" path="lucene/contrib/xml-query-parser/src/java"/>
Modified: lucene/dev/trunk/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/modules.xml?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/modules.xml Sat Aug 20 04:57:58 2011
@@ -9,8 +9,8 @@
<module filepath="$PROJECT_DIR$/lucene/contrib/instantiated/instantiated.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/memory/memory.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/misc/misc.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/queries/queries-contrib.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/spatial/spatial.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/contrib/sandbox/sandbox.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/xml-query-parser/xml-query-parser.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/common/analysis-common.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/icu/icu.iml" />
Modified: lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml Sat Aug 20 04:57:58 2011
@@ -127,13 +127,6 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="queries contrib" type="JUnit" factoryName="JUnit">
- <module name="queries-contrib" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/queries" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
<configuration default="false" name="queries module" type="JUnit" factoryName="JUnit">
<module name="queries" />
<option name="TEST_OBJECT" value="package" />
@@ -148,6 +141,13 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
+ <configuration default="false" name="sandbox contrib" type="JUnit" factoryName="JUnit">
+ <module name="sandbox" />
+ <option name="TEST_OBJECT" value="package" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/sandbox" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ </configuration>
<configuration default="false" name="smartcn analysis module" type="JUnit" factoryName="JUnit">
<module name="smartcn" />
<option name="TEST_OBJECT" value="package" />
@@ -216,9 +216,9 @@
<item index="15" class="java.lang.String" itemvalue="JUnit.misc contrib" />
<item index="16" class="java.lang.String" itemvalue="JUnit.morfologik analysis module" />
<item index="17" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
- <item index="18" class="java.lang.String" itemvalue="JUnit.queries contrib" />
- <item index="19" class="java.lang.String" itemvalue="JUnit.queries module" />
- <item index="20" class="java.lang.String" itemvalue="JUnit.queryparser module" />
+ <item index="18" class="java.lang.String" itemvalue="JUnit.queries module" />
+ <item index="19" class="java.lang.String" itemvalue="JUnit.queryparser module" />
+ <item index="20" class="java.lang.String" itemvalue="JUnit.sandbox contrib" />
<item index="21" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
<item index="22" class="java.lang.String" itemvalue="JUnit.solr" />
<item index="23" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
Modified: lucene/dev/trunk/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml Sat Aug 20 04:57:58 2011
@@ -12,7 +12,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="module" module-name="memory" />
- <orderEntry type="module" module-name="queries-contrib" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="lucene" />
</component>
Added: lucene/dev/trunk/dev-tools/idea/lucene/contrib/sandbox/sandbox.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/contrib/sandbox/sandbox.iml?rev=1159846&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/contrib/sandbox/sandbox.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/lucene/contrib/sandbox/sandbox.iml Sat Aug 20 04:57:58 2011
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/../../build/contrib/sandbox/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../build/contrib/sandbox/classes/test" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jakarta-regexp-1.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="lucene" />
+ </component>
+</module>
+
Modified: lucene/dev/trunk/dev-tools/idea/lucene/contrib/spatial/spatial.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/contrib/spatial/spatial.iml?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/contrib/spatial/spatial.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/contrib/spatial/spatial.iml Sat Aug 20 04:57:58 2011
@@ -11,7 +11,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="module" module-name="queries-contrib" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="lucene" />
<orderEntry type="module" module-name="queries" />
Modified: lucene/dev/trunk/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml Sat Aug 20 04:57:58 2011
@@ -11,8 +11,8 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="module" module-name="queries-contrib" />
<orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="sandbox" />
<orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="lucene" />
<orderEntry type="module" module-name="queryparser" />
Modified: lucene/dev/trunk/dev-tools/idea/solr/solr.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/solr.iml?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/solr.iml Sat Aug 20 04:57:58 2011
@@ -24,7 +24,6 @@
<orderEntry type="module" module-name="grouping" />
<orderEntry type="module" module-name="highlighter" />
<orderEntry type="module" module-name="icu" />
- <orderEntry type="module" module-name="queries-contrib" />
<orderEntry type="module" module-name="queries" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="phonetic" />
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template Sat Aug 20 04:57:58 2011
@@ -55,11 +55,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>lucene-queries-contrib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/pom.xml.template?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/pom.xml.template Sat Aug 20 04:57:58 2011
@@ -36,7 +36,7 @@
<module>instantiated</module>
<module>memory</module>
<module>misc</module>
- <module>queries</module>
+ <module>sandbox</module>
<module>spatial</module>
<module>xml-query-parser</module>
</modules>
Added: lucene/dev/trunk/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template?rev=1159846&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template (added)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template Sat Aug 20 04:57:58 2011
@@ -0,0 +1,71 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-parent</artifactId>
+ <version>@version@</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-sandbox</artifactId>
+ <packaging>jar</packaging>
+ <name>Lucene Sandbox</name>
+ <description>Lucene Sandbox</description>
+ <properties>
+ <module-directory>lucene/contrib/sandbox</module-directory>
+ <build-directory>../../build/contrib/sandbox</build-directory>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <directory>${build-directory}</directory>
+ <outputDirectory>${build-directory}/classes/java</outputDirectory>
+ <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>${project.build.testSourceDirectory}</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ </build>
+</project>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template Sat Aug 20 04:57:58 2011
@@ -49,11 +49,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-queries-contrib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>lucene-queries</artifactId>
<version>${project.version}</version>
</dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template Sat Aug 20 04:57:58 2011
@@ -49,12 +49,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-queries-contrib</artifactId>
+ <artifactId>lucene-queries</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-queries</artifactId>
+ <artifactId>lucene-sandbox</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template Sat Aug 20 04:57:58 2011
@@ -78,11 +78,6 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queries-contrib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
<version>${project.version}</version>
</dependency>
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Sat Aug 20 04:57:58 2011
@@ -255,7 +255,7 @@
<packageset dir="contrib/instantiated/src/java"/>
<packageset dir="contrib/memory/src/java"/>
<packageset dir="contrib/misc/src/java"/>
- <packageset dir="contrib/queries/src/java"/>
+ <packageset dir="contrib/sandbox/src/java"/>
<packageset dir="contrib/spatial/src/java"/>
<packageset dir="contrib/xml-query-parser/src/java"/>
<!-- end alpha sort -->
@@ -272,7 +272,7 @@
<group title="contrib: Instantiated" packages="org.apache.lucene.store.instantiated*"/>
<group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
<group title="contrib: Misc " packages="org.apache.lucene.misc*"/>
- <group title="contrib: Queries" packages="org.apache.lucene.search.similar*:org.apache.lucene.search.regex*:org.apache.regexp*"/>
+ <group title="contrib: Sandbox" packages="org.apache.lucene.sandbox*"/>
<group title="contrib: Spatial" packages="org.apache.lucene.spatial*"/>
<group title="contrib: XML Query Parser" packages="org.apache.lucene.xmlparser*"/>
Modified: lucene/dev/trunk/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/contrib-build.xml?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/contrib-build.xml Sat Aug 20 04:57:58 2011
@@ -240,17 +240,6 @@
<property name="queries.uptodate" value="true"/>
</target>
- <property name="queries-contrib.jar" value="${common.dir}/build/contrib/queries-contrib/lucene-queries-contrib-${version}.jar"/>
- <target name="check-queries-contrib-uptodate" unless="queries-contrib.uptodate">
- <contrib-uptodate name="queries-contrib" jarfile="${queries-contrib.jar}" contrib-src-name="queries" property="queries-contrib.uptodate"/>
- </target>
- <target name="jar-queries-contrib" unless="queries-contrib.uptodate" depends="check-queries-contrib-uptodate">
- <ant dir="${common.dir}/contrib/queries" target="jar-core" inheritall="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- <property name="queries-contrib.uptodate" value="true"/>
- </target>
-
<property name="queryparser.jar" value="${common.dir}/../modules/queryparser/build/lucene-queryparser-${version}.jar"/>
<target name="check-queryparser-uptodate" unless="queryparser.uptodate">
<module-uptodate name="queryparser" jarfile="${queryparser.jar}" property="queryparser.uptodate"/>
@@ -262,6 +251,17 @@
<property name="queryparser.uptodate" value="true"/>
</target>
+ <property name="sandbox.jar" value="${common.dir}/build/contrib/sandbox/lucene-sandbox-${version}.jar"/>
+ <target name="check-sandbox-uptodate" unless="sandbox.uptodate">
+ <contrib-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}/contrib/sandbox" target="jar-core" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="sandbox.uptodate" value="true"/>
+ </target>
+
<property name="spatial.jar" value="${common.dir}/build/contrib/spatial/lucene-spatial-${version}.jar"/>
<target name="check-spatial-uptodate" unless="spatial.uptodate">
<contrib-uptodate name="spatial" jarfile="${spatial.jar}" property="spatial.uptodate"/>
Modified: lucene/dev/trunk/lucene/contrib/highlighter/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/build.xml?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/highlighter/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/highlighter/build.xml Sat Aug 20 04:57:58 2011
@@ -27,9 +27,8 @@
<path id="classpath">
<pathelement path="${memory.jar}"/>
- <pathelement path="${queries-contrib.jar}"/>
<path refid="base.classpath"/>
</path>
- <target name="compile-core" depends="jar-memory, jar-queries-contrib, common.compile-core" />
+ <target name="compile-core" depends="jar-memory, common.compile-core" />
</project>
Modified: lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Sat Aug 20 04:57:58 2011
@@ -55,7 +55,6 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.search.*;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.highlight.SynonymTokenizer.TestHighlightRunner;
-import org.apache.lucene.search.regex.RegexQuery;
import org.apache.lucene.search.spans.*;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -337,7 +336,7 @@ public class HighlighterTest extends Bas
}
public void testSpanRegexQuery() throws Exception {
- query = new SpanOrQuery(new SpanMultiTermQueryWrapper<RegexQuery>(new RegexQuery(new Term(FIELD_NAME, "ken.*"))));
+ query = new SpanOrQuery(new SpanMultiTermQueryWrapper<RegexpQuery>(new RegexpQuery(new Term(FIELD_NAME, "ken.*"))));
searcher = new IndexSearcher(ramDir, true);
hits = searcher.search(query, 100);
int maxNumFragmentsRequired = 2;
@@ -361,7 +360,7 @@ public class HighlighterTest extends Bas
}
public void testRegexQuery() throws Exception {
- query = new RegexQuery(new Term(FIELD_NAME, "ken.*"));
+ query = new RegexpQuery(new Term(FIELD_NAME, "ken.*"));
searcher = new IndexSearcher(ramDir, true);
hits = searcher.search(query, 100);
int maxNumFragmentsRequired = 2;
Added: lucene/dev/trunk/lucene/contrib/sandbox/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/build.xml?rev=1159846&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/contrib/sandbox/build.xml (added)
+++ lucene/dev/trunk/lucene/contrib/sandbox/build.xml Sat Aug 20 04:57:58 2011
@@ -0,0 +1,35 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<project name="sandbox" default="default">
+
+ <description>
+ Sandbox for odd contrib code
+ </description>
+
+ <path id="additional.dependencies">
+ <fileset dir="lib" includes="*-regexp-*.jar"/>
+ </path>
+
+ <pathconvert property="project.classpath"
+ targetos="unix"
+ refid="additional.dependencies"
+ />
+
+ <import file="../contrib-build.xml"/>
+
+</project>
Copied: lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java (from r1159839, lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/DuplicateFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java?p2=lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java&p1=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/DuplicateFilter.java&r1=1159839&r2=1159846&rev=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/DuplicateFilter.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queries;
+package org.apache.lucene.sandbox.queries;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Copied: lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java (from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java?p2=lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java&p1=lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java&r1=1159839&r2=1159846&rev=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.queries;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +30,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.Term;
+import org.apache.lucene.search.*;
import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.PriorityQueue;
Copied: lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java (from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedStringComparator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java?p2=lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java&p1=lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedStringComparator.java&r1=1159839&r2=1159846&rev=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedStringComparator.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.queries;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,7 +21,9 @@ import java.io.IOException;
import java.text.Collator;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldCache.DocTerms;
+import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.util.BytesRef;
/** Sorts by a field's value using the given Collator
Copied: lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeFilter.java (from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedTermRangeFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeFilter.java?p2=lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeFilter.java&p1=lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedTermRangeFilter.java&r1=1159839&r2=1159846&rev=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedTermRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeFilter.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.queries;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,6 +19,7 @@ package org.apache.lucene.search;
import java.text.Collator;
+import org.apache.lucene.search.MultiTermQueryWrapperFilter;
import org.apache.lucene.search.NumericRangeFilter; // javadoc
import org.apache.lucene.search.FieldCacheRangeFilter; // javadoc
Copied: lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeQuery.java (from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedTermRangeQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeQuery.java?p2=lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeQuery.java&p1=lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedTermRangeQuery.java&r1=1159839&r2=1159846&rev=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedTermRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeQuery.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.queries;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeTermsEnum.java (from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedTermRangeTermsEnum.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeTermsEnum.java?p2=lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeTermsEnum.java&p1=lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedTermRangeTermsEnum.java&r1=1159839&r2=1159846&rev=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/SlowCollatedTermRangeTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeTermsEnum.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.queries;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.text.Collator;
import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.search.FilteredTermsEnum;
import org.apache.lucene.util.BytesRef;
/**
Modified: lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/JakartaRegexpCapabilities.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/JakartaRegexpCapabilities.java?rev=1159846&r1=1159839&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/JakartaRegexpCapabilities.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/JakartaRegexpCapabilities.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.sandbox.queries.regex;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/JavaUtilRegexCapabilities.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/JavaUtilRegexCapabilities.java?rev=1159846&r1=1159839&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/JavaUtilRegexCapabilities.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/JavaUtilRegexCapabilities.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.sandbox.queries.regex;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexCapabilities.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexCapabilities.java?rev=1159846&r1=1159839&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexCapabilities.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexCapabilities.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.sandbox.queries.regex;
import org.apache.lucene.util.BytesRef;
Modified: lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQuery.java?rev=1159846&r1=1159839&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQuery.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQuery.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.sandbox.queries.regex;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQueryCapable.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQueryCapable.java?rev=1159846&r1=1159839&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQueryCapable.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQueryCapable.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.sandbox.queries.regex;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java?rev=1159846&r1=1159839&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.sandbox.queries.regex;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Added: lucene/dev/trunk/lucene/contrib/sandbox/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/java/overview.html?rev=1159846&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/contrib/sandbox/src/java/overview.html (added)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/java/overview.html Sat Aug 20 04:57:58 2011
@@ -0,0 +1,26 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<html>
+ <head>
+ <title>
+ Sandbox
+ </title>
+ </head>
+ <body>
+ Sandbox
+ </body>
+</html>
Copied: lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java (from r1159839, lucene/dev/trunk/modules/queries/src/test/org/apache/lucene/queries/DuplicateFilterTest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java?p2=lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java&p1=lucene/dev/trunk/modules/queries/src/test/org/apache/lucene/queries/DuplicateFilterTest.java&r1=1159839&r2=1159846&rev=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queries/src/test/org/apache/lucene/queries/DuplicateFilterTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queries;
+package org.apache.lucene.sandbox.queries;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java (from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java?p2=lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java&p1=lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java&r1=1159839&r2=1159846&rev=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.queries;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,6 +24,10 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
Copied: lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java (from r1159839, lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TestSlowCollationMethods.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java?p2=lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java&p1=lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TestSlowCollationMethods.java&r1=1159839&r2=1159846&rev=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TestSlowCollationMethods.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search;
+package org.apache.lucene.sandbox.queries;
import java.io.IOException;
import java.text.Collator;
@@ -8,6 +8,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.search.*;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
Modified: lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestJakartaRegexpCapabilities.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestJakartaRegexpCapabilities.java?rev=1159846&r1=1159839&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestJakartaRegexpCapabilities.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestJakartaRegexpCapabilities.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.sandbox.queries.regex;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java?rev=1159846&r1=1159839&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.sandbox.queries.regex;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java?rev=1159846&r1=1159839&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java Sat Aug 20 04:57:58 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.sandbox.queries.regex;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/contrib/spatial/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/spatial/build.xml?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/spatial/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/spatial/build.xml Sat Aug 20 04:57:58 2011
@@ -26,10 +26,9 @@
<import file="../contrib-build.xml"/>
<path id="classpath">
- <pathelement path="${queries-contrib.jar}"/>
<pathelement path="${queries.jar}"/>
<path refid="base.classpath"/>
</path>
- <target name="compile-core" depends="jar-queries-contrib, jar-queries, common.compile-core" />
+ <target name="compile-core" depends="jar-queries, common.compile-core" />
</project>
Modified: lucene/dev/trunk/lucene/contrib/xml-query-parser/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/xml-query-parser/build.xml?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/xml-query-parser/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/xml-query-parser/build.xml Sat Aug 20 04:57:58 2011
@@ -26,11 +26,11 @@
<import file="../contrib-build.xml"/>
<path id="classpath">
- <pathelement path="${queries-contrib.jar}"/>
<pathelement path="${queryparser.jar}"/>
<pathelement path="${queries.jar}"/>
+ <pathelement path="${sandbox.jar}"/>
<path refid="base.classpath"/>
</path>
- <target name="compile-core" depends="jar-queries-contrib,jar-queryparser,jar-queries,common.compile-core" />
+ <target name="compile-core" depends="jar-sandbox,jar-queryparser,jar-queries,common.compile-core" />
</project>
Modified: lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/DuplicateFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/DuplicateFilterBuilder.java?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/DuplicateFilterBuilder.java (original)
+++ lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/DuplicateFilterBuilder.java Sat Aug 20 04:57:58 2011
@@ -3,7 +3,7 @@
*/
package org.apache.lucene.xmlparser.builders;
-import org.apache.lucene.queries.DuplicateFilter;
+import org.apache.lucene.sandbox.queries.DuplicateFilter;
import org.apache.lucene.search.Filter;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.FilterBuilder;
Modified: lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/FuzzyLikeThisQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/FuzzyLikeThisQueryBuilder.java?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/FuzzyLikeThisQueryBuilder.java (original)
+++ lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/FuzzyLikeThisQueryBuilder.java Sat Aug 20 04:57:58 2011
@@ -1,7 +1,7 @@
package org.apache.lucene.xmlparser.builders;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.search.FuzzyLikeThisQuery;
+import org.apache.lucene.sandbox.queries.FuzzyLikeThisQuery;
import org.apache.lucene.search.FuzzyQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.xmlparser.DOMUtils;
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1159846&r1=1159845&r2=1159846&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Sat Aug 20 04:57:58 2011
@@ -84,7 +84,6 @@
<pathelement path="${highlighter.jar}"/>
<pathelement path="${memory.jar}"/>
<pathelement path="${misc.jar}"/>
- <pathelement path="${queries-contrib.jar}"/>
<pathelement path="${spatial.jar}"/>
<pathelement path="${suggest.jar}"/>
<pathelement path="${grouping.jar}"/>
@@ -171,7 +170,7 @@
<target name="prep-lucene-jars"
depends="jar-lucene-core, jar-analyzers-phonetic, jar-suggest, jar-highlighter, jar-memory,
- jar-misc, jar-queries-contrib, jar-spatial, jar-grouping, jar-queries, jar-queryparser">
+ jar-misc, jar-spatial, jar-grouping, jar-queries, jar-queryparser">
<property name="solr.deps.compiled" value="true"/>
</target>
@@ -192,7 +191,6 @@
<fileset file="${highlighter.jar}" />
<fileset file="${memory.jar}" />
<fileset file="${misc.jar}" />
- <fileset file="${queries-contrib.jar}" />
<fileset file="${spatial.jar}" />
</copy>
</sequential>