LUCENE-3108: manually merged with trunk
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/docvalues@1133855 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dev-tools/maven/lucene/contrib/ant/pom.xml.template b/dev-tools/maven/lucene/contrib/ant/pom.xml.template
deleted file mode 100644
index e300d0f..0000000
--- a/dev-tools/maven/lucene/contrib/ant/pom.xml.template
+++ /dev/null
@@ -1,114 +0,0 @@
-<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-ant</artifactId>
- <packaging>jar</packaging>
- <name>Lucene Contrib Ant</name>
- <description>Ant task to create Lucene indexes</description>
- <properties>
- <module-directory>lucene/contrib/ant</module-directory>
- <build-directory>../../build/contrib/ant</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>${project.groupId}</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-junit</artifactId>
- <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>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>${project.build.testSourceDirectory}</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.ant.HtmlDocument</mainClass>
- <name>HtmlDocument</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template b/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template
deleted file mode 100644
index a5d7647..0000000
--- a/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template
+++ /dev/null
@@ -1,75 +0,0 @@
-<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-bdb-je</artifactId>
- <packaging>jar</packaging>
- <name>Lucene Contrib bdb-je</name>
- <description>Berkeley DB based Directory implementation</description>
- <properties>
- <module-directory>lucene/contrib/db/bdb-je</module-directory>
- <build-directory>../../../build/contrib/db/bdb-je</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>com.sleepycat</groupId>
- <artifactId>berkeleydb-je</artifactId>
- </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>
diff --git a/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template b/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template
deleted file mode 100644
index d5d5123..0000000
--- a/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template
+++ /dev/null
@@ -1,86 +0,0 @@
-<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-bdb</artifactId>
- <packaging>jar</packaging>
- <name>Lucene Contrib bdb</name>
- <description>Berkeley DB based Directory implementation</description>
- <properties>
- <module-directory>lucene/contrib/db/bdb</module-directory>
- <build-directory>../../../build/contrib/db/bdb</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>com.sleepycat</groupId>
- <artifactId>berkeleydb</artifactId>
- </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>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- TODO: figure out how to conditionally turn on tests, -->
- <!-- depending on whether BDB is installed. -->
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/dev-tools/maven/lucene/contrib/db/pom.xml.template b/dev-tools/maven/lucene/contrib/db/pom.xml.template
deleted file mode 100644
index aa3b0da..0000000
--- a/dev-tools/maven/lucene/contrib/db/pom.xml.template
+++ /dev/null
@@ -1,49 +0,0 @@
-<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-db-aggregator</artifactId>
- <name>Lucene Database aggregator POM</name>
- <packaging>pom</packaging>
- <modules>
- <module>bdb</module>
- <module>bdb-je</module>
- </modules>
- <build>
- <directory>../../build/contrib/db/lucene-db-aggregator</directory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/dev-tools/maven/lucene/contrib/lucli/pom.xml.template b/dev-tools/maven/lucene/contrib/lucli/pom.xml.template
deleted file mode 100644
index efa4c53..0000000
--- a/dev-tools/maven/lucene/contrib/lucli/pom.xml.template
+++ /dev/null
@@ -1,107 +0,0 @@
-<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-lucli</artifactId>
- <packaging>jar</packaging>
- <name>Lucene Lucli</name>
- <description>Lucene Command Line Interface</description>
- <properties>
- <module-directory>lucene/contrib/lucli</module-directory>
- <build-directory>../../build/contrib/lucli</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>${project.groupId}</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </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>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <skip>true</skip> <!-- There are no public or protected classes -->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>lucli.Lucli</mainClass>
- <name>lucli</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/dev-tools/maven/lucene/contrib/swing/pom.xml.template b/dev-tools/maven/lucene/contrib/swing/pom.xml.template
deleted file mode 100644
index bb5178d..0000000
--- a/dev-tools/maven/lucene/contrib/swing/pom.xml.template
+++ /dev/null
@@ -1,100 +0,0 @@
-<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-swing</artifactId>
- <packaging>jar</packaging>
- <name>Lucene Swing</name>
- <description>Swing Models</description>
- <properties>
- <module-directory>lucene/contrib/swing</module-directory>
- <build-directory>../../build/contrib/swing</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>${project.groupId}</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </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>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.swing.models.ListSearcherSimulator</mainClass>
- <name>ListSearchSimulator</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.swing.models.TableSearcherSimulator</mainClass>
- <name>TableSearchSimulator</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/modules/analysis/icu/lib/lucene-icu4j-pom.xml.template b/modules/analysis/icu/lib/lucene-icu4j-pom.xml.template
deleted file mode 100644
index 2b48186..0000000
--- a/modules/analysis/icu/lib/lucene-icu4j-pom.xml.template
+++ /dev/null
@@ -1,36 +0,0 @@
-<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.
- -->
-
- <parent>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-parent</artifactId>
- <version>@version@</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-icu4j</artifactId>
- <name>Lucene Specific ICU4J</name>
- <version>@version@</version>
- <description>Lucene Specific ICU4J v4.6</description>
- <packaging>jar</packaging>
-</project>
diff --git a/solr/src/test/org/apache/solr/SolrInfoMBeanTest.java b/solr/src/test/org/apache/solr/SolrInfoMBeanTest.java
index 8d561c9..ed83863 100644
--- a/solr/src/test/org/apache/solr/SolrInfoMBeanTest.java
+++ b/solr/src/test/org/apache/solr/SolrInfoMBeanTest.java
@@ -24,7 +24,6 @@
import org.apache.solr.highlight.DefaultSolrHighlighter;
import org.apache.solr.search.LRUCache;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import java.io.File;
import java.net.URL;
import java.util.ArrayList;
@@ -45,9 +44,7 @@
* Gets a list of everything we can find in the classpath and makes sure it has
* a name, description, etc...
*/
- @Ignore // TODO: reenable once SOLR-2160 is fixed
public void testCallMBeanInfo() throws Exception {
-// Object[] init = org.apache.solr.search.QParserPlugin.standardPlugins;
List<Class> classes = new ArrayList<Class>();
classes.addAll(getClassesForPackage(StandardRequestHandler.class.getPackage().getName()));
classes.addAll(getClassesForPackage(SearchHandler.class.getPackage().getName()));
@@ -88,7 +85,7 @@
}
}
assertTrue( "there are at least 10 SolrInfoMBean that should be found in the classpath, found " + checked, checked > 10 );
- }
+ }
private static List<Class> getClassesForPackage(String pckgname) throws Exception {
ArrayList<File> directories = new ArrayList<File>();
