You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2012/09/05 12:15:50 UTC
svn commit: r1381126 - in /lucene/dev/branches/branch_4x: dev-tools/eclipse/
dev-tools/idea/.idea/ dev-tools/idea/lucene/codecs/ dev-tools/maven/lucene/
dev-tools/maven/lucene/codecs/ dev-tools/scripts/ lucene/ lucene/codecs/
lucene/codecs/src/ lucene/...
Author: jpountz
Date: Wed Sep 5 10:15:47 2012
New Revision: 1381126
URL: http://svn.apache.org/viewvc?rev=1381126&view=rev
Log:
LUCENE-4340: move non-default codec, postings format and terms dictionary implementations to lucene/codecs (manually merged from r1381071 and r1381086).
Added:
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/codecs.iml
lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/
lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/pom.xml.template
lucene/dev/branches/branch_4x/lucene/codecs/
lucene/dev/branches/branch_4x/lucene/codecs/build.xml (with props)
lucene/dev/branches/branch_4x/lucene/codecs/ivy.xml (with props)
lucene/dev/branches/branch_4x/lucene/codecs/src/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/BlockTermsReader.java
- copied unchanged from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/BlockTermsWriter.java
- copied unchanged from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsWriter.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java
- copied unchanged from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/FixedGapTermsIndexWriter.java
- copied unchanged from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexWriter.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/TermsIndexReaderBase.java
- copied unchanged from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/TermsIndexReaderBase.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/TermsIndexWriterBase.java
- copied unchanged from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/TermsIndexWriterBase.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/VariableGapTermsIndexReader.java
- copied unchanged from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/VariableGapTermsIndexWriter.java
- copied unchanged from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexWriter.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/appending/
- copied from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/appending/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/block/
- copied from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/block/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/
- copied from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/bloom/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/intblock/
- copied from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/intblock/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/
- copied from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/memory/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/
- copied from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/pulsing/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/sep/
- copied from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/sep/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/
- copied from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/
lucene/dev/branches/branch_4x/lucene/codecs/src/java/overview.html (with props)
lucene/dev/branches/branch_4x/lucene/codecs/src/resources/
lucene/dev/branches/branch_4x/lucene/codecs/src/resources/META-INF/
lucene/dev/branches/branch_4x/lucene/codecs/src/resources/META-INF/services/
lucene/dev/branches/branch_4x/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
- copied, changed from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
lucene/dev/branches/branch_4x/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
- copied, changed from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
lucene/dev/branches/branch_4x/lucene/codecs/src/test/
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/appending/
- copied from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/appending/
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/block/
- copied from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/block/
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/intblock/
- copied from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/intblock/
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/
- copied from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/pulsing/
Removed:
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsWriter.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexWriter.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/TermsIndexReaderBase.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/TermsIndexWriterBase.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexWriter.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/appending/
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/block/
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/bloom/
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/intblock/
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/memory/
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/pulsing/
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/sep/
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/appending/
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/block/
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/intblock/
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/pulsing/
Modified:
lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath
lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml
lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml
lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml
lucene/dev/branches/branch_4x/dev-tools/maven/lucene/pom.xml.template
lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py
lucene/dev/branches/branch_4x/lucene/CHANGES.txt
lucene/dev/branches/branch_4x/lucene/common-build.xml
lucene/dev/branches/branch_4x/lucene/core/build.xml
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/PostingsWriterBase.java
lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
lucene/dev/branches/branch_4x/lucene/module-build.xml
lucene/dev/branches/branch_4x/lucene/test-framework/build.xml
Modified: lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath Wed Sep 5 10:15:47 2012
@@ -3,6 +3,9 @@
<classpathentry kind="src" path="lucene/core/src/java"/>
<classpathentry kind="src" path="lucene/core/src/resources"/>
<classpathentry kind="src" path="lucene/core/src/test"/>
+ <classpathentry kind="src" path="lucene/codecs/src/java"/>
+ <classpathentry kind="src" output="bin/codecs" path="lucene/codecs/src/resources"/>
+ <classpathentry kind="src" path="lucene/codecs/src/test"/>
<classpathentry kind="src" path="lucene/demo/src/java"/>
<classpathentry kind="src" path="lucene/demo/src/resources"/>
<classpathentry kind="src" path="lucene/demo/src/test"/>
Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml Wed Sep 5 10:15:47 2012
@@ -8,6 +8,7 @@
<buildFile url="file://$PROJECT_DIR$/lucene/memory/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/misc/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/sandbox/build.xml" />
+ <buildFile url="file://$PROJECT_DIR$/lucene/codecs/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/core/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/tools/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/test-framework/build.xml" />
Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml Wed Sep 5 10:15:47 2012
@@ -4,6 +4,7 @@
<modules>
<module filepath="$PROJECT_DIR$/parent.iml" />
<module filepath="$PROJECT_DIR$/lucene/lucene.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/codecs/codecs.iml" />
<module filepath="$PROJECT_DIR$/lucene/demo/demo.iml" />
<module filepath="$PROJECT_DIR$/lucene/highlighter/highlighter.iml" />
<module filepath="$PROJECT_DIR$/lucene/memory/memory.iml" />
Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml Wed Sep 5 10:15:47 2012
@@ -78,6 +78,13 @@
antfile="file://$PROJECT_DIR$/lucene/benchmark/build.xml" />
</method>
</configuration>
+ <configuration default="false" name="Module codecs" type="JUnit" factoryName="JUnit">
+ <module name="facet" />
+ <option name="TEST_OBJECT" value="package" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/codecs" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ </configuration>
<configuration default="false" name="Module facet" type="JUnit" factoryName="JUnit">
<module name="facet" />
<option name="TEST_OBJECT" value="package" />
Added: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/codecs.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/codecs.iml?rev=1381126&view=auto
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/codecs.iml (added)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/codecs.iml Wed Sep 5 10:15:47 2012
@@ -0,0 +1,16 @@
+<?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/codecs/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../build/codecs/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="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="lucene" />
+ </component>
+</module>
Added: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/pom.xml.template?rev=1381126&view=auto
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/pom.xml.template (added)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/pom.xml.template Wed Sep 5 10:15:47 2012
@@ -0,0 +1,72 @@
+<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-codecs</artifactId>
+ <packaging>jar</packaging>
+ <name>Lucene codecs</name>
+ <description>
+ Codecs and postings formats for Apache Lucene.
+ </description>
+ <properties>
+ <module-directory>lucene/codecs</module-directory>
+ <top-level>../../..</top-level>
+ <module-path>${top-level}/${module-directory}</module-path>
+ </properties>
+ <scm>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>${module-path}/src/java</sourceDirectory>
+ <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>${project.build.testSourceDirectory}</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ </build>
+</project>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/pom.xml.template?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/pom.xml.template Wed Sep 5 10:15:47 2012
@@ -41,6 +41,7 @@
</scm>
<modules>
<module>core</module>
+ <module>codecs</module>
<module>test-framework</module>
<module>analysis</module>
<module>benchmark</module>
Modified: lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py Wed Sep 5 10:15:47 2012
@@ -441,7 +441,7 @@ def verifyUnpacked(project, artifact, un
if project == 'lucene':
# TODO: clean this up to not be a list of modules that we must maintain
- extras = ('analysis', 'benchmark', 'core', 'demo', 'docs', 'facet', 'grouping', 'highlighter', 'join', 'memory', 'misc', 'queries', 'queryparser', 'sandbox', 'spatial', 'suggest', 'test-framework', 'licenses')
+ extras = ('analysis', 'benchmark', 'codecs', 'core', 'demo', 'docs', 'facet', 'grouping', 'highlighter', 'join', 'memory', 'misc', 'queries', 'queryparser', 'sandbox', 'spatial', 'suggest', 'test-framework', 'licenses')
if isSrc:
extras += ('build.xml', 'common-build.xml', 'module-build.xml', 'ivy-settings.xml', 'backwards', 'tools', 'site')
else:
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Wed Sep 5 10:15:47 2012
@@ -156,6 +156,9 @@ Build
* LUCENE-3985: Upgrade to randomizedtesting 2.0.0. Added support for
thread leak detection. Added support for suite timeouts. (Dawid Weiss)
+* LUCENE-4340: Move all non-default codec, postings format and terms
+ dictionary implementations to lucene/codecs. (Adrien Grand)
+
Documentation
* LUCENE-4302: Fix facet userguide to have HTML loose doctype like
Added: lucene/dev/branches/branch_4x/lucene/codecs/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/build.xml?rev=1381126&view=auto
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/build.xml (added)
+++ lucene/dev/branches/branch_4x/lucene/codecs/build.xml Wed Sep 5 10:15:47 2012
@@ -0,0 +1,24 @@
+<!--
+ 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="codecs" default="default">
+ <description>
+ Lucene codecs and postings formats.
+ </description>
+
+ <import file="../module-build.xml"/>
+</project>
Added: lucene/dev/branches/branch_4x/lucene/codecs/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/ivy.xml?rev=1381126&view=auto
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/ivy.xml (added)
+++ lucene/dev/branches/branch_4x/lucene/codecs/ivy.xml Wed Sep 5 10:15:47 2012
@@ -0,0 +1,21 @@
+<!--
+ 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.
+-->
+<ivy-module version="2.0">
+ <info organisation="org.apache.lucene" module="codecs"/>
+</ivy-module>
Added: lucene/dev/branches/branch_4x/lucene/codecs/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/overview.html?rev=1381126&view=auto
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/overview.html (added)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/overview.html Wed Sep 5 10:15:47 2012
@@ -0,0 +1,24 @@
+<!--
+ 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>Apache Lucene - Codecs</title>
+</head>
+<body>
+Collection of useful codec, postings format and terms dictionary implementations.
+</body>
+</html>
Copied: lucene/dev/branches/branch_4x/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec (from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec?p2=lucene/dev/branches/branch_4x/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec&p1=lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec&r1=1381109&r2=1381126&rev=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec Wed Sep 5 10:15:47 2012
@@ -13,7 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.lucene.codecs.lucene40.Lucene40Codec
-org.apache.lucene.codecs.lucene3x.Lucene3xCodec
org.apache.lucene.codecs.simpletext.SimpleTextCodec
org.apache.lucene.codecs.appending.AppendingCodec
Copied: lucene/dev/branches/branch_4x/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (from r1381109, lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat?p2=lucene/dev/branches/branch_4x/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat&p1=lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat&r1=1381109&r2=1381126&rev=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat Wed Sep 5 10:15:47 2012
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat
org.apache.lucene.codecs.pulsing.Pulsing40PostingsFormat
org.apache.lucene.codecs.simpletext.SimpleTextPostingsFormat
org.apache.lucene.codecs.memory.MemoryPostingsFormat
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Wed Sep 5 10:15:47 2012
@@ -576,6 +576,10 @@
<property name="core-javadocs.uptodate" value="true"/>
</target>
+ <target name="compile-codecs">
+ <ant dir="${common.dir}/codecs" target="compile-core" inheritAll="false"/>
+ </target>
+
<target name="compile-test-framework" unless="lucene.test.framework.compiled">
<ant dir="${common.dir}/test-framework" target="compile-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
Modified: lucene/dev/branches/branch_4x/lucene/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/build.xml?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/core/build.xml Wed Sep 5 10:15:47 2012
@@ -28,6 +28,7 @@
<path id="test.classpath">
<pathelement location="${common.dir}/build/test-framework/classes/java"/>
+ <pathelement location="${common.dir}/build/codecs/classes/java"/>
<path refid="junit-path"/>
<pathelement location="${build.dir}/classes/java"/>
<pathelement location="${build.dir}/classes/test"/>
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/PostingsWriterBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/PostingsWriterBase.java?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/PostingsWriterBase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/PostingsWriterBase.java Wed Sep 5 10:15:47 2012
@@ -27,10 +27,10 @@ import org.apache.lucene.index.FieldInfo
* Extension of {@link PostingsConsumer} to support pluggable term dictionaries.
* <p>
* This class contains additional hooks to interact with the provided
- * term dictionaries such as {@link BlockTreeTermsWriter} and
- * {@link BlockTermsWriter}. If you want to re-use one of these existing
- * implementations and are only interested in customizing the format of
- * the postings list, extend this class instead.
+ * term dictionaries such as {@link BlockTreeTermsWriter}. If you want
+ * to re-use an existing implementation and are only interested in
+ * customizing the format of the postings list, extend this class
+ * instead.
*
* @see PostingsReaderBase
* @lucene.experimental
Modified: lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec Wed Sep 5 10:15:47 2012
@@ -15,5 +15,3 @@
org.apache.lucene.codecs.lucene40.Lucene40Codec
org.apache.lucene.codecs.lucene3x.Lucene3xCodec
-org.apache.lucene.codecs.simpletext.SimpleTextCodec
-org.apache.lucene.codecs.appending.AppendingCodec
Modified: lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat Wed Sep 5 10:15:47 2012
@@ -14,9 +14,3 @@
# limitations under the License.
org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat
-org.apache.lucene.codecs.pulsing.Pulsing40PostingsFormat
-org.apache.lucene.codecs.simpletext.SimpleTextPostingsFormat
-org.apache.lucene.codecs.memory.MemoryPostingsFormat
-org.apache.lucene.codecs.bloom.BloomFilteringPostingsFormat
-org.apache.lucene.codecs.memory.DirectPostingsFormat
-org.apache.lucene.codecs.block.BlockPostingsFormat
Modified: lucene/dev/branches/branch_4x/lucene/module-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/module-build.xml?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/module-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/module-build.xml Wed Sep 5 10:15:47 2012
@@ -40,6 +40,7 @@
<path id="classpath" refid="base.classpath"/>
<path id="test.base.classpath">
+ <pathelement location="${common.dir}/build/codecs/classes/java"/>
<pathelement location="${common.dir}/build/test-framework/classes/java"/>
<path refid="classpath"/>
<path refid="junit-path"/>
@@ -357,6 +358,28 @@
<property name="analyzers-morfologik-javadocs.uptodate" value="true"/>
</target>
+ <property name="codecs.jar" value="${common.dir}/build/codecs/lucene-codecs-${version}.jar"/>
+ <target name="check-codecs-uptodate" unless="codecs.uptodate">
+ <module-uptodate name="codecs" jarfile="${codecs.jar}" property="codecs.uptodate"/>
+ </target>
+ <target name="jar-codecs" unless="codecs.uptodate" depends="check-codecs-uptodate">
+ <ant dir="${common.dir}/codecs" target="jar-core" inheritall="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="codecs.uptodate" value="true"/>
+ </target>
+
+ <property name="codecs-javadoc.jar" value="${common.dir}/build/codecs/lucene-codecs-${version}-javadoc.jar"/>
+ <target name="check-codecs-javadocs-uptodate" unless="codecs-javadocs.uptodate">
+ <module-uptodate name="codecs" jarfile="${codecs-javadoc.jar}" property="codecs-javadocs.uptodate"/>
+ </target>
+ <target name="javadocs-codecs" unless="codecs-javadocs.uptodate" depends="check-codecs-javadocs-uptodate">
+ <ant dir="${common.dir}/codecs" target="javadocs" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="codecs-javadocs.uptodate" value="true"/>
+ </target>
+
<property name="grouping.jar" value="${common.dir}/build/grouping/lucene-grouping-${version}.jar"/>
<target name="check-grouping-uptodate" unless="grouping.uptodate">
<module-uptodate name="grouping" jarfile="${grouping.jar}" property="grouping.uptodate"/>
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/build.xml?rev=1381126&r1=1381125&r2=1381126&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/build.xml Wed Sep 5 10:15:47 2012
@@ -26,6 +26,7 @@
<path id="classpath">
<pathelement location="${common.dir}/build/core/classes/java"/>
+ <pathelement location="${common.dir}/build/codecs/classes/java"/>
<path refid="junit-path"/>
<path refid="ant-path"/>
</path>
@@ -35,7 +36,7 @@
and *not* to depend on clover; clover already includes the
test-framework sources in each module's test instrumentation.
-->
- <target name="compile-core" depends="init,compile-lucene-core"
+ <target name="compile-core" depends="init,compile-lucene-core,compile-codecs"
description="Compiles test-framework classes">
<compile srcdir="${src.dir}" destdir="${build.dir}/classes/java">
<classpath refid="classpath"/>