Author: kishore
Date: Tue Apr 25 21:01:49 2017
New Revision: 1792658
URL: http://svn.apache.org/viewvc?rev=1792658&view=rev
Log:
Updated outputSpecificationHeader to use Velocity template.
Added:
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification.js.vm
(with props)
Modified:
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration.js.vm
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/pom.xml
Modified:
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java?rev=1792658&r1=1792657&r2=1792658&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
Tue Apr 25 21:01:49 2017
@@ -2679,135 +2679,11 @@ public class WebcrawlerConnector extends
tabsArray.add(Messages.getString(locale,"WebcrawlerConnector.Exclusions"));
tabsArray.add(Messages.getString(locale,"WebcrawlerConnector.Security"));
tabsArray.add(Messages.getString(locale,"WebcrawlerConnector.Metadata"));
- String seqPrefix = "s"+connectionSequenceNumber+"_";
- out.print(
-"<script type=\"text/javascript\">\n"+
-"<!--\n"+
-"\n"+
-"function "+seqPrefix+"SpecOp(n, opValue, anchorvalue)\n"+
-"{\n"+
-" eval(\"editjob.\"+n+\".value = \\\"\"+opValue+\"\\\"\");\n"+
-" postFormSetAnchor(anchorvalue);\n"+
-"}\n"+
-"\n"+
-"function "+seqPrefix+"AddRegexp(anchorvalue)\n"+
-"{\n"+
-" if (editjob."+seqPrefix+"rssmatch.value == \"\")\n"+
-" {\n"+
-"
alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.MatchMustHaveARegexpValue")+"\");\n"+
-" editjob."+seqPrefix+"rssmatch.focus();\n"+
-" return;\n"+
-" }\n"+
-"\n"+
-" "+seqPrefix+"SpecOp(\""+seqPrefix+"rssop\",\"Add\",anchorvalue);\n"+
-"}\n"+
-"\n"+
-"function "+seqPrefix+"RemoveRegexp(index, anchorvalue)\n"+
-"{\n"+
-" editjob."+seqPrefix+"rssindex.value = index;\n"+
-" "+seqPrefix+"SpecOp(\""+seqPrefix+"rssop\",\"Delete\",anchorvalue);\n"+
-"}\n"+
-"\n"+
-"function "+seqPrefix+"URLRegexpDelete(index, anchorvalue)\n"+
-"{\n"+
-" editjob."+seqPrefix+"urlregexpnumber.value = index;\n"+
-"
"+seqPrefix+"SpecOp(\""+seqPrefix+"urlregexpop\",\"Delete\",anchorvalue);\n"+
-"}\n"+
-"\n"+
-"function "+seqPrefix+"URLRegexpAdd(anchorvalue)\n"+
-"{\n"+
-" "+seqPrefix+"SpecOp(\""+seqPrefix+"urlregexpop\",\"Add\",anchorvalue);\n"+
-"}\n"+
-"\n"+
-"function "+seqPrefix+"checkSpecification()\n"+
-"{\n"+
-" if
("+seqPrefix+"check_expressions(\"inclusions\",editjob."+seqPrefix+"inclusions.value)
== false)\n"+
-" {\n"+
-" editjob."+seqPrefix+"inclusions.focus();\n"+
-" return false;\n"+
-" } \n"+
-" if
("+seqPrefix+"check_expressions(\"exclusions\",editjob."+seqPrefix+"exclusions.value)
== false)\n"+
-" {\n"+
-" editjob."+seqPrefix+"exclusions.focus();\n"+
-" return false;\n"+
-" }\n"+
-" if ("+seqPrefix+"check_seedsList() == false)\n"+
-" {\n"+
-" editjob."+seqPrefix+"seeds.focus();\n"+
-" return false;\n"+
-" }\n"+
-" return true;\n"+
-"}\n"+
-"\n"+
-"function "+seqPrefix+"check_expressions(thecontext,theexpressionlist)\n"+
-"{\n"+
-" var rval = true;\n"+
-" var theArray = theexpressionlist.split(\"\\n\");\n"+
-" var i = 0;\n"+
-" while (i < theArray.length)\n"+
-" {\n"+
-" // For legality check, we must cut out anything useful that is
java-only\n"+
-" var theexp = theArray[i];\n"+
-" var trimmed = theexp.replace(/^\\s+/,\"\");\n"+
-" i = i + 1;\n"+
-" if (trimmed.length == 0 || (trimmed.length >= 1 && trimmed.substring(0,1)
== \"#\"))\n"+
-" continue;\n"+
-" try\n"+
-" {\n"+
-" var foo = \"teststring\";\n"+
-" foo.search(theexp.replace(/\\(\\?i\\)/,\"\"));\n"+
-" }\n"+
-" catch (e)\n"+
-" {\n"+
-"
alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.FoundAnIllegalRegularExpressionIn")+"\"+thecontext+\":
'\"+theexp+\"'"+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.ErrorWas")+"\"+e);\n"+
-" rval = false;\n"+
-" }\n"+
-" }\n"+
-" return rval;\n"+
-"}\n"+
-"\n"+
-"function "+seqPrefix+"check_seedsList()\n"+
-"{\n"+
-" var regexp =
/http(s)?:\\/\\/([a-z0-9+!*(),;?&=\\$_.-]+(\\:[a-z0-9+!*(),;?&=\\$_.-]+)?@)?[a-z0-9+\\$_-]+(\\.[a-z0-9+\\$_-]+)*(\\:[0-9]{2,5})?(\\/([a-z0-9+\\$_-]\\.?)+)*\\/?(\\?[a-z+&\\$_.-][a-z0-9;:@\\/&%=+\\$_.-]*)?(#[a-z_.-][a-z0-9+\\$_.-]*)?/;\n"+
-" var lines = editjob."+seqPrefix+"seeds.value.split(\"\\n\");\n"+
-" var trimmedUrlList = \"\";\n"+
-" var invalidUrlList = \"\";\n"+
-" var i = 0;\n"+
-" while (i < lines.length)\n"+
-" {\n"+
-" var line = lines[i].replace(/^\\s*/, \"\").replace(/\\s*$/, \"\");\n"+
-" if (line.length > 0)\n"+
-" {\n"+
-" if (!regexp.test(line))\n"+
-" invalidUrlList = invalidUrlList + line + \"\\n\";\n"+
-" trimmedUrlList = trimmedUrlList + line + \"\\n\";\n"+
-" }\n"+
-" i = i + 1;\n"+
-" }\n"+
-" editjob."+seqPrefix+"seeds.value = trimmedUrlList;\n"+
-" if (invalidUrlList.length > 0)\n"+
-" {\n"+
-"
alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.InvalidUrlsInSeedsList")+"\\n\"
+ invalidUrlList);\n"+
-" return false;\n"+
-" }\n"+
-" return true;\n"+
-"}\n"+
-"\n"+
-"function "+seqPrefix+"SpecAddToken(anchorvalue)\n"+
-"{\n"+
-" if (editjob."+seqPrefix+"spectoken.value == \"\")\n"+
-" {\n"+
-"
alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.TypeInAnAccessToken")+"\");\n"+
-" editjob."+seqPrefix+"spectoken.focus();\n"+
-" return;\n"+
-" }\n"+
-" "+seqPrefix+"SpecOp(\""+seqPrefix+"accessop\",\"Add\",anchorvalue);\n"+
-"}\n"+
-"\n"+
-"//-->\n"+
-"</script>\n"
- );
+ final Map<String,Object> velocityContext = new HashMap<String,Object>();
+ velocityContext.put("SEQNUM",connectionSequenceNumber);
+
+ Messages.outputResourceWithVelocity(out, locale,
"editSpecification.js.vm", velocityContext);
}
/** Output the specification body section.
Modified:
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration.js.vm
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration.js.vm?rev=1792658&r1=1792657&r2=1792658&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration.js.vm
(original)
+++
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration.js.vm
Tue Apr 25 21:01:49 2017
@@ -14,6 +14,7 @@ See the License for the specific languag
limitations under the License.
*#
<script type="text/javascript">
+/* editConfiguration.js.vm (Web Connector) */
function checkConfig()
{
if (editconnection.email.value != "" &&
editconnection.email.value.indexOf("@") == -1)
Added:
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification.js.vm
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification.js.vm?rev=1792658&view=auto
==============================================================================
---
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification.js.vm
(added)
+++
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification.js.vm
Tue Apr 25 21:01:49 2017
@@ -0,0 +1,138 @@
+#**
+Copyright 2017 The Apache Software Foundation.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+#set( $SEQPREFIX = "s" + $SEQNUM + "_" )
+<script type="text/javascript">
+/* editSpecification.js.vm (Web Connector) */
+function ${SEQPREFIX}SpecOp(n, opValue, anchorvalue)
+{
+ eval("editjob."+n+".value = \""+opValue+"\"");
+ postFormSetAnchor(anchorvalue);
+}
+
+function ${SEQPREFIX}AddRegexp(anchorvalue)
+{
+ if (editjob.${SEQPREFIX}rssmatch.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('WebcrawlerConnector.MatchMustHaveARegexpValue'))");
+ editjob.${SEQPREFIX}rssmatch.focus();
+ return;
+ }
+
+ ${SEQPREFIX}SpecOp("${SEQPREFIX}rssop","Add",anchorvalue);
+}
+
+function ${SEQPREFIX}RemoveRegexp(index, anchorvalue)
+{
+ editjob.${SEQPREFIX}rssindex.value = index;
+ ${SEQPREFIX}SpecOp("${SEQPREFIX}rssop","Delete",anchorvalue);
+}
+
+function ${SEQPREFIX}URLRegexpDelete(index, anchorvalue)
+{
+ editjob.${SEQPREFIX}urlregexpnumber.value = index;
+ ${SEQPREFIX}SpecOp("${SEQPREFIX}urlregexpop","Delete",anchorvalue);
+}
+
+function ${SEQPREFIX}URLRegexpAdd(anchorvalue)
+{
+ ${SEQPREFIX}SpecOp("${SEQPREFIX}urlregexpop","Add",anchorvalue);
+}
+
+function ${SEQPREFIX}checkSpecification()
+{
+ if
(${SEQPREFIX}check_expressions("inclusions",editjob.${SEQPREFIX}inclusions.value)
== false)
+ {
+ editjob.${SEQPREFIX}inclusions.focus();
+ return false;
+ }
+ if
(${SEQPREFIX}check_expressions("exclusions",editjob.${SEQPREFIX}exclusions.value)
== false)
+ {
+ editjob.${SEQPREFIX}exclusions.focus();
+ return false;
+ }
+ if (${SEQPREFIX}check_seedsList() == false)
+ {
+ editjob.${SEQPREFIX}seeds.focus();
+ return false;
+ }
+ return true;
+}
+
+function ${SEQPREFIX}check_expressions(thecontext,theexpressionlist)
+{
+ var rval = true;
+ var theArray = theexpressionlist.split("\n");
+ var i = 0;
+ while (i < theArray.length)
+ {
+ // For legality check, we must cut out anything useful that is java-only
+ var theexp = theArray[i];
+ var trimmed = theexp.replace(/^\s+/,"");
+ i = i + 1;
+ if (trimmed.length == 0 || (trimmed.length >= 1 && trimmed.substring(0,1)
== "#"))
+ continue;
+ try
+ {
+ var foo = "teststring";
+ foo.search(theexp.replace(/\(\?i\)/,""));
+ }
+ catch (e)
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('WebcrawlerConnector.FoundAnIllegalRegularExpressionIn'))"+thecontext+":
'"+theexp+"'$Encoder.bodyJavascriptEscape($ResourceBundle.getString('WebcrawlerConnector.ErrorWas'))"+e);
+ rval = false;
+ }
+ }
+ return rval;
+}
+
+function ${SEQPREFIX}check_seedsList()
+{
+ var regexp =
/http(s)?:\/\/([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)?[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*(\:[0-9]{2,5})?(\/([a-z0-9+\$_-]\.?)+)*\/?(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)?(#[a-z_.-][a-z0-9+\$_.-]*)?/;
+ var lines = editjob.${SEQPREFIX}seeds.value.split("\n");
+ var trimmedUrlList = "";
+ var invalidUrlList = "";
+ var i = 0;
+ while (i < lines.length)
+ {
+ var line = lines[i].replace(/^\s*/, "").replace(/\s*$/, "");
+ if (line.length > 0)
+ {
+ if (!regexp.test(line))
+ invalidUrlList = invalidUrlList + line + "\n";
+ trimmedUrlList = trimmedUrlList + line + "\n";
+ }
+ i = i + 1;
+ }
+ editjob.${SEQPREFIX}seeds.value = trimmedUrlList;
+ if (invalidUrlList.length > 0)
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('WebcrawlerConnector.InvalidUrlsInSeedsList'))\n"
+ invalidUrlList);
+ return false;
+ }
+ return true;
+}
+
+function ${SEQPREFIX}SpecAddToken(anchorvalue)
+{
+ if (editjob.${SEQPREFIX}spectoken.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('WebcrawlerConnector.TypeInAnAccessToken'))");
+ editjob.${SEQPREFIX}spectoken.focus();
+ return;
+ }
+ ${SEQPREFIX}SpecOp("${SEQPREFIX}accessop","Add",anchorvalue);
+}
+</script>
Propchange:
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification.js.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified: manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/pom.xml?rev=1792658&r1=1792657&r2=1792658&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/pom.xml Tue Apr
25 21:01:49 2017
@@ -46,8 +46,8 @@
<resource>
<directory>${basedir}/connector/src/main/resources</directory>
<includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
+ <include>**/*.html.vm</include>
+ <include>**/*.js.vm</include>
</includes>
</resource>
</resources>
