You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/09/21 01:38:00 UTC
svn commit: r1388271 - in /lucene/dev/trunk: ./ lucene/ lucene/site/
lucene/site/xsl/ solr/ solr/contrib/ solr/contrib/dataimporthandler-extras/
solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/
solr/contrib/uima/src/java/org/...
Author: uschindler
Date: Thu Sep 20 23:37:58 2012
New Revision: 1388271
URL: http://svn.apache.org/viewvc?rev=1388271&view=rev
Log:
SOLR-3733: better organization of javadocs in release
Added:
lucene/dev/trunk/solr/site/ (props changed)
- copied from r1388269, lucene/dev/branches/solr3733/solr/site/
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java
- copied unchanged from r1388269, lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java
Removed:
lucene/dev/trunk/solr/core/src/java/doc-files/
lucene/dev/trunk/solr/solrj/src/java/org/apache/zookeeper/
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/build.xml
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/build.xml (contents, props changed)
lucene/dev/trunk/lucene/site/ (props changed)
lucene/dev/trunk/lucene/site/xsl/index.xsl
lucene/dev/trunk/solr/ (props changed)
lucene/dev/trunk/solr/README.txt (contents, props changed)
lucene/dev/trunk/solr/build.xml (contents, props changed)
lucene/dev/trunk/solr/common-build.xml (contents, props changed)
lucene/dev/trunk/solr/contrib/ (props changed)
lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java
lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java
lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
lucene/dev/trunk/solr/core/ (props changed)
lucene/dev/trunk/solr/core/build.xml
lucene/dev/trunk/solr/core/src/java/overview.html
lucene/dev/trunk/solr/solrj/ (props changed)
lucene/dev/trunk/solr/solrj/build.xml
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java
lucene/dev/trunk/solr/test-framework/ (props changed)
lucene/dev/trunk/solr/test-framework/build.xml
Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Thu Sep 20 23:37:58 2012
@@ -25,7 +25,7 @@
</target>
<target name="precommit" description="Run basic checks before committing"
- depends="check-svn-working-copy,validate,javadocs-lint"/>
+ depends="check-svn-working-copy,validate,documentation-lint"/>
<target name="test" description="Test both Lucene and Solr">
<sequential>
@@ -47,16 +47,16 @@
<target name="javadocs" description="Generate Lucene and Solr javadocs">
<sequential>
- <subant target="javadocs" inheritall="false" failonerror="true">
+ <subant target="documentation" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
<fileset dir="solr" includes="build.xml" />
</subant>
</sequential>
</target>
- <target name="javadocs-lint">
+ <target name="documentation-lint">
<sequential>
- <subant target="javadocs-lint" inheritall="false" failonerror="true">
+ <subant target="documentation-lint" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
<fileset dir="solr" includes="build.xml" />
</subant>
@@ -305,7 +305,7 @@
</target>
<!-- Jenkins tasks -->
- <target name="jenkins-hourly" depends="clean,test,validate,-jenkins-javadocs-lint,jar-checksums,check-svn-working-copy" description="Runs the Jenkins hourly test runs"/>
+ <target name="jenkins-hourly" depends="clean,test,validate,-jenkins-documentation-lint,jar-checksums,check-svn-working-copy" description="Runs the Jenkins hourly test runs"/>
<target name="jenkins-clover" description="Runs nightly clover builds on Jenkins">
<antcall target="-jenkins-clover">
@@ -325,11 +325,11 @@
description="Runs the nightly Maven build on Jenkins, including artifact deployment"/>
<!-- we need this extra condition, as we want to match only on "true", not solely if property is set: -->
- <property name="disable.javadocs-lint" value="false" />
- <condition property="-disable.javadocs-lint">
- <istrue value="${disable.javadocs-lint}"/>
+ <property name="disable.documentation-lint" value="false" />
+ <condition property="-disable.documentation-lint">
+ <istrue value="${disable.documentation-lint}"/>
</condition>
- <target name="-jenkins-javadocs-lint" unless="-disable.javadocs-lint">
- <antcall target="javadocs-lint"/>
+ <target name="-jenkins-documentation-lint" unless="-disable.documentation-lint">
+ <antcall target="documentation-lint"/>
</target>
</project>
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Thu Sep 20 23:37:58 2012
@@ -225,7 +225,7 @@
<target name="javadocs" description="Generate javadoc" depends="javadocs-lucene-core, javadocs-modules, javadocs-test-framework"/>
<!-- we check for broken links across all documentation -->
- <target name="javadocs-lint" depends="documentation">
+ <target name="documentation-lint" depends="documentation">
<sequential>
<check-broken-links dir="build/docs"/>
<!-- TODO: change this level=class -->
Modified: lucene/dev/trunk/lucene/site/xsl/index.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/site/xsl/index.xsl?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/site/xsl/index.xsl (original)
+++ lucene/dev/trunk/lucene/site/xsl/index.xsl Thu Sep 20 23:37:58 2012
@@ -35,7 +35,7 @@
<title><xsl:text>Apache Lucene </xsl:text><xsl:value-of select="$version"/><xsl:text> Documentation</xsl:text></title>
</head>
<body>
- <div><img src="lucene_green_300.gif"/></div>
+ <div><a href="http://lucene.apache.org/core/"><img src="lucene_green_300.gif" title="Apache Lucene Logo" alt="Lucene" border="0"/></a></div>
<h1><xsl:text>Apache Lucene </xsl:text><xsl:value-of select="$version"/><xsl:text> Documentation</xsl:text></h1>
<p>Lucene is a Java full-text search engine. Lucene is not a complete application,
but rather a code library and API that can easily be used to add search capabilities
Modified: lucene/dev/trunk/solr/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/README.txt?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/README.txt (original)
+++ lucene/dev/trunk/solr/README.txt Thu Sep 20 23:37:58 2012
@@ -31,7 +31,7 @@ Getting Started
See the "example" directory for an example Solr setup. A tutorial
using the example setup can be found at
http://lucene.apache.org/solr/tutorial.html
-or linked from "docs/api/index.html" in a binary distribution.
+or linked from "docs/index.html" in a binary distribution.
Also, there are Solr clients for many programming languages, see
http://wiki.apache.org/solr/IntegratingSolr
@@ -54,7 +54,7 @@ dist/apache-solr-XX.jar
Apache Solr Plugins (see http://wiki.apache.org/solr/SolrPlugins for
more information).
-docs/api/index.html
+docs/index.html
The Apache Solr Javadoc API documentation and Tutorial
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Thu Sep 20 23:37:58 2012
@@ -26,7 +26,7 @@
<echo message="Use 'ant clean' to clean compiled files." />
<echo message="Use 'ant compile' to compile the source code." />
<echo message="Use 'ant dist' to build the project WAR and JAR files." />
- <echo message="Use 'ant javadocs' to build javadocs under build/docs/api" />
+ <echo message="Use 'ant documentation' to build documentation." />
<echo message="Use 'ant generate-maven-artifacts' to generate maven artifacts." />
<echo message="Use 'ant package' to generate zip, tgz for distribution." />
<!--<echo message="Use 'ant luke' to start luke. see: http://luke.googlecode.com" />-->
@@ -138,9 +138,42 @@
<target name="compile-test" description="Compile unit tests."
depends="compile-solr-test-framework, compile-test-solr-core, compile-test-solrj, compile-test-contrib"/>
<target name="javadocs" description="Calls javadocs-all, javadocs-solrj, and javadocs-test-framework"
- depends="javadocs-all,javadocs-solrj,javadocs-test-framework"/>
+ depends="javadocs-solr-core,javadocs-solrj,javadocs-test-framework,javadocs-contrib"/>
+ <target name="documentation" description="Generate all documentation"
+ depends="javadocs,changes-to-html,process-webpages"/>
<target name="compile-core" depends="compile-solr-core" unless="solr.core.compiled"/>
+ <target name="process-webpages" depends="define-lucene-javadoc-url"> <!--depends="resolve-pegdown">-->
+ <makeurl property="process-webpages.buildfiles" separator="|">
+ <fileset dir="." includes="core/build.xml,test-framework/build.xml,solrj/build.xml,contrib/**/build.xml"/>
+ </makeurl>
+ <!--
+ The XSL input file is ignored completely, but XSL expects one to be given,
+ so we pass ourself (${ant.file}) here. The list of module build.xmls is given
+ via string parameter, that must be splitted by the XSL at '|'.
+ -->
+ <xslt in="${ant.file}" out="${javadoc.dir}/index.html" style="site/xsl/index.xsl" force="true">
+ <outputproperty name="method" value="html"/>
+ <outputproperty name="version" value="4.0"/>
+ <outputproperty name="encoding" value="UTF-8"/>
+ <outputproperty name="indent" value="yes"/>
+ <param name="buildfiles" expression="${process-webpages.buildfiles}"/>
+ <param name="version" expression="${version}"/>
+ <param name="luceneJavadocUrl" expression="${lucene.javadoc.url}"/>
+ </xslt>
+
+ <!--nothing at the moment:
+ <pegdown todir="${javadoc.dir}">
+ <fileset dir="." includes="MIGRATE.txt,JRE_VERSION_MIGRATION.txt"/>
+ <globmapper from="*.txt" to="*.html"/>
+ </pegdown>
+ -->
+
+ <copy todir="${javadoc.dir}">
+ <fileset dir="site/html" includes="**/*"/>
+ </copy>
+ </target>
+
<!-- Solr core targets -->
<target name="test-solr-core" description="Test solr core">
<ant dir="core" target="test" inheritAll="false">
@@ -154,11 +187,6 @@
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
</target>
- <target name="javadocs-solrj">
- <ant dir="solrj" target="javadocs" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- </target>
<!-- Solr contrib targets -->
<target name="test-contrib" description="Run contrib unit tests.">
@@ -430,7 +458,7 @@
dist/solrj-lib/*
dist/test-framework/**"
excludes="**/*.tgz **/*.zip **/*.md5 **/*src*.jar **/*docs*.jar **/*.sha1" />
- <tarfileset dir="${dest}/docs"
+ <tarfileset dir="${javadoc.dir}"
prefix="${fullnamever}/docs" />
</tar>
<make-checksums file="${package.dir}/${fullnamever}.tgz"/>
@@ -496,66 +524,12 @@
</sequential>
</target>
- <!-- since we build across all contribs, we must ensure all deps
- are resolved -->
- <target name="javadocs-all"
- depends="resolve,prep-lucene-jars,javadocs-dep,lucene-javadocs,define-lucene-javadoc-url"
- description="Generate javadoc for core, java client and contrib">
- <sequential>
- <mkdir dir="${dest}/docs/api"/>
-
- <!-- TODO: optimize this, thats stupid here: -->
- <subant target="module-jars-to-solr">
- <fileset dir="contrib/analysis-extras" includes="build.xml"/>
- </subant>
-
- <!-- TODO: optimize this, thats stupid here: -->
- <subant target="module-jars-to-solr">
- <fileset dir="contrib/uima" includes="build.xml"/>
- </subant>
-
- <path id="javadoc.classpath">
- <path refid="test.classpath"/>
- <fileset dir="${dest}/contrib">
- <include name="**/lucene-libs/**/*.jar"/>
- </fileset>
- <fileset dir="contrib">
- <include name="**/lib/**/*.jar"/>
- <exclude name="**/analysis-extras/lib/**/*icu4j*.jar"/> <!-- extraction/lib/ has this one -->
- </fileset>
- <pathelement location="${dest}/solr-solrj/classes/java"/>
- </path>
-
- <solr-invoke-javadoc destdir="${dest}/docs/api"
- overview="core/src/java/overview.html">
- <solrsources>
- <packageset dir="core/src/java" />
- <packageset dir="solrj/src/java" />
- <packageset dir="contrib/analysis-extras/src/java"/>
- <packageset dir="contrib/clustering/src/java"/>
- <packageset dir="contrib/dataimporthandler/src/java"/>
- <packageset dir="contrib/dataimporthandler-extras/src/java"/>
- <packageset dir="contrib/extraction/src/java"/>
- <packageset dir="contrib/langid/src/java"/>
- <packageset dir="contrib/uima/src/java"/>
- <group title="Core" packages="org.apache.*" />
- <group title="SolrJ" packages="org.apache.solr.common.*,org.apache.solr.client.solrj.*,org.apache.zookeeper.*" />
- <group title="contrib: Clustering" packages="org.apache.solr.handler.clustering*" />
- <group title="contrib: DataImportHandler" packages="org.apache.solr.handler.dataimport*" />
- <group title="contrib: Solr Cell" packages="org.apache.solr.handler.extraction*" />
- <group title="contrib: Solr LangId" packages="org.apache.solr.update.processor.LanguageIdentifier*,org.apache.solr.update.processor.LangIdParams*,org.apache.solr.update.processor.DetectedLanguage*" />
- <group title="contrib: Solr UIMA" packages="org.apache.solr.uima*" />
- </solrsources>
- </solr-invoke-javadoc>
- </sequential>
- </target>
-
<!-- TODO: does solr have any other docs we should check? -->
<!-- TODO: also integrate checkJavaDocs.py, which does more checks -->
- <target name="javadocs-lint" depends="javadocs">
- <check-broken-links dir="build/docs"/>
+ <target name="documentation-lint" depends="documentation">
+ <check-broken-links dir="${javadoc.dir}"/>
<!-- TODO: add missing package.htmls and bump this to level=package -->
- <check-missing-javadocs dir="build/docs" level="none"/>
+ <check-missing-javadocs dir="${javadoc.dir}" level="none"/>
</target>
<!-- install-maven-tasks is *not* a useless dependency. do not remove -->
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Thu Sep 20 23:37:58 2012
@@ -25,9 +25,6 @@
<property name="Name" value="Solr" />
<property name="version" value="5.0-SNAPSHOT"/>
- <condition property="version.contains.SNAPSHOT">
- <contains casesensitive="true" string="${version}" substring="-SNAPSHOT"/>
- </condition>
<property name="fullname" value="apache-${ant.project.name}"/>
<property name="fullnamever" value="${fullname}-${version}"/>
<property name="final.name" value="${fullnamever}"/>
@@ -37,16 +34,16 @@
<property name="javac.target" value="1.6"/>
<property name="javac.args" value=""/>
- <property name="dest" value="${common-solr.dir}/build" />
+ <property name="dest" location="${common-solr.dir}/build" />
<property name="build.dir" location="${dest}/${ant.project.name}"/>
<property name="dist" location="${common-solr.dir}/dist"/>
<property name="package.dir" location="${common-solr.dir}/package"/>
<property name="maven.dist.dir" location="${package.dir}/maven"/>
<property name="lucene-libs" location="${dest}/lucene-libs" />
- <property name="tests.userdir" value="src/test-files"/>
- <property name="example" value="${common-solr.dir}/example" />
- <property name="javadoc.dir" location="${build.dir}/docs/api"/>
- <property name="tests.loggingfile" value="${common-solr.dir}/testlogging.properties"/>
+ <property name="tests.userdir" location="src/test-files"/>
+ <property name="example" location="${common-solr.dir}/example" />
+ <property name="javadoc.dir" location="${dest}/docs"/>
+ <property name="tests.loggingfile" location="${common-solr.dir}/testlogging.properties"/>
<property name="tests.cleanthreads.sysprop" value="perClass"/>
<property name="changes.target.dir" value="${dest}/docs/changes"/>
@@ -200,22 +197,53 @@
<target name="lucene-javadocs" depends="javadocs-lucene-core,javadocs-analyzers-common,javadocs-analyzers-icu,javadocs-analyzers-kuromoji,javadocs-analyzers-phonetic,javadocs-analyzers-smartcn,javadocs-analyzers-morfologik,javadocs-analyzers-stempel,javadocs-analyzers-uima,javadocs-suggest,javadocs-grouping,javadocs-queries,javadocs-queryparser,javadocs-highlighter,javadocs-memory,javadocs-misc,javadocs-spatial,javadocs-test-framework"/>
<!-- create javadocs for the current module -->
- <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs">
+ <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solr-core">
<sequential>
- <mkdir dir="${javadoc.dir}"/>
+ <mkdir dir="${javadoc.dir}/${name}"/>
<solr-invoke-javadoc>
<solrsources>
<packageset dir="${src.dir}"/>
</solrsources>
+ <links>
+ <link href="../solr-solrj"/>
+ <link href="../solr-core"/>
+ </links>
</solr-invoke-javadoc>
- <solr-jarify basedir="${javadoc.dir}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
+ <solr-jarify basedir="${javadoc.dir}/${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
</sequential>
</target>
+ <target name="check-solr-core-javadocs-uptodate" unless="solr-core-javadocs.uptodate">
+ <uptodate property="solr-core-javadocs.uptodate" targetfile="${build.dir}/solr-core/apache-solr-core-${version}-javadoc.jar">
+ <srcfiles dir="${common-solr.dir}/core/src/java" includes="**/*.java"/>
+ </uptodate>
+ </target>
+
+ <target name="check-solrj-javadocs-uptodate" unless="solrj-javadocs.uptodate">
+ <uptodate property="solrj-javadocs.uptodate" targetfile="${build.dir}/solr-solrj/apache-solr-solrj-${version}-javadoc.jar">
+ <srcfiles dir="${common-solr.dir}/solrj/src/java" includes="**/*.java"/>
+ </uptodate>
+ </target>
+
+ <target name="javadocs-solr-core" depends="check-solr-core-javadocs-uptodate" unless="solr-core-javadocs.uptodate">
+ <ant dir="${common-solr.dir}/core" target="javadocs" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="solr-core-javadocs.uptodate" value="true"/>
+ </target>
+
+ <target name="javadocs-solrj" depends="check-solrj-javadocs-uptodate" unless="solrj-javadocs.uptodate">
+ <ant dir="${common-solr.dir}/solrj" target="javadocs" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="solrj-javadocs.uptodate" value="true"/>
+ </target>
+
<!-- macro to create solr javadocs with links to lucene. make sure calling task depends on lucene-javadocs -->
<macrodef name="solr-invoke-javadoc">
<element name="solrsources" optional="yes"/>
- <attribute name="destdir" default="${javadoc.dir}"/>
+ <element name="links" optional="yes"/>
+ <attribute name="destdir" default="${javadoc.dir}/${name}"/>
<attribute name="title" default="${Name} ${version} ${name} API"/>
<attribute name="overview" default="${src.dir}/overview.html"/>
<sequential>
@@ -240,29 +268,26 @@
<link offline="true" href="${lucene.javadoc.url}memory" packagelistloc="${lucenedocs}/memory"/>
<link offline="true" href="${lucene.javadoc.url}misc" packagelistloc="${lucenedocs}/misc"/>
<link offline="true" href="${lucene.javadoc.url}spatial" packagelistloc="${lucenedocs}/spatial"/>
+ <links/>
<link href=""/>
</sources>
</invoke-javadoc>
</sequential>
</macrodef>
- <target name="define-lucene-javadoc-url"
- depends="define-lucene-javadoc-url-SNAPSHOT,define-lucene-javadoc-url-release"/>
-
- <target name="define-lucene-javadoc-url-SNAPSHOT" if="version.contains.SNAPSHOT">
- <makeurl file="${common.dir}/build/docs/" validate="false" property="lucene.javadoc.url"/>
- </target>
-
- <target name="define-lucene-javadoc-url-release" unless="version.contains.SNAPSHOT">
- <loadproperties>
- <propertyresource name="version"/>
- <filterchain>
- <replaceregex pattern="[.]" replace="_" flags="g"/>
- <prefixlines prefix="underscore.version="/>
- </filterchain>
- </loadproperties>
- <property name="lucene.javadoc.url"
- value="http://lucene.apache.org/java/${underscore.version}/"/>
+ <target name="define-lucene-javadoc-url" unless="lucene.javadoc.url">
+ <script language="javascript"><![CDATA[
+ var url, version = project.getProperty('version');
+ if (version.contains('-SNAPSHOT')) {
+ importClass(java.io.File);
+ url = new File(project.getProperty('common.dir'), 'build' + File.separator + 'docs').toURI().toASCIIString();
+ if (!(/\/$/.test(url))) url += '/';
+ } else {
+ version = version.replace('.', '_');
+ url = 'http://lucene.apache.org/core/' + version + '/';
+ }
+ project.setProperty('lucene.javadoc.url', url);
+ ]]></script>
</target>
<target name="jar-src" depends="init">
@@ -393,10 +418,15 @@
<target name="compile-contrib" description="Compile contrib modules">
<contrib-crawl target="compile-core"/>
</target>
+
<target name="compile-test-contrib" description="Compile contrib modules' tests">
<contrib-crawl target="compile-test"/>
</target>
+ <target name="javadocs-contrib" description="Compile contrib modules">
+ <contrib-crawl target="javadocs"/>
+ </target>
+
<target name="contribs-add-to-war">
<mkdir dir="${dest}/web"/>
<delete dir="${dest}/web" includes="**/*" failonerror="false"/>
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml Thu Sep 20 23:37:58 2012
@@ -65,6 +65,30 @@
<path refid="classpath"/>
</path>
+ <!-- TODO: make this nicer like lucene? -->
+ <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solr-core,javadocs-dataimporthandler">
+ <sequential>
+ <mkdir dir="${javadoc.dir}/${name}"/>
+ <solr-invoke-javadoc>
+ <solrsources>
+ <packageset dir="${src.dir}"/>
+ </solrsources>
+ <links>
+ <link href="../solr-solrj"/>
+ <link href="../solr-core"/>
+ <link href="../solr-dataimporthandler"/>
+ </links>
+ </solr-invoke-javadoc>
+ <solr-jarify basedir="${javadoc.dir}/${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
+ </sequential>
+ </target>
+
+ <target name="javadocs-dataimporthandler">
+ <ant dir="${common-solr.dir}/contrib/dataimporthandler" target="javadocs" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ </target>
+
<target name="compile-core" depends="compile-solr-dataimporthandler,resolve-extraction-libs,solr-contrib-build.compile-core"/>
<target name="compile-test" depends="compile-solr-dataimporthandler-tests, common-solr.compile-test"/>
</project>
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java Thu Sep 20 23:37:58 2012
@@ -193,7 +193,7 @@ public class ContextImpl extends Context
}
}
- public void setDoc(DocBuilder.DocWrapper docWrapper) {
+ void setDoc(DocBuilder.DocWrapper docWrapper) {
this.doc = docWrapper;
}
Modified: lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java Thu Sep 20 23:37:58 2012
@@ -40,7 +40,7 @@ public class SolrUIMAConfiguration {
private String logField;
- public SolrUIMAConfiguration(String aePath, String[] fieldsToAnalyze, boolean fieldsMerging,
+ SolrUIMAConfiguration(String aePath, String[] fieldsToAnalyze, boolean fieldsMerging,
Map<String, Map<String, MapField>> typesFeaturesFieldsMapping,
Map<String, Object> runtimeParameters, boolean ignoreErrors, String logField) {
this.aePath = aePath;
@@ -60,7 +60,7 @@ public class SolrUIMAConfiguration {
return fieldsMerging;
}
- public Map<String, Map<String, MapField>> getTypesFeaturesFieldsMapping() {
+ Map<String, Map<String, MapField>> getTypesFeaturesFieldsMapping() {
return typesFeaturesFieldsMapping;
}
Modified: lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java Thu Sep 20 23:37:58 2012
@@ -54,7 +54,7 @@ public class UIMAToSolrMapper {
* @param typeName name of UIMA type to map
* @param featureFieldsmapping
*/
- public void map(String typeName, Map<String, MapField> featureFieldsmapping) throws FieldMappingException {
+ void map(String typeName, Map<String, MapField> featureFieldsmapping) throws FieldMappingException {
try {
Type type = cas.getTypeSystem().getType(typeName);
for (FSIterator<FeatureStructure> iterator = cas.getFSIndexRepository().getAllIndexedFS(type); iterator
Modified: lucene/dev/trunk/solr/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/build.xml?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/build.xml (original)
+++ lucene/dev/trunk/solr/core/build.xml Thu Sep 20 23:37:58 2012
@@ -25,5 +25,21 @@
<target name="compile-core" depends="compile-solrj,common-solr.compile-core"/>
+ <!-- specialized to ONLY depend on solrj -->
+ <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solrj">
+ <sequential>
+ <mkdir dir="${javadoc.dir}/${name}"/>
+ <solr-invoke-javadoc>
+ <solrsources>
+ <packageset dir="${src.dir}"/>
+ </solrsources>
+ <links>
+ <link href="../solr-solrj"/>
+ </links>
+ </solr-invoke-javadoc>
+ <solr-jarify basedir="${javadoc.dir}/${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
+ </sequential>
+ </target>
+
<target name="dist-maven" depends="dist-maven-src-java"/>
</project>
Modified: lucene/dev/trunk/solr/core/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/overview.html?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/overview.html (original)
+++ lucene/dev/trunk/solr/core/src/java/overview.html Thu Sep 20 23:37:58 2012
@@ -16,6 +16,6 @@
-->
<html>
<body>
-Apache Solr Search Server, new users should familiarize themselves with the <a href="doc-files/tutorial.html">Solr Tutorial</a>.
+Apache Solr Search Server (Core Javadocs).
</body>
</html>
Modified: lucene/dev/trunk/solr/solrj/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/build.xml?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/build.xml (original)
+++ lucene/dev/trunk/solr/solrj/build.xml Thu Sep 20 23:37:58 2012
@@ -33,6 +33,19 @@
<path refid="solr.base.classpath"/>
</path>
+ <!-- Specialized to depend on nothing -->
+ <target name="javadocs" depends="compile-core,define-lucene-javadoc-url">
+ <sequential>
+ <mkdir dir="${javadoc.dir}/${name}"/>
+ <solr-invoke-javadoc>
+ <solrsources>
+ <packageset dir="${src.dir}"/>
+ </solrsources>
+ </solr-invoke-javadoc>
+ <solr-jarify basedir="${javadoc.dir}/${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
+ </sequential>
+ </target>
+
<target name="dist" depends="common-solr.dist">
<mkdir dir="${dist}/solrj-lib" />
<copy todir="${dist}/solrj-lib">
@@ -42,12 +55,5 @@
</copy>
</target>
- <target name="javadocs" depends="common-solr.javadocs">
- <mkdir dir="${dest}/docs/api/solrj"/>
- <copy todir="${dest}/docs/api/solrj">
- <fileset dir="${javadoc.dir}"/>
- </copy>
- </target>
-
<target name="dist-maven" depends="dist-maven-src-java"/>
</project>
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java Thu Sep 20 23:37:58 2012
@@ -21,7 +21,6 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.TimeoutException;
import org.apache.solr.common.SolrException;
-import org.apache.zookeeper.SolrZooKeeper;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.Watcher.Event.KeeperState;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java Thu Sep 20 23:37:58 2012
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.concurrent.TimeoutException;
import org.apache.solr.common.SolrException;
-import org.apache.zookeeper.SolrZooKeeper;
import org.apache.zookeeper.Watcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java Thu Sep 20 23:37:58 2012
@@ -39,7 +39,6 @@ import org.apache.solr.common.cloud.ZkCl
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.NoNodeException;
-import org.apache.zookeeper.SolrZooKeeper;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.ZooKeeper;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java Thu Sep 20 23:37:58 2012
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.concurrent.TimeoutException;
import org.apache.solr.common.SolrException;
-import org.apache.zookeeper.SolrZooKeeper;
import org.apache.zookeeper.Watcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/dev/trunk/solr/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/build.xml?rev=1388271&r1=1388270&r2=1388271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/build.xml (original)
+++ lucene/dev/trunk/solr/test-framework/build.xml Thu Sep 20 23:37:58 2012
@@ -37,7 +37,7 @@
</ant>
</target>
- <target name="compile-core" depends="compile-solr-core, compile-test-framework">
+ <target name="compile-core" depends="resolve, compile-solr-core, compile-test-framework">
<compile srcdir="${src.dir}" destdir="${build.dir}/classes/java">
<classpath refid="test.base.classpath"/>
</compile>
@@ -48,7 +48,7 @@
<target name="javadocs"
depends="compile-core,jar-test-framework,lucene-javadocs,javadocs-test-framework,define-lucene-javadoc-url">
<sequential>
- <mkdir dir="${javadoc.dir}"/>
+ <mkdir dir="${javadoc.dir}/${name}"/>
<!-- NOTE: explicitly not using solr-invoke-javadoc, or attempting to
link to lucene-test-framework because if we did javadoc would
attempt to link class refs in in org.apache.lucene, causing
@@ -56,7 +56,7 @@
lucene-test-framework was first, or broken links to things like
LuceneTestCase if lucene-core was first)
-->
- <invoke-javadoc destdir="${javadoc.dir}"
+ <invoke-javadoc destdir="${javadoc.dir}/${name}"
title="${Name} ${version} Test Framework API">
<sources>
<link offline="true" href="${javadoc.link.junit}"
@@ -64,11 +64,7 @@
<packageset dir="${src.dir}"/>
</sources>
</invoke-javadoc>
- <solr-jarify basedir="${javadoc.dir}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
- <mkdir dir="${dest}/docs/api/test-framework"/>
- <copy todir="${dest}/docs/api/test-framework">
- <fileset dir="${javadoc.dir}"/>
- </copy>
+ <solr-jarify basedir="${javadoc.dir}/${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
</sequential>
</target>