Author: jerome
Date: Thu Mar 30 14:06:18 2006
New Revision: 390254
URL: http://svn.apache.org/viewcvs?rev=390254&view=rev
Log:
Add some plugins groups in the javadoc
Modified:
lucene/nutch/trunk/build.xml
lucene/nutch/trunk/default.properties
Modified: lucene/nutch/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/build.xml?rev=390254&r1=390253&r2=390254&view=diff
==============================================================================
--- lucene/nutch/trunk/build.xml (original)
+++ lucene/nutch/trunk/build.xml Thu Mar 30 14:06:18 2006
@@ -254,52 +254,64 @@
<arg value="${javadoc.proxy.host}"/>
<arg value="${javadoc.proxy.port}"/>
- <packageset dir="${src.dir}"/>
- <packageset dir="${plugins.dir}/lib-http/src/java"/>
- <packageset dir="${plugins.dir}/lib-parsems/src/java"/>
- <packageset dir="${plugins.dir}/lib-regex-filter/src/java"/>
- <packageset dir="${plugins.dir}/microformats-reltag/src/java"/>
- <packageset dir="${plugins.dir}/ontology/src/java"/>
- <packageset dir="${plugins.dir}/protocol-file/src/java"/>
- <packageset dir="${plugins.dir}/protocol-ftp/src/java"/>
- <packageset dir="${plugins.dir}/protocol-http/src/java"/>
- <packageset dir="${plugins.dir}/protocol-httpclient/src/java"/>
- <packageset dir="${plugins.dir}/parse-ext/src/java"/>
- <packageset dir="${plugins.dir}/parse-html/src/java"/>
- <packageset dir="${plugins.dir}/parse-js/src/java"/>
- <packageset dir="${plugins.dir}/parse-text/src/java"/>
- <packageset dir="${plugins.dir}/parse-pdf/src/java"/>
-<!-- <packageset dir="${plugins.dir}/parse-rtf/src/java"/> plugin excluded
from build due to licensing issues-->
-<!-- <packageset dir="${plugins.dir}/parse-mp3/src/java"/> plugin excluded
from build due to licensing issues-->
- <packageset dir="${plugins.dir}/parse-msexcel/src/java"/>
- <packageset dir="${plugins.dir}/parse-mspowerpoint/src/java"/>
- <packageset dir="${plugins.dir}/parse-msword/src/java"/>
- <packageset dir="${plugins.dir}/parse-rss/src/java"/>
- <packageset dir="${plugins.dir}/parse-swf/src/java"/>
- <packageset dir="${plugins.dir}/parse-zip/src/java"/>
- <packageset dir="${plugins.dir}/index-basic/src/java"/>
- <packageset dir="${plugins.dir}/index-more/src/java"/>
- <packageset dir="${plugins.dir}/query-more/src/java"/>
- <packageset dir="${plugins.dir}/query-site/src/java"/>
- <packageset dir="${plugins.dir}/query-url/src/java"/>
- <packageset dir="${plugins.dir}/urlfilter-automaton/src/java"/>
- <packageset dir="${plugins.dir}/urlfilter-regex/src/java"/>
- <packageset dir="${plugins.dir}/urlfilter-prefix/src/java"/>
- <packageset dir="${plugins.dir}/creativecommons/src/java"/>
- <packageset dir="${plugins.dir}/languageidentifier/src/java"/>
- <packageset dir="${plugins.dir}/clustering-carrot2/src/java"/>
- <packageset dir="${plugins.dir}/ontology/src/java"/>
- <link href="${javadoc.link.java}"/>
- <link href="${javadoc.link.lucene}"/>
- <link href="${javadoc.link.hadoop}"/>
- <classpath refid="classpath"/>
+ <packageset dir="${src.dir}"/>
+ <packageset dir="${plugins.dir}/lib-http/src/java"/>
+ <packageset dir="${plugins.dir}/lib-parsems/src/java"/>
+ <packageset dir="${plugins.dir}/lib-regex-filter/src/java"/>
+ <packageset dir="${plugins.dir}/microformats-reltag/src/java"/>
+ <packageset dir="${plugins.dir}/ontology/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-file/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-ftp/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-http/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-httpclient/src/java"/>
+ <packageset dir="${plugins.dir}/parse-ext/src/java"/>
+ <packageset dir="${plugins.dir}/parse-html/src/java"/>
+ <packageset dir="${plugins.dir}/parse-js/src/java"/>
+ <packageset dir="${plugins.dir}/parse-text/src/java"/>
+ <packageset dir="${plugins.dir}/parse-pdf/src/java"/>
+<!-- <packageset dir="${plugins.dir}/parse-rtf/src/java"/> plugin excluded
from build due to licensing issues-->
+<!-- <packageset dir="${plugins.dir}/parse-mp3/src/java"/> plugin excluded
from build due to licensing issues-->
+ <packageset dir="${plugins.dir}/parse-msexcel/src/java"/>
+ <packageset dir="${plugins.dir}/parse-mspowerpoint/src/java"/>
+ <packageset dir="${plugins.dir}/parse-msword/src/java"/>
+ <packageset dir="${plugins.dir}/parse-rss/src/java"/>
+ <packageset dir="${plugins.dir}/parse-swf/src/java"/>
+ <packageset dir="${plugins.dir}/parse-zip/src/java"/>
+ <packageset dir="${plugins.dir}/index-basic/src/java"/>
+ <packageset dir="${plugins.dir}/index-more/src/java"/>
+ <packageset dir="${plugins.dir}/query-more/src/java"/>
+ <packageset dir="${plugins.dir}/query-site/src/java"/>
+ <packageset dir="${plugins.dir}/query-url/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-automaton/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-regex/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-prefix/src/java"/>
+ <packageset dir="${plugins.dir}/creativecommons/src/java"/>
+ <packageset dir="${plugins.dir}/languageidentifier/src/java"/>
+ <packageset dir="${plugins.dir}/clustering-carrot2/src/java"/>
+ <packageset dir="${plugins.dir}/ontology/src/java"/>
+
+ <link href="${javadoc.link.java}"/>
+ <link href="${javadoc.link.lucene}"/>
+ <link href="${javadoc.link.hadoop}"/>
+
+ <classpath refid="classpath"/>
<classpath>
<fileset dir="${plugins.dir}" >
<include name="**/*.jar"/>
</fileset>
</classpath>
- <group title="Core" packages="org.apache.nutch.*"/>
- <group title="Plugins" packages="${plugins.packages}"/>
+
+ <group title="Core" packages="org.apache.nutch.*"/>
+ <group title="Plugins API" packages="${plugins.api}"/>
+ <group title="Protocol Plugins" packages="${plugins.protocol}"/>
+ <group title="URL Filter Plugins" packages="${plugins.urlfilter}"/>
+ <group title="Parse Plugins" packages="${plugins.parse}"/>
+ <group title="Analysis Plugins" packages="${plugins.analysis}"/>
+ <group title="Indexing Filter Plugins" packages="${plugins.index}"/>
+ <group title="Query Filter Plugins" packages="${plugins.query}"/>
+ <group title="Clustering Plugins" packages="${plugins.clustering}"/>
+ <group title="Ontology Plugins" packages="${plugins.ontology}"/>
+ <group title="Misc. Plugins" packages="${plugins.misc}"/>
</javadoc>
</target>
Modified: lucene/nutch/trunk/default.properties
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/default.properties?rev=390254&r1=390253&r2=390254&view=diff
==============================================================================
--- lucene/nutch/trunk/default.properties (original)
+++ lucene/nutch/trunk/default.properties Thu Mar 30 14:06:18 2006
@@ -47,71 +47,92 @@
javac.deprecation=off
javac.version= 1.4
-# The list of packages assigned to plugins group in javadoc
-# (please keep this list ordered)
-plugin.basic=org.apache.nutch.indexer.basic*
-plugin.carrot2=org.apache.nutch.clustering.carrot2*
-plugin.creative=org.creativecommons.nutch*
-plugin.ext=org.apache.nutch.parse.ext*
-plugin.file=org.apache.nutch.protocol.file*
-plugin.ftp=org.apache.nutch.protocol.ftp*
-plugin.html=org.apache.nutch.parse.html*
-plugin.http=org.apache.nutch.protocol.http*
-plugin.httpclient=org.apache.nutch.protocol.httpclient*
-plugin.js=org.apache.nutch.parse.js*
-plugin.language=org.apache.nutch.analysis.lang*
-plugin.libhttp=org.apache.nutch.protocol.http.api*
-plugin.liburlfilter=org.apache.nutch.urlfilter.api*
-plugin.more=org.apache.nutch.indexer.more*:org.apache.nutch.searcher.more*
-plugin.mp3=org.apache.nutch.parse.mp3*
-plugin.msexcel=org.apache.nutch.parse.msexcel*
-plugin.mspowerpoint=org.apache.nutch.parse.mspowerpoint*
-plugin.msword=org.apache.nutch.parse.msword*
-plugin.ontology.jena=org.apache.nutch.ontology.jena*
-plugin.parsems=org.apache.nutch.parse.ms*
-plugin.pdf=org.apache.nutch.parse.pdf*
-plugin.reltag=org.apache.nutch.microformats.reltag*
-plugin.rss=org.apache.nutch.parse.rss*
-plugin.rtf=org.apache.nutch.parse.rtf*
-plugin.site=org.apache.nutch.searcher.site*
-plugin.swf=org.apache.nutch.parse.swf*
-plugin.text=org.apache.nutch.parse.text*
-plugin.url=org.apache.nutch.searcher.url*
-plugin.urlfilter.automaton=org.apache.nutch.urlfilter.automaton*
-plugin.urlfilter.prefix=org.apache.nutch.urlfilter.prefix*
-plugin.urlfilter.regex=org.apache.nutch.urlfilter.regex*
-plugin.zip=org.apache.nutch.parse.zip*
-
-plugins.packages=\
- ${plugin.basic}:\
- ${plugin.carrot2}:\
- ${plugin.creative}:\
- ${plugin.ext}:\
- ${plugin.file}:\
- ${plugin.ftp}:\
- ${plugin.html}:\
- ${plugin.http}:\
- ${plugin.httpclient}:\
- ${plugin.js}:\
- ${plugin.language}:\
- ${plugin.libhttp}:\
- ${plugin.liburlfilter}:\
- ${plugin.more}:\
- ${plugin.mp3}:\
- ${plugin.msexcel}:\
- ${plugin.mspowerpoint}:\
- ${plugin.msword}:\
- ${plugin.ontology.jena}:\
- ${plugin.parsems}:\
- ${plugin.pdf}:\
- ${plugin.reltag}:\
- ${plugin.rss}:\
- ${plugin.rtf}:\
- ${plugin.site}:\
- ${plugin.swf}:\
- ${plugin.text}:\
- ${plugin.url}:\
- ${plugin.urlfilter.automaton}:\
- ${plugin.urlfilter.prefix}:\
- ${plugin.urlfilter.regex}:\
- ${plugin.zip}
+#
+# Plugins API
+#
+plugins.api=\
+ org.apache.nutch.protocol.http.api*:\
+ org.apache.nutch.urlfilter.api*:\
+ org.apache.nutch.parse.ms*
+
+#
+# Protocol Plugins
+#
+plugins.protocol=\
+ org.apache.nutch.protocol.file*:\
+ org.apache.nutch.protocol.ftp*:\
+ org.apache.nutch.protocol.http*:\
+ org.apache.nutch.protocol.httpclient*
+
+#
+# URL Filter Plugins
+#
+plugins.urlfilter=\
+ org.apache.nutch.urlfilter.automaton*:\
+ org.apache.nutch.urlfilter.prefix*:\
+ org.apache.nutch.urlfilter.regex*
+
+#
+# Parse Plugins
+#
+plugins.parse=\
+ org.apache.nutch.parse.ext*:\
+ org.apache.nutch.parse.html*:\
+ org.apache.nutch.parse.js:\
+ org.apache.nutch.parse.mp3*:\
+ org.apache.nutch.parse.msexcel*:\
+ org.apache.nutch.parse.mspowerpoint*:\
+ org.apache.nutch.parse.msword*:\
+ org.apache.nutch.parse.pdf*:\
+ org.apache.nutch.parse.rtf*:\
+ org.apache.nutch.parse.rss*:\
+ org.apache.nutch.parse.swf*:\
+ org.apache.nutch.parse.text:\
+ org.apache.nutch.parse.zip
+
+#
+# Analysis Plugins
+#
+plugins.analysis=\
+# ${plugin.analysis-de}:\
+# ${plugin.analysis-fr}
+
+#
+# Indexing Filter Plugins
+#
+plugins.index=\
+ org.apache.nutch.indexer.basic*:\
+ org.apache.nutch.indexer.more*
+
+#
+# Query Filter Plugins
+#
+plugins.query=\
+ org.apache.nutch.searcher.more*:\
+ org.apache.nutch.searcher.site*:\
+ org.apache.nutch.searcher.url*
+
+#
+# Ontology Plugins
+#
+plugins.ontology=\
+ org.apache.nutch.ontology.jena*
+
+#
+# Online Clusterer Plugins
+#
+plugins.clustering=\
+ org.apache.nutch.clustering.carrot2*
+
+
+#
+# Misc. Plugins
+#
+# (gathers plugins that cannot be dispatched
+# in any category, mainly because they contains
+# many extension points)
+#
+plugins.misc=\
+ org.apache.nutch.analysis.lang*:\
+ org.apache.nutch.microformats.reltag*:\
+ org.creativecommons.nutch*
