Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8C1FA200C77 for ; Mon, 1 May 2017 18:17:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8A96C160BAE; Mon, 1 May 2017 16:17:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5D6A4160BAB for ; Mon, 1 May 2017 18:17:56 +0200 (CEST) Received: (qmail 31423 invoked by uid 500); 1 May 2017 16:17:55 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 31414 invoked by uid 99); 1 May 2017 16:17:55 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 May 2017 16:17:55 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id B45B53A3B85 for ; Mon, 1 May 2017 16:17:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1793368 - /manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/ Date: Mon, 01 May 2017 16:17:54 -0000 To: commits@manifoldcf.apache.org From: kishore@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170501161754.B45B53A3B85@svn01-us-west.apache.org> archived-at: Mon, 01 May 2017 16:17:57 -0000 Author: kishore Date: Mon May 1 16:17:54 2017 New Revision: 1793368 URL: http://svn.apache.org/viewvc?rev=1793368&view=rev Log: Updated View Configuations Modified: manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Bandwidth.html.vm manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Certificates.html.vm manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewConfiguration.html.vm Modified: manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Bandwidth.html.vm URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Bandwidth.html.vm?rev=1793368&r1=1793367&r2=1793368&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Bandwidth.html.vm (original) +++ manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Bandwidth.html.vm Mon May 1 16:17:54 2017 @@ -16,10 +16,16 @@ --> #set( $BINCOUNTER = 0) #if($TABNAME == $ResourceBundle.getString('WebcrawlerConnector.Bandwidth')) +
$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Throttles'))
-
    +
      #foreach($throttleMap in $THROTTLESMAPLIST) #set( $THROTTLEPREFIX = "bandwidth_" + $BINCOUNTER )
    • Modified: manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Certificates.html.vm URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Certificates.html.vm?rev=1793368&r1=1793367&r2=1793368&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Certificates.html.vm (original) +++ manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Certificates.html.vm Mon May 1 16:17:54 2017 @@ -18,33 +18,39 @@ #if($TABNAME == $ResourceBundle.getString('WebcrawlerConnector.Certificates'))
      - - - - - - - +
      $Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.TrustCertificates'))
      +
        +
      • +
        +
        $Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression'))
        +
        $Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Certificate'))
        +
        +
        +
        • #foreach($trustMap in $TRUSTMAPLIST) #set( $PREFIX = "trust_" + $COUNTER ) -
      - - - #if($trustMap["trustEverything"] == "true") - - #else - - #end - + + + #set( $COUNTER = $COUNTER + 1) #end -
      $Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.TrustCertificates'))
      $Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression'))$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Certificate'))
      - +
    • +
      +
      $Encoder.bodyEscape($trustMap["regexp"])
      +
      + #if($trustMap["trustEverything"] == "true") + $Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.TrustEverything")) + #else + $Encoder.bodyEscape($trustMap["shortenedDescription"]) + #end +
      +
      + -
      		• $Encoder.bodyEscape($trustMap["regexp"])$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.TrustEverything"))$Encoder.bodyEscape($trustMap["shortenedDescription"])
      +
#if($COUNTER == "0") Modified: manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewConfiguration.html.vm URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewConfiguration.html.vm?rev=1793368&r1=1793367&r2=1793368&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewConfiguration.html.vm (original) +++ manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewConfiguration.html.vm Mon May 1 16:17:54 2017 @@ -15,14 +15,14 @@ limitations under the License. --> - +
- - + + - - + - - + - - - - - - - - - - - - - -
$ResourceBundle.getString('WebcrawlerConnector.EmailAddress')$Encoder.bodyEscape($EMAIL)$ResourceBundle.getString('WebcrawlerConnector.EmailAddress')$Encoder.bodyEscape($EMAIL)
$ResourceBundle.getString('WebcrawlerConnector.RobotsUsage') + $ResourceBundle.getString('WebcrawlerConnector.RobotsUsage') #if($ROBOTSUSAGE == 'none') $ResourceBundle.getString('WebcrawlerConnector.DontLookAtRobotsTxt') #elseif($ROBOTUSAGE == 'data') @@ -31,8 +31,8 @@ $ResourceBundle.getString('WebcrawlerConnector.ObeyRobotsTxtForAllFetches') #end $ResourceBundle.getString('WebcrawlerConnector.MetaRobotsTagsUsage') + $ResourceBundle.getString('WebcrawlerConnector.MetaRobotsTagsUsage') #if($METAROBOTSTAGSUSAGE == 'none') $ResourceBundle.getString('WebcrawlerConnector.DontLookAtMetaRobotsTags') #elseif($METAROBOTSTAGSUSAGE == 'all') @@ -41,50 +41,50 @@
$ResourceBundle.getString('WebcrawlerConnector.ProxyHostColon')$Encoder.bodyEscape($PROXYHOST)$ResourceBundle.getString('WebcrawlerConnector.ProxyPortColon')$Encoder.bodyEscape($PROXYPORT)
$ResourceBundle.getString('WebcrawlerConnector.ProxyAuthenticationDomainColon')$Encoder.bodyEscape($PROXYAUTHDOMAIN)$ResourceBundle.getString('WebcrawlerConnector.ProxyAuthenticationUserNameColon')$Encoder.bodyEscape($PROXYAUTHUSERNAME)
$ResourceBundle.getString('WebcrawlerConnector.BandwidthThrottling') - - - - - - - + + + + + + + + + + + + + +
$ResourceBundle.getString('WebcrawlerConnector.BinRegularExpression')$ResourceBundle.getString('WebcrawlerConnector.CaseInsensitive')$ResourceBundle.getString('WebcrawlerConnector.MaxConnections')$ResourceBundle.getString('WebcrawlerConnector.MaxKbytesSec')$ResourceBundle.getString('WebcrawlerConnector.MaxFetchesMin')$ResourceBundle.getString('WebcrawlerConnector.ProxyHostColon')$Encoder.bodyEscape($PROXYHOST)$ResourceBundle.getString('WebcrawlerConnector.ProxyPortColon')$Encoder.bodyEscape($PROXYPORT)
$ResourceBundle.getString('WebcrawlerConnector.ProxyAuthenticationDomainColon')$Encoder.bodyEscape($PROXYAUTHDOMAIN)$ResourceBundle.getString('WebcrawlerConnector.ProxyAuthenticationUserNameColon')$Encoder.bodyEscape($PROXYAUTHUSERNAME)
$ResourceBundle.getString('WebcrawlerConnector.BandwidthThrottling') + + + #set( $BINCOUNTER = 0) #foreach($throttleMap in $THROTTLESMAPLIST) - - - + - - - -
$ResourceBundle.getString('WebcrawlerConnector.BinRegularExpression') + $ResourceBundle.getString('WebcrawlerConnector.CaseInsensitive') + $ResourceBundle.getString('WebcrawlerConnector.MaxConnections') + $ResourceBundle.getString('WebcrawlerConnector.MaxKbytesSec') + $ResourceBundle.getString('WebcrawlerConnector.MaxFetchesMin')
- $Encoder.bodyEscape($throttleMap.get("regexp")) + + $Encoder.bodyEscape($throttleMap.get("regexp")) $throttleMap["isCaseInsensitive"] + $throttleMap["isCaseInsensitive"] #if($throttleMap["maxConnections"] == "") Not limited #else $throttleMap["maxConnections"] #end + #if($throttleMap["maxKBPerSecond"] == "") Not limited #else $throttleMap["maxKBPerSecond"] #end + #if($throttleMap["maxFetchesPerMinute"] == "") Not limited #else @@ -102,80 +102,80 @@
$ResourceBundle.getString('WebcrawlerConnector.PageAccessCredentials') - - - - - - + + - -
$ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression')$ResourceBundle.getString('WebcrawlerConnector.CredentialType')$ResourceBundle.getString('WebcrawlerConnector.CredentialDomain')$ResourceBundle.getString('WebcrawlerConnector.UserName')$ResourceBundle.getString('WebcrawlerConnector.PageAccessCredentials') + + + #set( $COUNTER = 0) #foreach($pageAccessMap in $PAGEACCESSMAPLIST) - - - - + + #set( $COUNTER = $COUNTER + 1) #end #if($COUNTER == 0) - + #end
$ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression') + $ResourceBundle.getString('WebcrawlerConnector.CredentialType') + $ResourceBundle.getString('WebcrawlerConnector.CredentialDomain') + $ResourceBundle.getString('WebcrawlerConnector.UserName')
- $Encoder.bodyEscape($pageAccessMap["regexp"]) + + $Encoder.bodyEscape($pageAccessMap["regexp"]) + $pageAccessMap["type"] $Encoder.bodyEscape($pageAccessMap["domain"])$Encoder.attributeEscape($pageAccessMap["userName"])$Encoder.bodyEscape($pageAccessMap["domain"])$Encoder.attributeEscape($pageAccessMap["userName"])
$ResourceBundle.getString('WebcrawlerConnector.NoPageAccessCredentials')
$ResourceBundle.getString('WebcrawlerConnector.NoPageAccessCredentials')
$ResourceBundle.getString('WebcrawlerConnector.SessionBasedAccessCredentials') - - - - + +
$ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression')$ResourceBundle.getString('WebcrawlerConnector.LoginPages')$ResourceBundle.getString('WebcrawlerConnector.SessionBasedAccessCredentials') + + + #set( $COUNTER = 0) #foreach($sessionAccessMap in $SESSIONACCESSMAPLIST) - -
$ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression') + $ResourceBundle.getString('WebcrawlerConnector.LoginPages')
$Encoder.bodyEscape($sessionAccessMap["regexp"]) - - - - - - - + + - -
$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.LoginURLRegularExpression'))$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.PageType'))$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.FormNamelinkTargetRegularExpression'))$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.OverrideTargetURL'))$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.OverrideFormParameters'))$Encoder.bodyEscape($sessionAccessMap["regexp"]) + + + + + + + #set( $AUTHPAGECOUNTER = 0 ) #set( $AUTHPAGEMAPLIST = $sessionAccessMap["authPageMapList"]) #foreach($authPageMap in $AUTHPAGEMAPLIST) - - - - + + + + #if($authPageMap["pageType"] == "form") - @@ -200,39 +200,33 @@ #set( $COUNTER = $COUNTER + 1) #end #if($COUNTER == 0) - + #end
$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.LoginURLRegularExpression'))$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.PageType'))$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.FormNamelinkTargetRegularExpression'))$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.OverrideTargetURL'))$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.OverrideFormParameters'))
$Encoder.bodyEscape($authPageMap["pageRegexp"])$authPageMap["pageType"]$Encoder.bodyEscape($authPageMap["matchRegexp"])$Encoder.bodyEscape($authPageMap["overrideTargetURL"])$Encoder.bodyEscape($authPageMap["pageRegexp"])$authPageMap["pageType"]$Encoder.bodyEscape($authPageMap["matchRegexp"])$Encoder.bodyEscape($authPageMap["overrideTargetURL"]) - - - - - + #else - + #end #set( $AUTHPAGECOUNTER = $AUTHPAGECOUNTER + 1 ) #end #if($AUTHPAGECOUNTER == 0) - + #end
$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ParameterRegularExpression'))$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Value'))$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Password')) + + + + + #set( $AUTHPARAMCOUNTER = 0) #set( $AUTHPAGEPARAMMAPLIST = $authPageMap["authPageParamMapList"] ) #foreach($authPageParamMap in $AUTHPAGEPARAMMAPLIST) - - - + +
$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ParameterRegularExpression'))$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Value'))$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Password'))
$Encoder.bodyEscape($authPageParamMap["param"])$Encoder.bodyEscape($authPageParamMap["value"]) + $Encoder.bodyEscape($authPageParamMap["param"])$Encoder.bodyEscape($authPageParamMap["value"]) #if($authPageParamMap["password"] != "") ***** #end @@ -186,13 +186,13 @@
$ResourceBundle.getString('WebcrawlerConnector.NoLoginPagesSpecified')
$ResourceBundle.getString('WebcrawlerConnector.NoLoginPagesSpecified')
$ResourceBundle.getString('WebcrawlerConnector.NoSessionBasedAccessCredentials')
$ResourceBundle.getString('WebcrawlerConnector.NoSessionBasedAccessCredentials')
$ResourceBundle.getString('WebcrawlerConnector.TrustCertificates') - - - - + +
$ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression')$ResourceBundle.getString('WebcrawlerConnector.Certificate')$ResourceBundle.getString('WebcrawlerConnector.TrustCertificates') + + + + #set( $COUNTER = 0) #foreach($trustMap in $TRUSTMAPLIST) - + #if($trustMap["trustEverything"] == "true") - + #else - + #end #set( $COUNTER = $COUNTER + 1) #end #if($COUNTER == 0) - + #end
$ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression')$ResourceBundle.getString('WebcrawlerConnector.Certificate')
- $Encoder.bodyEscape($trustMap["regexp"]) - $Encoder.bodyEscape($trustMap["regexp"]) - $Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.TrustEverything")) - $Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.TrustEverything")) - $Encoder.bodyEscape($trustMap["shortenedDescription"]) - $Encoder.bodyEscape($trustMap["shortenedDescription"])
$ResourceBundle.getString('WebcrawlerConnector.NoTrustCertificates')
$ResourceBundle.getString('WebcrawlerConnector.NoTrustCertificates')