Author: jerome Date: Fri Aug 19 08:55:46 2005 New Revision: 233492 URL: http://svn.apache.org/viewcvs?rev=233492&view=rev Log: NUTCH-10, extension points defined only once (Stefan Grroschupf)
Added: lucene/nutch/trunk/src/plugin/nutch-extensionpoints/ lucene/nutch/trunk/src/plugin/nutch-extensionpoints/build.xml (with props) lucene/nutch/trunk/src/plugin/nutch-extensionpoints/plugin.xml (with props) lucene/nutch/trunk/src/plugin/nutch-extensionpoints/src/ lucene/nutch/trunk/src/plugin/nutch-extensionpoints/src/java/ Modified: lucene/nutch/trunk/conf/nutch-default.xml lucene/nutch/trunk/src/plugin/build.xml lucene/nutch/trunk/src/plugin/clustering-carrot2/plugin.xml lucene/nutch/trunk/src/plugin/creativecommons/plugin.xml lucene/nutch/trunk/src/plugin/index-basic/plugin.xml lucene/nutch/trunk/src/plugin/index-more/plugin.xml lucene/nutch/trunk/src/plugin/languageidentifier/plugin.xml lucene/nutch/trunk/src/plugin/ontology/plugin.xml lucene/nutch/trunk/src/plugin/parse-ext/plugin.xml lucene/nutch/trunk/src/plugin/parse-html/plugin.xml lucene/nutch/trunk/src/plugin/parse-js/plugin.xml lucene/nutch/trunk/src/plugin/parse-mp3/plugin.xml lucene/nutch/trunk/src/plugin/parse-msword/plugin.xml lucene/nutch/trunk/src/plugin/parse-pdf/plugin.xml lucene/nutch/trunk/src/plugin/parse-rss/plugin.xml lucene/nutch/trunk/src/plugin/parse-rtf/plugin.xml lucene/nutch/trunk/src/plugin/parse-text/plugin.xml lucene/nutch/trunk/src/plugin/protocol-file/plugin.xml lucene/nutch/trunk/src/plugin/protocol-ftp/plugin.xml lucene/nutch/trunk/src/plugin/protocol-http/plugin.xml lucene/nutch/trunk/src/plugin/protocol-httpclient/plugin.xml lucene/nutch/trunk/src/plugin/query-basic/plugin.xml lucene/nutch/trunk/src/plugin/query-more/plugin.xml lucene/nutch/trunk/src/plugin/query-site/plugin.xml lucene/nutch/trunk/src/plugin/query-url/plugin.xml lucene/nutch/trunk/src/plugin/urlfilter-prefix/plugin.xml lucene/nutch/trunk/src/plugin/urlfilter-regex/plugin.xml Modified: lucene/nutch/trunk/conf/nutch-default.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/conf/nutch-default.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/conf/nutch-default.xml (original) +++ lucene/nutch/trunk/conf/nutch-default.xml Fri Aug 19 08:55:46 2005 @@ -587,9 +587,10 @@ <property> <name>plugin.includes</name> - <value>protocol-httpclient|urlfilter-regex|parse-(text|html|js)|index-basic|query-(basic|site|url)</value> + <value>nutch-extensionpoints|protocol-http|urlfilter-regex|parse-(text|html)|index-basic|query-(basic|site|url)</value> <description>Regular expression naming plugin directory names to - include. Any plugin not matching this expression is excluded. By + include. Any plugin not matching this expression is excluded. + In any case you need at least include the nutch-extensionpoints plugin. By default Nutch includes crawling just HTML and plain text via HTTP, and basic indexing and search plugins. </description> Modified: lucene/nutch/trunk/src/plugin/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/build.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/build.xml (original) +++ lucene/nutch/trunk/src/plugin/build.xml Fri Aug 19 08:55:46 2005 @@ -6,6 +6,7 @@ <!-- Build & deploy all the plugin jars. --> <!-- ====================================================== --> <target name="deploy"> + <ant dir="nutch-extensionpoints" target="deploy"/> <ant dir="protocol-file" target="deploy"/> <ant dir="protocol-ftp" target="deploy"/> <ant dir="protocol-http" target="deploy"/> @@ -54,6 +55,7 @@ <!-- Clean all of the plugins. --> <!-- ====================================================== --> <target name="clean"> + <ant dir="nutch-extensionpoints" target="clean"/> <ant dir="protocol-file" target="clean"/> <ant dir="protocol-ftp" target="clean"/> <ant dir="protocol-http" target="clean"/> Modified: lucene/nutch/trunk/src/plugin/clustering-carrot2/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/clustering-carrot2/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/clustering-carrot2/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/clustering-carrot2/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,10 +5,6 @@ version="0.9.0" provider-name="carrot2.sourceforge.net"> - <extension-point - id="org.apache.nutch.clustering.OnlineClusterer" - name="Nutch Online Search Results Clustering Plugin"/> - <runtime> <library name="clustering-carrot2.jar"> <export name="*"/> Modified: lucene/nutch/trunk/src/plugin/creativecommons/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/creativecommons/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/creativecommons/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/creativecommons/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,18 +5,6 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.parse.HtmlParseFilter" - name="HTML Parse Filter"/> - - <extension-point - id="org.apache.nutch.indexer.IndexingFilter" - name="Nutch Indexing Filter"/> - - <extension-point - id="org.apache.nutch.searcher.QueryFilter" - name="Nutch Query Filter"/> - <runtime> <library name="creativecommons.jar"> <export name="*"/> Modified: lucene/nutch/trunk/src/plugin/index-basic/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/index-basic/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/index-basic/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/index-basic/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,9 +5,6 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.indexer.IndexingFilter" - name="Nutch Indexing Filter"/> <runtime> <library name="index-basic.jar"> Modified: lucene/nutch/trunk/src/plugin/index-more/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/index-more/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/index-more/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/index-more/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,15 +5,6 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.indexer.IndexingFilter" - name="Nutch Indexing Filter"/> - - <!-- - <extension-point - id="org.apache.nutch.searcher.QueryFilter" - name="Nutch Query Filter"/> - --> <runtime> <library name="index-more.jar"> Modified: lucene/nutch/trunk/src/plugin/languageidentifier/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/languageidentifier/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/languageidentifier/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/languageidentifier/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,17 +5,7 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.parse.HtmlParseFilter" - name="HTML Parse Filter"/> - <extension-point - id="org.apache.nutch.indexer.IndexingFilter" - name="Nutch Indexing Filter"/> - - <extension-point - id="org.apache.nutch.searcher.QueryFilter" - name="Nutch Query Filter"/> <runtime> <library name="language-identifier.jar"> @@ -29,7 +19,7 @@ <implementation id="LanguageParser" class="org.apache.nutch.analysis.lang.HTMLLanguageParser"/> </extension> - + <extension id="org.apache.nutch.analysis.lang" name="Nutch language identifier filter" point="org.apache.nutch.indexer.IndexingFilter"> Added: lucene/nutch/trunk/src/plugin/nutch-extensionpoints/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/nutch-extensionpoints/build.xml?rev=233492&view=auto ============================================================================== --- lucene/nutch/trunk/src/plugin/nutch-extensionpoints/build.xml (added) +++ lucene/nutch/trunk/src/plugin/nutch-extensionpoints/build.xml Fri Aug 19 08:55:46 2005 @@ -0,0 +1,7 @@ +<?xml version="1.0"?> + +<project name="nutch-extensionpoints" default="jar"> + + <import file="../build-plugin.xml"/> + +</project> Propchange: lucene/nutch/trunk/src/plugin/nutch-extensionpoints/build.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: lucene/nutch/trunk/src/plugin/nutch-extensionpoints/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/nutch-extensionpoints/plugin.xml?rev=233492&view=auto ============================================================================== --- lucene/nutch/trunk/src/plugin/nutch-extensionpoints/plugin.xml (added) +++ lucene/nutch/trunk/src/plugin/nutch-extensionpoints/plugin.xml Fri Aug 19 08:55:46 2005 @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<plugin + id="nutch-extensionpoints" + name="the nutch core extension points" + version="0.8.0" + provider-name="nutch.org"> + + <!-- this file hosts all extension points nutch core code offers. + Please not that plugins can define extension points as well to be extendable.--> + +<extension-point + id="org.apache.nutch.clustering.OnlineClusterer" + name="Nutch Online Search Results Clustering Plugin"/> + +<extension-point + id="org.apache.nutch.indexer.IndexingFilter" + name="Nutch Indexing Filter"/> + +<extension-point + id="org.apache.nutch.ontology.Ontology" + name="Ontology Model Loader"/> + +<extension-point + id="org.apache.nutch.parse.Parser" + name="Nutch Content Parser"/> + +<extension-point + id="org.apache.nutch.parse.HtmlParseFilter" + name="HTML Parse Filter"/> + +<extension-point + id="org.apache.nutch.protocol.Protocol" + name="Nutch Protocol"/> + +<extension-point + id="org.apache.nutch.searcher.QueryFilter" + name="Nutch Query Filter"/> + +<extension-point + id="org.apache.nutch.net.URLFilter" + name="Nutch URL Filter"/> + + +</plugin> Propchange: lucene/nutch/trunk/src/plugin/nutch-extensionpoints/plugin.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: lucene/nutch/trunk/src/plugin/ontology/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/ontology/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/ontology/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/ontology/plugin.xml Fri Aug 19 08:55:46 2005 @@ -6,9 +6,6 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.ontology.Ontology" - name="Ontology Model Loader"/> <runtime> <library name="ontology.jar"> Modified: lucene/nutch/trunk/src/plugin/parse-ext/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-ext/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-ext/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-ext/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,9 +5,7 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.parse.Parser" - name="Nutch Content Parser"/> + <runtime> <library name="parse-ext.jar"> Modified: lucene/nutch/trunk/src/plugin/parse-html/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-html/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-html/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-html/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,13 +5,7 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.parse.Parser" - name="Nutch Content Parser"/> - <extension-point - id="org.apache.nutch.parse.HtmlParseFilter" - name="HTML Parse Filter"/> <runtime> <library name="parse-html.jar"> Modified: lucene/nutch/trunk/src/plugin/parse-js/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-js/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-js/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-js/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,14 +5,6 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.parse.Parser" - name="Nutch Content Parser"/> - - <extension-point - id="org.apache.nutch.parse.HtmlParseFilter" - name="HTML Parse Filter"/> - <runtime> <library name="parse-js.jar"> <export name="*"/> @@ -23,17 +15,17 @@ name="JS Parser" point="org.apache.nutch.parse.Parser"> <implementation id="JSParser" - class="org.apache.nutch.parse.js.JSParseFilter" - contentType="application/x-javascript" - pathSuffix="js"/> + class="org.apache.nutch.parse.js.JSParseFilter" + contentType="application/x-javascript" + pathSuffix="js"/> </extension> <extension id="org.apache.nutch.parse.js.JSParseFilter" name="Parse JS Filter" point="org.apache.nutch.parse.HtmlParseFilter"> <implementation id="JSParseFilter" - class="org.apache.nutch.parse.js.JSParseFilter" - contentType="application/x-javascript" - pathSuffix=""/> + class="org.apache.nutch.parse.js.JSParseFilter" + contentType="application/x-javascript" + pathSuffix=""/> </extension> </plugin> Modified: lucene/nutch/trunk/src/plugin/parse-mp3/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-mp3/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-mp3/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-mp3/plugin.xml Fri Aug 19 08:55:46 2005 @@ -1,13 +1,25 @@ <?xml version = '1.0' encoding = 'UTF-8'?> -<plugin version="1.0.0" provider-name="nutch.org" id="parse-mp3" name="MP3 Parse Plug-in" > - <extension-point id="org.apache.nutch.parse.Parser" name="Nutch Content Parser" /> - <runtime> - <library name="parse-mp3.jar" > - <export name="*" /> - </library> - <library name="jid3lib-0.5.1.jar" /> - </runtime> - <extension point="org.apache.nutch.parse.Parser" id="org.apache.nutch.parse.mp3" name="MP3Parse" > - <implementation class="org.apache.nutch.parse.mp3.MP3Parser" pathSuffix="mp3" id="org.apache.nutch.parse.mp3.MP3Parser" contentType="audio/mpeg" /> - </extension> +<plugin + version="1.0.0" + provider-name="nutch.org" + id="parse-mp3" + name="MP3 Parse Plug-in"> + + <runtime> + <library name="parse-mp3.jar"> + <export name="*"/> + </library> + <library name="jid3lib-0.5.1.jar"/> + </runtime> + + <extension point="org.apache.nutch.parse.Parser" + id="org.apache.nutch.parse.mp3" + name="MP3Parse"> + + <implementation class="org.apache.nutch.parse.mp3.MP3Parser" + pathSuffix="mp3" + id="org.apache.nutch.parse.mp3.MP3Parser" + contentType="audio/mpeg"/> + </extension> + </plugin> Modified: lucene/nutch/trunk/src/plugin/parse-msword/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-msword/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-msword/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-msword/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,16 +5,6 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.parse.Parser" - name="Nutch Content Parser"/> - - <!-- - <extension-point - id="org.apache.nutch.parse.MSWordParseFilter" - name="MSWord Parse Filter"/> - --> - <runtime> <library name="parse-msword.jar"> <export name="*"/> Modified: lucene/nutch/trunk/src/plugin/parse-pdf/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-pdf/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-pdf/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-pdf/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,15 +5,6 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.parse.Parser" - name="Nutch Content Parser"/> - - <!-- - <extension-point - id="org.apache.nutch.parse.PdfParseFilter" - name="PDF Parse Filter"/> - --> <runtime> <library name="parse-pdf.jar"> Modified: lucene/nutch/trunk/src/plugin/parse-rss/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-rss/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-rss/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-rss/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,10 +5,6 @@ version="1.0.0" provider-name="edu.usc.cs.cs599"> - <extension-point - id="org.apache.nutch.parse.Parser" - name="Nutch Content Parser"/> - <runtime> <library name="parse-rss.jar"> Modified: lucene/nutch/trunk/src/plugin/parse-rtf/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-rtf/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-rtf/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-rtf/plugin.xml Fri Aug 19 08:55:46 2005 @@ -1,13 +1,23 @@ <?xml version = '1.0' encoding = 'UTF-8'?> -<plugin version="1.0.0" provider-name="nutch.org" id="parse-rtf" name="RTF Parse Plug-in" > - <extension-point id="org.apache.nutch.parse.Parser" name="Nutch Content Parser" /> - <runtime> - <library name="parse-rtf.jar" > - <export name="*" /> - </library> - <library name="rtf-parser.jar"/> - </runtime> - <extension point="org.apache.nutch.parse.Parser" id="org.apache.nutch.parse.rtf" name="RTFParse" > - <implementation class="org.apache.nutch.parse.rtf.RTFParseFactory" pathSuffix="rtf" id="org.apache.nutch.parse.rtf.RTFParseFactory" contentType="application/rtf" /> - </extension> +<plugin + version="1.0.0" + provider-name="nutch.org" + id="parse-rtf" + name="RTF Parse Plug-in"> + + <runtime> + <library name="parse-rtf.jar"> + <export name="*"/> + </library> + <library name="rtf-parser.jar"/> + </runtime> + + <extension point="org.apache.nutch.parse.Parser" + id="org.apache.nutch.parse.rtf" + name="RTFParse"> + <implementation class="org.apache.nutch.parse.rtf.RTFParseFactory" + pathSuffix="rtf" id="org.apache.nutch.parse.rtf.RTFParseFactory" + contentType="application/rtf"/> + </extension> + </plugin> Modified: lucene/nutch/trunk/src/plugin/parse-text/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-text/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-text/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-text/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,9 +5,6 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.parse.Parser" - name="Nutch Content Parser"/> <runtime> <library name="parse-text.jar"> Modified: lucene/nutch/trunk/src/plugin/protocol-file/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/protocol-file/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/protocol-file/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/protocol-file/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,9 +5,6 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.protocol.Protocol" - name="Nutch Protocol"/> <runtime> <library name="protocol-file.jar"> Modified: lucene/nutch/trunk/src/plugin/protocol-ftp/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/protocol-ftp/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/protocol-ftp/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/protocol-ftp/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,9 +5,7 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.protocol.Protocol" - name="Nutch Protocol"/> + <runtime> <library name="protocol-ftp.jar"> Modified: lucene/nutch/trunk/src/plugin/protocol-http/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/protocol-http/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/protocol-http/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/protocol-http/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,10 +5,6 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.protocol.Protocol" - name="Nutch Protocol"/> - <runtime> <library name="protocol-http.jar"> <export name="*"/> Modified: lucene/nutch/trunk/src/plugin/protocol-httpclient/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/protocol-httpclient/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/protocol-httpclient/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/protocol-httpclient/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,21 +5,16 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.protocol.Protocol" - name="Nutch Protocol"/> - <runtime> <library name="protocol-httpclient.jar"> <export name="*"/> </library> <library name="commons-codec.jar" /> <library name="commons-httpclient-3.0-rc2.jar" /> - </runtime> <extension id="org.apache.nutch.protocol.httpclient" - name="HttpProtocol" + name="HttpProtocol" point="org.apache.nutch.protocol.Protocol"> <implementation id="org.apache.nutch.protocol.httpclient.Http" Modified: lucene/nutch/trunk/src/plugin/query-basic/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/query-basic/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/query-basic/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/query-basic/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,9 +5,7 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.searcher.QueryFilter" - name="Nutch Query Filter"/> + <runtime> <library name="query-basic.jar"> Modified: lucene/nutch/trunk/src/plugin/query-more/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/query-more/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/query-more/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/query-more/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,9 +5,7 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.searcher.QueryFilter" - name="Nutch Query Filter"/> + <runtime> <library name="query-more.jar"> Modified: lucene/nutch/trunk/src/plugin/query-site/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/query-site/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/query-site/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/query-site/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,10 +5,6 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.searcher.QueryFilter" - name="Nutch Query Filter"/> - <runtime> <library name="query-site.jar"> <export name="*"/> Modified: lucene/nutch/trunk/src/plugin/query-url/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/query-url/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/query-url/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/query-url/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,9 +5,7 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.searcher.QueryFilter" - name="Nutch Query Filter"/> + <runtime> <library name="query-url.jar"> Modified: lucene/nutch/trunk/src/plugin/urlfilter-prefix/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/urlfilter-prefix/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/urlfilter-prefix/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/urlfilter-prefix/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,9 +5,7 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.net.URLFilter" - name="Nutch URL Filter"/> + <runtime> <library name="urlfilter-prefix.jar"> Modified: lucene/nutch/trunk/src/plugin/urlfilter-regex/plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/urlfilter-regex/plugin.xml?rev=233492&r1=233491&r2=233492&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/urlfilter-regex/plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/urlfilter-regex/plugin.xml Fri Aug 19 08:55:46 2005 @@ -5,10 +5,6 @@ version="1.0.0" provider-name="nutch.org"> - <extension-point - id="org.apache.nutch.net.URLFilter" - name="Nutch URL Filter"/> - <runtime> <library name="urlfilter-regex.jar"> <export name="*"/>