NUTCH-3086 Consolidate plugin extension names and IDs (#835)

apache · Jan 8, 2025 · 74b49e9 · 74b49e9
1 parent 5068b76
commit 74b49e9
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/src/plugin/parsefilter-debug/plugin.xml b/src/plugin/parsefilter-debug/plugin.xml
@@ -31,8 +31,8 @@
       <import plugin="nutch-extensionpoints"/>
    </requires>
 
-   <extension id="org.apache.nutch.htmlparsefilter.regex"
-        name="Nutch Parser Filter" point="org.apache.nutch.parse.HtmlParseFilter">
+   <extension id="org.apache.nutch.htmlparsefilter.debug"
+        name="Nutch Debug Parser Filter" point="org.apache.nutch.parse.HtmlParseFilter">
       <implementation id="DebugParseFilter" 
                       class="org.apache.nutch.parsefilter.debug.DebugParseFilter">
       </implementation>

diff --git a/src/plugin/parsefilter-naivebayes/plugin.xml b/src/plugin/parsefilter-naivebayes/plugin.xml
@@ -32,7 +32,7 @@
    </requires>
 
    <extension id="org.apache.nutch.htmlparsefilter.naivebayes"
-        name="Nutch Parser Filter" point="org.apache.nutch.parse.HtmlParseFilter">
+        name="Nutch NaiveBayes Parser Filter" point="org.apache.nutch.parse.HtmlParseFilter">
       <implementation id="NaiveBayesHTMLParseFilter" 
         class="org.apache.nutch.parsefilter.naivebayes.NaiveBayesParseFilter"/>
    </extension>

diff --git a/src/plugin/parsefilter-regex/plugin.xml b/src/plugin/parsefilter-regex/plugin.xml
@@ -32,7 +32,7 @@
    </requires>
 
    <extension id="org.apache.nutch.htmlparsefilter.regex"
-        name="Nutch Parser Filter" point="org.apache.nutch.parse.HtmlParseFilter">
+        name="Nutch Regex Parser Filter" point="org.apache.nutch.parse.HtmlParseFilter">
       <implementation id="RegexParseFilter" 
                       class="org.apache.nutch.parsefilter.regex.RegexParseFilter">
           <parameter name="file" value="regex-parsefilter.txt"/>

diff --git a/src/plugin/protocol-htmlunit/plugin.xml b/src/plugin/protocol-htmlunit/plugin.xml
@@ -33,8 +33,8 @@
     <import plugin="lib-htmlunit"/>
   </requires>
 
-  <extension id="org.apache.nutch.protocol.http"
-             name="HttpProtocol"
+  <extension id="org.apache.nutch.protocol.htmlunit"
+             name="HtmlUnitHttpProtocol"
              point="org.apache.nutch.protocol.Protocol">
 
     <implementation id="org.apache.nutch.protocol.htmlunit.Http"

diff --git a/src/plugin/protocol-httpclient/plugin.xml b/src/plugin/protocol-httpclient/plugin.xml
@@ -34,20 +34,14 @@
    </requires>
 
    <extension id="org.apache.nutch.protocol.httpclient"
-      name="HttpProtocol"
+      name="HttpClientProtocol"
       point="org.apache.nutch.protocol.Protocol">
 
       <implementation id="org.apache.nutch.protocol.httpclient.Http"
          class="org.apache.nutch.protocol.httpclient.Http">
          <parameter name="protocolName" value="http"/>
       </implementation>
 
-   </extension>
-
-   <extension id="org.apache.nutch.protocol.https"
-      name="HttpsProtocol"
-      point="org.apache.nutch.protocol.Protocol">
-
       <implementation id="org.apache.nutch.protocol.httpclient.Http"
          class="org.apache.nutch.protocol.httpclient.Http">
          <parameter name="protocolName" value="https"/>

diff --git a/src/plugin/protocol-interactiveselenium/plugin.xml b/src/plugin/protocol-interactiveselenium/plugin.xml
@@ -34,7 +34,7 @@
    </requires>
 
    <extension id="org.apache.nutch.protocol.interactiveselenium"
-              name="HttpProtocol"
+              name="InteractiveSeleniumHttpProtocol"
               point="org.apache.nutch.protocol.Protocol">
 
       <implementation id="org.apache.nutch.protocol.interactiveselenium.Http"

diff --git a/src/plugin/protocol-selenium/plugin.xml b/src/plugin/protocol-selenium/plugin.xml
@@ -34,7 +34,7 @@
    </requires>
 
    <extension id="org.apache.nutch.protocol.selenium"
-              name="HttpProtocol"
+              name="SeleniumHttpProtocol"
               point="org.apache.nutch.protocol.Protocol">
 
       <implementation id="org.apache.nutch.protocol.selenium.Http"