You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2012/01/01 12:41:31 UTC
svn commit: r1226236 - in /lucene/dev/trunk: ./
dev-tools/idea/lucene/contrib/ lucene/
lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/
lucene/src/java/org/apache/lucene/codecs/lucene3x/ modules/benchmark/
modules/facet/ modules...
Author: shaie
Date: Sun Jan 1 11:41:30 2012
New Revision: 1226236
URL: http://svn.apache.org/viewvc?rev=1226236&view=rev
Log:
LUCENE-3649: port changes from 3x to trunk
Added:
lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/doc-files/
- copied from r1226235, lucene/dev/branches/branch_3x/lucene/contrib/facet/src/java/org/apache/lucene/facet/doc-files/
Removed:
lucene/dev/trunk/modules/facet/docs/
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/dev-tools/idea/lucene/contrib/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (props changed)
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java (props changed)
lucene/dev/trunk/modules/benchmark/ (props changed)
lucene/dev/trunk/modules/facet/ (props changed)
lucene/dev/trunk/modules/facet/build.xml
lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/package.html
lucene/dev/trunk/modules/facet/src/java/overview.html
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java (props changed)
lucene/dev/trunk/solr/ (props changed)
lucene/dev/trunk/solr/CHANGES.txt (props changed)
lucene/dev/trunk/solr/LICENSE.txt (props changed)
lucene/dev/trunk/solr/NOTICE.txt (props changed)
lucene/dev/trunk/solr/README.txt (props changed)
lucene/dev/trunk/solr/build.xml (props changed)
lucene/dev/trunk/solr/client/ (props changed)
lucene/dev/trunk/solr/common-build.xml (props changed)
lucene/dev/trunk/solr/contrib/ (props changed)
lucene/dev/trunk/solr/contrib/clustering/src/test-files/ (props changed)
lucene/dev/trunk/solr/contrib/dataimporthandler-extras/src/java/ (props changed)
lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/ (props changed)
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/ (props changed)
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/ (props changed)
lucene/dev/trunk/solr/contrib/uima/src/java/ (props changed)
lucene/dev/trunk/solr/contrib/uima/src/test-files/ (props changed)
lucene/dev/trunk/solr/core/ (props changed)
lucene/dev/trunk/solr/core/src/java/ (props changed)
lucene/dev/trunk/solr/core/src/test/ (props changed)
lucene/dev/trunk/solr/dev-tools/ (props changed)
lucene/dev/trunk/solr/example/ (props changed)
lucene/dev/trunk/solr/lib/ (props changed)
lucene/dev/trunk/solr/scripts/ (props changed)
lucene/dev/trunk/solr/site/ (props changed)
lucene/dev/trunk/solr/site-src/ (props changed)
lucene/dev/trunk/solr/solrj/ (props changed)
lucene/dev/trunk/solr/solrj/src/java/ (props changed)
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/ (props changed)
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/ (props changed)
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/ (props changed)
lucene/dev/trunk/solr/test-framework/ (props changed)
lucene/dev/trunk/solr/testlogging.properties (props changed)
lucene/dev/trunk/solr/webapp/ (props changed)
Modified: lucene/dev/trunk/modules/facet/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/build.xml?rev=1226236&r1=1226235&r2=1226236&view=diff
==============================================================================
--- lucene/dev/trunk/modules/facet/build.xml (original)
+++ lucene/dev/trunk/modules/facet/build.xml Sun Jan 1 11:41:30 2012
@@ -73,23 +73,5 @@
<target name="compile-core" depends="jar-analyzers-common,common.compile-core,compile-examples" description="Compiles facet classes" />
<target name="jar-core" depends="common.jar-core,jar-examples" />
-
- <target name="javadocs" depends="compile-core">
- <sequential>
- <mkdir dir="${javadoc.dir}/contrib-${name}"/>
- <copy todir="${javadoc.dir}/contrib-${name}" file="docs/userguide.html" />
- <!-- javadoc core classes -->
- <invoke-javadoc
- destdir="${javadoc.dir}/contrib-${name}"
- title="${Name} ${version} contrib-${name} API">
- <sources>
- <link href=""/>
- <packageset dir="${src.dir}"/>
- <packageset dir="${examples.dir}"/>
- </sources>
- </invoke-javadoc>
- <jarify basedir="${javadoc.dir}/contrib-${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
- </sequential>
- </target>
</project>
Modified: lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/package.html?rev=1226236&r1=1226235&r2=1226236&view=diff
==============================================================================
--- lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/package.html (original)
+++ lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/package.html Sun Jan 1 11:41:30 2012
@@ -3,6 +3,7 @@
<title>Faceted Indexing and Search</title>
</head>
<body>
- Provides faceted indexing and search capabilities. The <a href="../../../../userguide.html">userguide</a> is recommended for a start.
+ <!-- NOTE: if you update the userguide link, also update the one in src/java/overview.html -->
+ Provides faceted indexing and search capabilities. The <a href="doc-files/userguide.html">userguide</a> is recommended for a start.
</body>
-</html>
\ No newline at end of file
+</html>
Modified: lucene/dev/trunk/modules/facet/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/java/overview.html?rev=1226236&r1=1226235&r2=1226236&view=diff
==============================================================================
--- lucene/dev/trunk/modules/facet/src/java/overview.html (original)
+++ lucene/dev/trunk/modules/facet/src/java/overview.html Sun Jan 1 11:41:30 2012
@@ -21,6 +21,7 @@
</title>
</head>
<body>
- Provides faceted indexing and search capabilities (checkout the <a href="userguide.html">userguide</a>).
+ <!-- NOTE: if you update the userguide link, also update the one in o.a.l.facet/package.html -->
+ Provides faceted indexing and search capabilities (checkout the <a href="org/apache/lucene/facet/doc-files/userguide.html">userguide</a>).
</body>
-</html>
\ No newline at end of file
+</html>