You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2018/03/16 16:49:56 UTC
svn commit: r1827019 - in
/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor: ./
connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/
connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextr...
Author: kwright
Date: Fri Mar 16 16:49:56 2018
New Revision: 1827019
URL: http://svn.apache.org/viewvc?rev=1827019&view=rev
Log:
Do some conversions of class names and symbols
Modified:
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/build.xml
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/HtmlExtractor.java
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/HtmlExtractorConfig.java
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/JsoupProcessing.java
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/Messages.java
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/exception/HtmlExtractorException.java
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/exception/RegexException.java
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_en_US.properties
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_es_ES.properties
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_ja_JP.properties
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_zh_CN.properties
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/editSpecification.js
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/editSpecification_HTML_Extractor.html
manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/viewSpecification.html
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/build.xml?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/build.xml Fri Mar 16 16:49:56 2018
@@ -50,7 +50,7 @@
<target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
<antcall target="general-add-transformation-connector">
<param name="connector-label" value="Html extractor"/>
- <param name="connector-class" value="org.apache.manifoldcf.agents.transformers.htmlextractor.HtmlExtractor"/>
+ <param name="connector-class" value="org.apache.manifoldcf.agents.transformation.htmlextractor.HtmlExtractor"/>
</antcall>
</target>
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/HtmlExtractor.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/HtmlExtractor.java?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/HtmlExtractor.java (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/HtmlExtractor.java Fri Mar 16 16:49:56 2018
@@ -1,4 +1,4 @@
-package com.francelabs.datafari.htmlextractor;
+package org.apache.manifoldcf.agents.transformation.htmlextractor;
/* $Id$ */
@@ -26,7 +26,7 @@ import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
-import com.francelabs.datafari.htmlextractor.exception.RegexException;
+import org.apache.manifoldcf.agents.transformation.htmlextractor.exception.RegexException;
import org.apache.manifoldcf.agents.interfaces.*;
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/HtmlExtractorConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/HtmlExtractorConfig.java?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/HtmlExtractorConfig.java (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/HtmlExtractorConfig.java Fri Mar 16 16:49:56 2018
@@ -17,7 +17,7 @@
* limitations under the License.
*/
-package com.francelabs.datafari.htmlextractor;
+package org.apache.manifoldcf.agents.transformation.htmlextractor;
/**
* Parameters for Tika transformation connector.
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/JsoupProcessing.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/JsoupProcessing.java?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/JsoupProcessing.java (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/JsoupProcessing.java Fri Mar 16 16:49:56 2018
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.francelabs.datafari.htmlextractor;
+package org.apache.manifoldcf.agents.transformation.htmlextractor;
import java.io.ByteArrayInputStream;
import java.io.File;
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/Messages.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/Messages.java?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/Messages.java (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/Messages.java Fri Mar 16 16:49:56 2018
@@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.francelabs.datafari.htmlextractor;
+package org.apache.manifoldcf.agents.transformation.htmlextractor;
import java.util.Locale;
import java.util.Map;
@@ -25,8 +25,8 @@ import org.apache.manifoldcf.core.interf
import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
public class Messages extends org.apache.manifoldcf.ui.i18n.Messages {
- public static final String DEFAULT_BUNDLE_NAME = "com.francelabs.datafari.htmlextractor.common";
- public static final String DEFAULT_PATH_NAME = "com.francelabs.datafari.htmlextractor";
+ public static final String DEFAULT_BUNDLE_NAME = "org.apache.manifoldcf.agents.transformation.htmlextractor.common";
+ public static final String DEFAULT_PATH_NAME = "org.apache.manifoldcf.agents.transformation.htmlextractor";
/**
* Constructor - do no instantiate
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/exception/HtmlExtractorException.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/exception/HtmlExtractorException.java?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/exception/HtmlExtractorException.java (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/exception/HtmlExtractorException.java Fri Mar 16 16:49:56 2018
@@ -1,4 +1,4 @@
-package com.francelabs.datafari.htmlextractor.exception;
+package org.apache.manifoldcf.agents.transformation.htmlextractor.exception;
public class HtmlExtractorException extends Exception {
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/exception/RegexException.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/exception/RegexException.java?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/exception/RegexException.java (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/java/org/apache/manifoldcf/agents/transformation/htmlextractor/exception/RegexException.java Fri Mar 16 16:49:56 2018
@@ -1,4 +1,4 @@
-package com.francelabs.datafari.htmlextractor.exception;
+package org.apache.manifoldcf.agents.transformation.htmlextractor.exception;
public class RegexException extends Exception {
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_en_US.properties?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_en_US.properties (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_en_US.properties Fri Mar 16 16:49:56 2018
@@ -13,17 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-DatafariHtmlExtractorTransformationConnector.HtmlExtractorTabName=HTML Extractor
-DatafariHtmlExtractorTransformationConnector.SolrUpdateHandler=Update handler:
-DatafariHtmlExtractorTransformationConnector.IncludeFilters=Englobing tag :
-DatafariHtmlExtractorTransformationConnector.ExcludeFilters=Tags to remove :
-DatafariHtmlExtractorTransformationConnector.RegularExpression=CSS selector
-DatafariHtmlExtractorTransformationConnector.Delete=Delete
-DatafariHtmlExtractorTransformationConnector.DeleteIncludeFilter=Delete englobing tag
-DatafariHtmlExtractorTransformationConnector.DeleteExcludeFilter=Delete blacklist tag
-DatafariHtmlExtractorTransformationConnector.NoIncludeFilterSpecified=No englobing tag specified
-DatafariHtmlExtractorTransformationConnector.NoExcludeFilterSpecified=No blacklist tag specified
-DatafariHtmlExtractorTransformationConnector.Add=Add
-DatafariHtmlExtractorTransformationConnector.AddIncludeFilter=Add englobing tag
-DatafariHtmlExtractorTransformationConnector.AddExcludeFilter=Add blacklist tag
-DatafariHtmlExtractorTransformationConnector.NoRegexSpecified=No CSS selector specified
+HtmlExtractor.HtmlExtractorTabName=HTML Extractor
+HtmlExtractor.SolrUpdateHandler=Update handler:
+HtmlExtractor.IncludeFilters=Englobing tag :
+HtmlExtractor.ExcludeFilters=Tags to remove :
+HtmlExtractor.RegularExpression=CSS selector
+HtmlExtractor.Delete=Delete
+HtmlExtractor.DeleteIncludeFilter=Delete englobing tag
+HtmlExtractor.DeleteExcludeFilter=Delete blacklist tag
+HtmlExtractor.NoIncludeFilterSpecified=No englobing tag specified
+HtmlExtractor.NoExcludeFilterSpecified=No blacklist tag specified
+HtmlExtractor.Add=Add
+HtmlExtractor.AddIncludeFilter=Add englobing tag
+HtmlExtractor.AddExcludeFilter=Add blacklist tag
+HtmlExtractor.NoRegexSpecified=No CSS selector specified
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_es_ES.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_es_ES.properties?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_es_ES.properties (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_es_ES.properties Fri Mar 16 16:49:56 2018
@@ -13,17 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-DatafariHtmlExtractorTransformationConnector.HtmlExtractorTabName=HTML Extractor
-DatafariHtmlExtractorTransformationConnector.SolrUpdateHandler=Update handler:
-DatafariHtmlExtractorTransformationConnector.IncludeFilters=Englobing tag :
-DatafariHtmlExtractorTransformationConnector.ExcludeFilters=Tags to remove :
-DatafariHtmlExtractorTransformationConnector.RegularExpression=CSS selector
-DatafariHtmlExtractorTransformationConnector.Delete=Delete
-DatafariHtmlExtractorTransformationConnector.DeleteIncludeFilter=Delete englobing tag
-DatafariHtmlExtractorTransformationConnector.DeleteExcludeFilter=Delete blacklist tag
-DatafariHtmlExtractorTransformationConnector.NoIncludeFilterSpecified=No englobing tag specified
-DatafariHtmlExtractorTransformationConnector.NoExcludeFilterSpecified=No blacklist tag specified
-DatafariHtmlExtractorTransformationConnector.Add=Add
-DatafariHtmlExtractorTransformationConnector.AddIncludeFilter=Add englobing tag
-DatafariHtmlExtractorTransformationConnector.AddExcludeFilter=Add blacklist tag
-DatafariHtmlExtractorTransformationConnector.NoRegexSpecified=No CSS selector specified
+HtmlExtractor.HtmlExtractorTabName=HTML Extractor
+HtmlExtractor.SolrUpdateHandler=Update handler:
+HtmlExtractor.IncludeFilters=Englobing tag :
+HtmlExtractor.ExcludeFilters=Tags to remove :
+HtmlExtractor.RegularExpression=CSS selector
+HtmlExtractor.Delete=Delete
+HtmlExtractor.DeleteIncludeFilter=Delete englobing tag
+HtmlExtractor.DeleteExcludeFilter=Delete blacklist tag
+HtmlExtractor.NoIncludeFilterSpecified=No englobing tag specified
+HtmlExtractor.NoExcludeFilterSpecified=No blacklist tag specified
+HtmlExtractor.Add=Add
+HtmlExtractor.AddIncludeFilter=Add englobing tag
+HtmlExtractor.AddExcludeFilter=Add blacklist tag
+HtmlExtractor.NoRegexSpecified=No CSS selector specified
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_ja_JP.properties?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_ja_JP.properties (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_ja_JP.properties Fri Mar 16 16:49:56 2018
@@ -13,17 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-DatafariHtmlExtractorTransformationConnector.HtmlExtractorTabName=HTML Extractor
-DatafariHtmlExtractorTransformationConnector.SolrUpdateHandler=Update handler:
-DatafariHtmlExtractorTransformationConnector.IncludeFilters=Englobing tag :
-DatafariHtmlExtractorTransformationConnector.ExcludeFilters=Tags to remove :
-DatafariHtmlExtractorTransformationConnector.RegularExpression=CSS selector
-DatafariHtmlExtractorTransformationConnector.Delete=Delete
-DatafariHtmlExtractorTransformationConnector.DeleteIncludeFilter=Delete englobing tag
-DatafariHtmlExtractorTransformationConnector.DeleteExcludeFilter=Delete blacklist tag
-DatafariHtmlExtractorTransformationConnector.NoIncludeFilterSpecified=No englobing tag specified
-DatafariHtmlExtractorTransformationConnector.NoExcludeFilterSpecified=No blacklist tag specified
-DatafariHtmlExtractorTransformationConnector.Add=Add
-DatafariHtmlExtractorTransformationConnector.AddIncludeFilter=Add englobing tag
-DatafariHtmlExtractorTransformationConnector.AddExcludeFilter=Add blacklist tag
-DatafariHtmlExtractorTransformationConnector.NoRegexSpecified=No CSS selector specified
+HtmlExtractor.HtmlExtractorTabName=HTML Extractor
+HtmlExtractor.SolrUpdateHandler=Update handler:
+HtmlExtractor.IncludeFilters=Englobing tag :
+HtmlExtractor.ExcludeFilters=Tags to remove :
+HtmlExtractor.RegularExpression=CSS selector
+HtmlExtractor.Delete=Delete
+HtmlExtractor.DeleteIncludeFilter=Delete englobing tag
+HtmlExtractor.DeleteExcludeFilter=Delete blacklist tag
+HtmlExtractor.NoIncludeFilterSpecified=No englobing tag specified
+HtmlExtractor.NoExcludeFilterSpecified=No blacklist tag specified
+HtmlExtractor.Add=Add
+HtmlExtractor.AddIncludeFilter=Add englobing tag
+HtmlExtractor.AddExcludeFilter=Add blacklist tag
+HtmlExtractor.NoRegexSpecified=No CSS selector specified
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_zh_CN.properties?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_zh_CN.properties (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/htmlextractor/common_zh_CN.properties Fri Mar 16 16:49:56 2018
@@ -13,17 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-DatafariHtmlExtractorTransformationConnector.HtmlExtractorTabName=HTML Extractor
-DatafariHtmlExtractorTransformationConnector.SolrUpdateHandler=Update handler:
-DatafariHtmlExtractorTransformationConnector.IncludeFilters=Englobing tag :
-DatafariHtmlExtractorTransformationConnector.ExcludeFilters=Tags to remove :
-DatafariHtmlExtractorTransformationConnector.RegularExpression=CSS selector
-DatafariHtmlExtractorTransformationConnector.Delete=Delete
-DatafariHtmlExtractorTransformationConnector.DeleteIncludeFilter=Delete englobing tag
-DatafariHtmlExtractorTransformationConnector.DeleteExcludeFilter=Delete blacklist tag
-DatafariHtmlExtractorTransformationConnector.NoIncludeFilterSpecified=No englobing tag specified
-DatafariHtmlExtractorTransformationConnector.NoExcludeFilterSpecified=No blacklist tag specified
-DatafariHtmlExtractorTransformationConnector.Add=Add
-DatafariHtmlExtractorTransformationConnector.AddIncludeFilter=Add englobing tag
-DatafariHtmlExtractorTransformationConnector.AddExcludeFilter=Add blacklist tag
-DatafariHtmlExtractorTransformationConnector.NoRegexSpecified=No CSS selector specified
+HtmlExtractor.HtmlExtractorTabName=HTML Extractor
+HtmlExtractor.SolrUpdateHandler=Update handler:
+HtmlExtractor.IncludeFilters=Englobing tag :
+HtmlExtractor.ExcludeFilters=Tags to remove :
+HtmlExtractor.RegularExpression=CSS selector
+HtmlExtractor.Delete=Delete
+HtmlExtractor.DeleteIncludeFilter=Delete englobing tag
+HtmlExtractor.DeleteExcludeFilter=Delete blacklist tag
+HtmlExtractor.NoIncludeFilterSpecified=No englobing tag specified
+HtmlExtractor.NoExcludeFilterSpecified=No blacklist tag specified
+HtmlExtractor.Add=Add
+HtmlExtractor.AddIncludeFilter=Add englobing tag
+HtmlExtractor.AddExcludeFilter=Add blacklist tag
+HtmlExtractor.NoRegexSpecified=No CSS selector specified
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/editSpecification.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/editSpecification.js?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/editSpecification.js (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/editSpecification.js Fri Mar 16 16:49:56 2018
@@ -26,7 +26,7 @@ function s${SEQNUM}_addIncludeFilter()
{
if (editjob.s${SEQNUM}_includefilter_regex.value == "")
{
- alert("$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.NoRegexSpecified'))");
+ alert("$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.NoRegexSpecified'))");
editjob.s${SEQNUM}_includefilter_regex.focus();
return;
}
@@ -38,7 +38,7 @@ function s${SEQNUM}_addExcludeFilter()
{
if (editjob.s${SEQNUM}_excludefilter_regex.value == "")
{
- alert("$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.NoRegexSpecified'))");
+ alert("$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.NoRegexSpecified'))");
editjob.s${SEQNUM}_excludefilter_regex.focus();
return;
}
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/editSpecification_HTML_Extractor.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/editSpecification_HTML_Extractor.html?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/editSpecification_HTML_Extractor.html (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/editSpecification_HTML_Extractor.html Fri Mar 16 16:49:56 2018
@@ -15,18 +15,18 @@
limitations under the License.
-->
-#if($TABNAME == $ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.HtmlExtractorTabName') && ${SEQNUM} == ${SELECTEDNUM})
+#if($TABNAME == $ResourceBundle.getString('HtmlExtractor.HtmlExtractorTabName') && ${SEQNUM} == ${SELECTEDNUM})
<table class="displaytable">
<tr>
<td class="description">
- <nobr>$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.IncludeFilters'))</nobr>
+ <nobr>$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.IncludeFilters'))</nobr>
</td>
<td class="boxcell">
<table class="formtable">
<tr class="formheaderrow">
<td class="formcolumnheader"></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.RegularExpression'))</nobr></td>
+ <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.RegularExpression'))</nobr></td>
</tr>
#set($includecounter = 0)
@@ -40,7 +40,7 @@
#end
<td class="formcolumncell">
<a name="s${SEQNUM}_includefilter_$includecounter">
- <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.Delete'))" alt="$Encoder.attributeEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.DeleteIncludeFilter'))$includecounterdisplay" onclick='javascript:s${SEQNUM}_deleteIncludeFilter("$includecounter");'/>
+ <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('HtmlExtractor.Delete'))" alt="$Encoder.attributeEscape($ResourceBundle.getString('HtmlExtractor.DeleteIncludeFilter'))$includecounterdisplay" onclick='javascript:s${SEQNUM}_deleteIncludeFilter("$includecounter");'/>
<input type="hidden" name="s${SEQNUM}_includefilter_op_$includecounter" value="Continue"/>
</a>
</td>
@@ -54,14 +54,14 @@
#if($includecounter == 0)
- <tr class="formrow"><td class="formmessage" colspan="3">$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.NoIncludeFilterSpecified'))</td></tr>
+ <tr class="formrow"><td class="formmessage" colspan="3">$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.NoIncludeFilterSpecified'))</td></tr>
#end
<tr class="formrow"><td class="formseparator" colspan="3"><hr/></td></tr>
<tr class="formrow">
<td class="formcolumncell">
<a name="includefilter">
- <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.Add'))" alt="$Encoder.attributeEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.AddIncludeFilter'))" onclick="javascript:s${SEQNUM}_addIncludeFilter();"/>
+ <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('HtmlExtractor.Add'))" alt="$Encoder.attributeEscape($ResourceBundle.getString('HtmlExtractor.AddIncludeFilter'))" onclick="javascript:s${SEQNUM}_addIncludeFilter();"/>
</a>
<input type="hidden" name="s${SEQNUM}_includefilter_count" value="$includecounter"/>
<input type="hidden" name="s${SEQNUM}_includefilter_op" value="Continue"/>
@@ -75,13 +75,13 @@
</tr>
<tr>
<td class="description">
- <nobr>$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.ExcludeFilters'))</nobr>
+ <nobr>$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.ExcludeFilters'))</nobr>
</td>
<td class="boxcell">
<table class="formtable">
<tr class="formheaderrow">
<td class="formcolumnheader"></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.RegularExpression'))</nobr></td>
+ <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.RegularExpression'))</nobr></td>
</tr>
#set($excludecounter = 0)
@@ -94,7 +94,7 @@
#end
<td class="formcolumncell">
<a name="s${SEQNUM}_excludefilter_$excludecounter">
- <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.Delete'))" alt="$Encoder.attributeEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.DeleteExcludeFilter'))$excludecounterdisplay" onclick='javascript:s${SEQNUM}_deleteExcludeFilter("$excludecounter");'/>
+ <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('HtmlExtractor.Delete'))" alt="$Encoder.attributeEscape($ResourceBundle.getString('HtmlExtractor.DeleteExcludeFilter'))$excludecounterdisplay" onclick='javascript:s${SEQNUM}_deleteExcludeFilter("$excludecounter");'/>
<input type="hidden" name="s${SEQNUM}_excludefilter_op_$excludecounter" value="Continue"/>
<input type="hidden" name="s${SEQNUM}_excludefilter_regex_$excludecounter" value="$Encoder.attributeEscape($excludefilter)"/>
</a>
@@ -107,14 +107,14 @@
#end
#if($excludecounter == 0)
- <tr class="formrow"><td class="formmessage" colspan="3">$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.NoExcludeFilterSpecified'))</td></tr>
+ <tr class="formrow"><td class="formmessage" colspan="3">$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.NoExcludeFilterSpecified'))</td></tr>
#end
<tr class="formrow"><td class="formseparator" colspan="3"><hr/></td></tr>
<tr class="formrow">
<td class="formcolumncell">
<a name="excludefilter">
- <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.Add'))" alt="$Encoder.attributeEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.AddExcludeFilter'))" onclick="javascript:s${SEQNUM}_addExcludeFilter();"/>
+ <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('HtmlExtractor.Add'))" alt="$Encoder.attributeEscape($ResourceBundle.getString('HtmlExtractor.AddExcludeFilter'))" onclick="javascript:s${SEQNUM}_addExcludeFilter();"/>
</a>
<input type="hidden" name="s${SEQNUM}_excludefilter_count" value="$excludecounter"/>
<input type="hidden" name="s${SEQNUM}_excludefilter_op" value="Continue"/>
Modified: manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/viewSpecification.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/viewSpecification.html?rev=1827019&r1=1827018&r2=1827019&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/viewSpecification.html (original)
+++ manifoldcf/branches/CONNECTORS-1500/connectors/html-extractor/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/htmlextractor/viewSpecification.html Fri Mar 16 16:49:56 2018
@@ -21,12 +21,12 @@
<tr>
<td class="description">
- <nobr>$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.HtmlExtractorTabName')) $Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.IncludeFilters'))</nobr>
+ <nobr>$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.HtmlExtractorTabName')) $Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.IncludeFilters'))</nobr>
</td>
<td class="boxcell">
<table class="formtable">
<tr class="formheaderrow">
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.RegularExpression'))</nobr></td>
+ <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.RegularExpression'))</nobr></td>
</tr>
#set($includecounter = 0)
@@ -44,19 +44,19 @@
#end
#if($includecounter == 0)
- <tr class="formrow"><td class="formmessage" colspan="3">$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.NoIncludeFilterSpecified'))</td></tr>
+ <tr class="formrow"><td class="formmessage" colspan="3">$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.NoIncludeFilterSpecified'))</td></tr>
#end
</table>
</td>
</tr>
<tr>
<td class="description">
- <nobr>$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.HtmlExtractorTabName')) $Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.ExcludeFilters'))</nobr>
+ <nobr>$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.HtmlExtractorTabName')) $Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.ExcludeFilters'))</nobr>
</td>
<td class="boxcell">
<table class="formtable">
<tr class="formheaderrow">
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.RegularExpression'))</nobr></td>
+ <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.RegularExpression'))</nobr></td>
</tr>
#set($excludecounter = 0)
@@ -74,7 +74,7 @@
#end
#if($excludecounter == 0)
- <tr class="formrow"><td class="formmessage" colspan="3">$Encoder.bodyEscape($ResourceBundle.getString('DatafariHtmlExtractorTransformationConnector.NoExcludeFilterSpecified'))</td></tr>
+ <tr class="formrow"><td class="formmessage" colspan="3">$Encoder.bodyEscape($ResourceBundle.getString('HtmlExtractor.NoExcludeFilterSpecified'))</td></tr>
#end
</table>
</td>