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 2019/01/08 00:16:22 UTC

svn commit: r1850700 [5/6] - in /manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main: java/org/apache/manifoldcf/authorities/authorities/csws/ java/org/apache/manifoldcf/crawler/connectors/csws/ java/org/apache/manifoldcf/csws/ nativ...

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_zh_CN.properties?rev=1850700&r1=1850699&r2=1850700&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_zh_CN.properties (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_zh_CN.properties Tue Jan  8 00:16:21 2019
@@ -13,139 +13,139 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LivelinkConnector.NoAccessTokensPresent=访问令牌不存在
-LivelinkConnector.NoAccessTokensSpecified=访问令牌未指定
-LivelinkConnector.Cache=缓存
-LivelinkConnector.CacheLifetime=缓存寿命: 
-LivelinkConnector.CacheLRUSize=缓存LRU大小: 
-LivelinkConnector.minutes=分
-LivelinkConnector.Server=服务器
-LivelinkConnector.DocumentAccess=文档访问
-LivelinkConnector.DocumentView=文档显示
-LivelinkConnector.Paths=路径
-LivelinkConnector.Filters=过滤器
-LivelinkConnector.Security=安全
-LivelinkConnector.Metadata=元数据
-LivelinkConnector.UserMapping=用户映射
-LivelinkConnector.AValidNumberIsRequired=请输入有效的数字
-LivelinkConnector.UserNameRegularExpressionMustBeValidRegularExpression=请输入有效的用户名正则表达式
-LivelinkConnector.EnterALivelinkServerName=请输入LiveLink服务器名
-LivelinkConnector.AServerPortNumberIsRequired=请输入服务器端口号
-LivelinkConnector.UserNameRegularExpressionCannotBeNull=请输入用户名正则表达式
-LivelinkConnector.ServerName=服务器名: 
-LivelinkConnector.ServerPort=服务器端口: 
-LivelinkConnector.ServerUserName=服务器用户名: 
-LivelinkConnector.ServerPassword=服务器密码: 
-LivelinkConnector.UserNameRegularExpression=用户名正则表达式: 
-LivelinkConnector.LivelinkUserExpression=Livelink用户表达式: 
-LivelinkConnector.Parameters=参数: 
-LivelinkConnector.ChooseACertificateFile=请选择证书文件
-LivelinkConnector.AValidNumberIsRequired=请输入有效的数字
-LivelinkConnector.AValidNumberOrBlankIsRequired=请输入有效的数字或设为空
-LivelinkConnector.EnterALivelinkServerName=请输入LiveLink服务器名
-LivelinkConnector.AServerPortNumberIsRequired=请输入服务器端口号
-LivelinkConnector.EnterTheCrawlCgiPathToLivelink=请输入指向LiveLink的爬取CGI路径
-LivelinkConnector.TheIngestCgiPathMustBeginWithACharacter=爬取CGI路径的第一个字符必须为‘/’
-LivelinkConnector.TheViewCgiPathMustBeBlankOrBeginWithACharacter=显示CGI路径需设为空或始于‘/’字符
-LivelinkConnector.DocumentFetchProtocol=文档提取协议: 
-LivelinkConnector.DocumentFetchPort=文档提取端口号: 
-LivelinkConnector.DocumentFetchSSLCertificateList=文档提取SSL证书列表: 
-LivelinkConnector.NoCertificatesPresent=证书不存在
-LivelinkConnector.DeleteCert=删除证书 
-LivelinkConnector.AddCert=添加证书
-LivelinkConnector.Certificate=证书
-LivelinkConnector.DocumentFetchCGIPath=文档提取CGI路径: 
-LivelinkConnector.DocumentFetchNTLMDomain=文档提取NTLM域: 
-LivelinkConnector.SetIfNTLMAuthDesired=(使用NTLM权限时设置)
-LivelinkConnector.DocumentFetchNTLMUserName=文档提取NTLM用户名: 
-LivelinkConnector.SetIfDifferentFromServerUserName=(与服务器用户名不同时设置)
-LivelinkConnector.DocumentFetchNTLMPassword=文档提取NTLM密码: 
-LivelinkConnector.SetIfDifferentFromServerPassword=(与服务器密码不同时设置)
-LivelinkConnector.DocumentViewProtocol=文档显示协议: 
-LivelinkConnector.SameAsFetchProtocol=与提取协议相同
-LivelinkConnector.DocumentViewServerName=文档显示服务器名: 
-LivelinkConnector.BlankSameAsFetchServer=(空白 = 与提取服务器相同)
-LivelinkConnector.DocumentViewPort=文档显示端口号: 
-LivelinkConnector.DocumentViewCGIPath=文档显示CGI路径
-LivelinkConnector.Parameters=参数: 
-LivelinkConnector.certificates=证书
-LivelinkConnector.SelectAFolderFirst=请选择文件夹
-LivelinkConnector.TypeInAFileSpecification=请输入文件规范
-LivelinkConnector.TypeInAnAccessToken=请输入访问令牌
-LivelinkConnector.SelectAWorkspaceFirst=请选择工作区
-LivelinkConnector.SelectACategoryFirst=请选择分类
-LivelinkConnector.SelectAtLeastOneAttributeFirst=请至少选择一个属性。不要选择下拉式标题
-LivelinkConnector.MatchStringCannotBeEmpty=匹配字符串不能为空
-LivelinkConnector.MatchStringMustBeValidRegularExpression=匹配字符串需输入有效的正则表达式
-LivelinkConnector.DeletePath=删除路径:  #
-LivelinkConnector.NoStartingPointsDefined=请指定起点
-LivelinkConnector.AddPath=添加路径
-LivelinkConnector.AddToPath=添加到路径
-LivelinkConnector.PickAFolder=-- 请选择文件夹 --
-LivelinkConnector.DeleteFilespec=删除文件规范:  #
-LivelinkConnector.NoIncludeExcludeFilesDefined=请选择包含／排除文件
-LivelinkConnector.AddFileSpecification=添加文件规范
-LivelinkConnector.Include=包含
-LivelinkConnector.Exclude=排除
-LivelinkConnector.SecurityColon=安全: 
-LivelinkConnector.Enabled=有效
-LivelinkConnector.Disabled=无效
-LivelinkConnector.DeleteToken=删除令牌:  #
-LivelinkConnector.AddAccessToken=添加访问令牌
-LivelinkConnector.IngestALLMetadata=爬取所有元数据？
-LivelinkConnector.Yes=是
-LivelinkConnector.No=否
-LivelinkConnector.DeleteMetadata=删除元数据:  #
-LivelinkConnector.NoMetadataSpecified=元数据未指定
-LivelinkConnector.AddMetadataItem=添加元数据
-LivelinkConnector.BackUpMetadataPath=备份元数据路径
-LivelinkConnector.AllAttributesInThisCategory=此分类的所有属性
-LivelinkConnector.PickAttributes=-- 请选择属性 --
-LivelinkConnector.AddToMetadataPath=添加到元数据路径
-LivelinkConnector.PickWorkspace=-- 请选择工作区 --
-LivelinkConnector.BackUpMetadataPath=备份元数据路径
-LivelinkConnector.PickAFolder=-- 请选择文件夹 --
-LivelinkConnector.AddCategory=添加分类
-LivelinkConnector.PickACategory=-- 请选择分类 --
-LivelinkConnector.PathAttributeName=路径属性名: 
-LivelinkConnector.PathSeparatorString=路径分隔符:
-LivelinkConnector.DeleteMapping=删除映射:  #
-LivelinkConnector.NoMappingsSpecified=映射未指定
-LivelinkConnector.AddToMappings=添加到映射
-LivelinkConnector.Roots=æ ¹: 
-LivelinkConnector.NoStartPointsSpecified=起点未指定
-LivelinkConnector.FileSpecs=文件规范: 
-LivelinkConnector.NoFileSpecsSpecified=文件规范未指定
-LivelinkConnector.Enabled2=有效
-LivelinkConnector.AccessTokens=访问令牌: 
-LivelinkConnector.OnlySpecifiedMetadataWillBeIngested=只爬取指定的元数据
-LivelinkConnector.AllDocumentMetadataWillBeIngested=爬取所有文档元数据
-LivelinkConnector.MetadataSpecification=元数据规范: 
-LivelinkConnector.SpecificMetadata=特定元数据: 
-LivelinkConnector.NoMetadataSpecified=元数据未指定
-LivelinkConnector.PathNameMetadataAttribute=路径名元数据属性: 
-LivelinkConnector.NoPathNameMetadataAttributeSpecified=路径名元数据属性未指定
-LivelinkConnector.PathValueMapping=路径值映射: 
-LivelinkConnector.NoMappingsSpecified=映射未指定
-LivelinkConnector.CacheLifetimeCannotBeNull=请输入缓存寿命
-LivelinkConnector.CacheLifetimeMustBeAnInteger=缓存寿命需输入整数
-LivelinkConnector.CacheLRUSizeCannotBeNull=缓存LRU大小不能为空
-LivelinkConnector.CacheLRUSizeMustBeAnInteger=缓存LRU大小需输入整数
+CswsConnector.NoAccessTokensPresent=访问令牌不存在
+CswsConnector.NoAccessTokensSpecified=访问令牌未指定
+CswsConnector.Cache=缓存
+CswsConnector.CacheLifetime=缓存寿命: 
+CswsConnector.CacheLRUSize=缓存LRU大小: 
+CswsConnector.minutes=分
+CswsConnector.Server=服务器
+CswsConnector.DocumentAccess=文档访问
+CswsConnector.DocumentView=文档显示
+CswsConnector.Paths=路径
+CswsConnector.Filters=过滤器
+CswsConnector.Security=安全
+CswsConnector.Metadata=元数据
+CswsConnector.UserMapping=用户映射
+CswsConnector.AValidNumberIsRequired=请输入有效的数字
+CswsConnector.UserNameRegularExpressionMustBeValidRegularExpression=请输入有效的用户名正则表达式
+CswsConnector.EnterALivelinkServerName=请输入LiveLink服务器名
+CswsConnector.AServerPortNumberIsRequired=请输入服务器端口号
+CswsConnector.UserNameRegularExpressionCannotBeNull=请输入用户名正则表达式
+CswsConnector.ServerName=服务器名: 
+CswsConnector.ServerPort=服务器端口: 
+CswsConnector.ServerUserName=服务器用户名: 
+CswsConnector.ServerPassword=服务器密码: 
+CswsConnector.UserNameRegularExpression=用户名正则表达式: 
+CswsConnector.LivelinkUserExpression=Livelink用户表达式: 
+CswsConnector.Parameters=参数: 
+CswsConnector.ChooseACertificateFile=请选择证书文件
+CswsConnector.AValidNumberIsRequired=请输入有效的数字
+CswsConnector.AValidNumberOrBlankIsRequired=请输入有效的数字或设为空
+CswsConnector.EnterALivelinkServerName=请输入LiveLink服务器名
+CswsConnector.AServerPortNumberIsRequired=请输入服务器端口号
+CswsConnector.EnterTheCrawlCgiPathToLivelink=请输入指向LiveLink的爬取CGI路径
+CswsConnector.TheIngestCgiPathMustBeginWithACharacter=爬取CGI路径的第一个字符必须为‘/’
+CswsConnector.TheViewCgiPathMustBeBlankOrBeginWithACharacter=显示CGI路径需设为空或始于‘/’字符
+CswsConnector.DocumentFetchProtocol=文档提取协议: 
+CswsConnector.DocumentFetchPort=文档提取端口号: 
+CswsConnector.DocumentFetchSSLCertificateList=文档提取SSL证书列表: 
+CswsConnector.NoCertificatesPresent=证书不存在
+CswsConnector.DeleteCert=删除证书 
+CswsConnector.AddCert=添加证书
+CswsConnector.Certificate=证书
+CswsConnector.DocumentFetchCGIPath=文档提取CGI路径: 
+CswsConnector.DocumentFetchNTLMDomain=文档提取NTLM域: 
+CswsConnector.SetIfNTLMAuthDesired=(使用NTLM权限时设置)
+CswsConnector.DocumentFetchNTLMUserName=文档提取NTLM用户名: 
+CswsConnector.SetIfDifferentFromServerUserName=(与服务器用户名不同时设置)
+CswsConnector.DocumentFetchNTLMPassword=文档提取NTLM密码: 
+CswsConnector.SetIfDifferentFromServerPassword=(与服务器密码不同时设置)
+CswsConnector.DocumentViewProtocol=文档显示协议: 
+CswsConnector.SameAsFetchProtocol=与提取协议相同
+CswsConnector.DocumentViewServerName=文档显示服务器名: 
+CswsConnector.BlankSameAsFetchServer=(空白 = 与提取服务器相同)
+CswsConnector.DocumentViewPort=文档显示端口号: 
+CswsConnector.DocumentViewCGIPath=文档显示CGI路径
+CswsConnector.Parameters=参数: 
+CswsConnector.certificates=证书
+CswsConnector.SelectAFolderFirst=请选择文件夹
+CswsConnector.TypeInAFileSpecification=请输入文件规范
+CswsConnector.TypeInAnAccessToken=请输入访问令牌
+CswsConnector.SelectAWorkspaceFirst=请选择工作区
+CswsConnector.SelectACategoryFirst=请选择分类
+CswsConnector.SelectAtLeastOneAttributeFirst=请至少选择一个属性。不要选择下拉式标题
+CswsConnector.MatchStringCannotBeEmpty=匹配字符串不能为空
+CswsConnector.MatchStringMustBeValidRegularExpression=匹配字符串需输入有效的正则表达式
+CswsConnector.DeletePath=删除路径:  #
+CswsConnector.NoStartingPointsDefined=请指定起点
+CswsConnector.AddPath=添加路径
+CswsConnector.AddToPath=添加到路径
+CswsConnector.PickAFolder=-- 请选择文件夹 --
+CswsConnector.DeleteFilespec=删除文件规范:  #
+CswsConnector.NoIncludeExcludeFilesDefined=请选择包含／排除文件
+CswsConnector.AddFileSpecification=添加文件规范
+CswsConnector.Include=包含
+CswsConnector.Exclude=排除
+CswsConnector.SecurityColon=安全: 
+CswsConnector.Enabled=有效
+CswsConnector.Disabled=无效
+CswsConnector.DeleteToken=删除令牌:  #
+CswsConnector.AddAccessToken=添加访问令牌
+CswsConnector.IngestALLMetadata=爬取所有元数据？
+CswsConnector.Yes=是
+CswsConnector.No=否
+CswsConnector.DeleteMetadata=删除元数据:  #
+CswsConnector.NoMetadataSpecified=元数据未指定
+CswsConnector.AddMetadataItem=添加元数据
+CswsConnector.BackUpMetadataPath=备份元数据路径
+CswsConnector.AllAttributesInThisCategory=此分类的所有属性
+CswsConnector.PickAttributes=-- 请选择属性 --
+CswsConnector.AddToMetadataPath=添加到元数据路径
+CswsConnector.PickWorkspace=-- 请选择工作区 --
+CswsConnector.BackUpMetadataPath=备份元数据路径
+CswsConnector.PickAFolder=-- 请选择文件夹 --
+CswsConnector.AddCategory=添加分类
+CswsConnector.PickACategory=-- 请选择分类 --
+CswsConnector.PathAttributeName=路径属性名: 
+CswsConnector.PathSeparatorString=路径分隔符:
+CswsConnector.DeleteMapping=删除映射:  #
+CswsConnector.NoMappingsSpecified=映射未指定
+CswsConnector.AddToMappings=添加到映射
+CswsConnector.Roots=æ ¹: 
+CswsConnector.NoStartPointsSpecified=起点未指定
+CswsConnector.FileSpecs=文件规范: 
+CswsConnector.NoFileSpecsSpecified=文件规范未指定
+CswsConnector.Enabled2=有效
+CswsConnector.AccessTokens=访问令牌: 
+CswsConnector.OnlySpecifiedMetadataWillBeIngested=只爬取指定的元数据
+CswsConnector.AllDocumentMetadataWillBeIngested=爬取所有文档元数据
+CswsConnector.MetadataSpecification=元数据规范: 
+CswsConnector.SpecificMetadata=特定元数据: 
+CswsConnector.NoMetadataSpecified=元数据未指定
+CswsConnector.PathNameMetadataAttribute=路径名元数据属性: 
+CswsConnector.NoPathNameMetadataAttributeSpecified=路径名元数据属性未指定
+CswsConnector.PathValueMapping=路径值映射: 
+CswsConnector.NoMappingsSpecified=映射未指定
+CswsConnector.CacheLifetimeCannotBeNull=请输入缓存寿命
+CswsConnector.CacheLifetimeMustBeAnInteger=缓存寿命需输入整数
+CswsConnector.CacheLRUSizeCannotBeNull=缓存LRU大小不能为空
+CswsConnector.CacheLRUSizeMustBeAnInteger=缓存LRU大小需输入整数
 
-LivelinkConnector.ServerProtocol=服务器协议: 
-LivelinkConnector.internal=内部
-LivelinkConnector.ServerHTTPCGIPath=服务器HTTP CGI路径:  
-LivelinkConnector.ServerHTTPNTLMDomain=服务器HTTP域:  
-LivelinkConnector.ServerHTTPNTLMUserName=服务器HTTP NTLM用户名:  
-LivelinkConnector.ServerHTTPNTLMPassword=服务器HTTP NTLM密码:  
-LivelinkConnector.ServerSSLCertificateList=服务器SSL证书列表:  
-LivelinkConnector.EnterTheServerCgiPathToLivelink=请输入指向Livelink的服务器CGI路径 
-LivelinkConnector.TheServerCgiPathMustBeginWithACharacter=服务器CGI路径需始于'/'字符
-LivelinkConnector.Delete=删除
-LivelinkConnector.Add=添加
-LivelinkConnector.CrawlUserWorkspaces=爬取用户工作区
+CswsConnector.ServerProtocol=服务器协议: 
+CswsConnector.internal=内部
+CswsConnector.ServerHTTPCGIPath=服务器HTTP CGI路径:  
+CswsConnector.ServerHTTPNTLMDomain=服务器HTTP域:  
+CswsConnector.ServerHTTPNTLMUserName=服务器HTTP NTLM用户名:  
+CswsConnector.ServerHTTPNTLMPassword=服务器HTTP NTLM密码:  
+CswsConnector.ServerSSLCertificateList=服务器SSL证书列表:  
+CswsConnector.EnterTheServerCgiPathToLivelink=请输入指向Livelink的服务器CGI路径 
+CswsConnector.TheServerCgiPathMustBeginWithACharacter=服务器CGI路径需始于'/'字符
+CswsConnector.Delete=删除
+CswsConnector.Add=添加
+CswsConnector.CrawlUserWorkspaces=爬取用户工作区
 
-LivelinkConnector.EnterTheViewCgiPathToLivelink=请输入指向LiveLink的显示CGI路径 
-LivelinkConnector.TheIngestCgiPathMustBeBlankOrBeginWithACharacter=爬取CGI路径需设为空或始于'/'字符
-LivelinkConnector.UseLAPI=使用LAPI
-LivelinkConnector.SelectAViewProtocol=请选择显示协议
+CswsConnector.EnterTheViewCgiPathToLivelink=请输入指向LiveLink的显示CGI路径 
+CswsConnector.TheIngestCgiPathMustBeBlankOrBeginWithACharacter=爬取CGI路径需设为空或始于'/'字符
+CswsConnector.UseLAPI=使用LAPI
+CswsConnector.SelectAViewProtocol=请选择显示协议

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/editConfiguration.js?rev=1850700&r1=1850699&r2=1850700&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/editConfiguration.js (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/editConfiguration.js Tue Jan  8 00:16:21 2019
@@ -27,7 +27,7 @@
     {
       if (editconnection.servercertificate.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.ChooseACertificateFile'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.ChooseACertificateFile'))");
         editconnection.servercertificate.focus();
       }
       else
@@ -41,7 +41,7 @@
     {
       if (editconnection.serverport.value != "" && !isInteger(editconnection.serverport.value))
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.AValidNumberIsRequired'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.AValidNumberIsRequired'))");
         editconnection.serverport.focus();
         return false;
       }
@@ -52,43 +52,43 @@
     {
       if (editconnection.servername.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.EnterALivelinkServerName'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.Server'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.EnterALivelinkServerName'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
         editconnection.servername.focus();
         return false;
       }
       if (editconnection.serverport.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.AServerPortNumberIsRequired'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.Server'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.AServerPortNumberIsRequired'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
         editconnection.serverport.focus();
         return false;
       }
       if (editconnection.cachelifetime.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.CacheLifetimeCannotBeNull'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.Cache'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.CacheLifetimeCannotBeNull'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Cache'))");
         editconnection.cachelifetime.focus();
         return false;
       }
       if (editconnection.cachelifetime.value != "" && !isInteger(editconnection.cachelifetime.value))
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.CacheLifetimeMustBeAnInteger'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.Cache'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.CacheLifetimeMustBeAnInteger'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Cache'))");
         editconnection.cachelifetime.focus();
         return false;
       }
       if (editconnection.cachelrusize.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.CacheLRUSizeCannotBeNull'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.Cache'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.CacheLRUSizeCannotBeNull'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Cache'))");
         editconnection.cachelrusize.focus();
         return false;
       }
       if (editconnection.cachelrusize.value != "" && !isInteger(editconnection.cachelrusize.value))
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.CacheLRUSizeMustBeAnInteger'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.Cache'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.CacheLRUSizeMustBeAnInteger'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Cache'))");
         editconnection.cachelrusize.focus();
         return false;
       }

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/editConfiguration_Cache.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/editConfiguration_Cache.html?rev=1850700&r1=1850699&r2=1850700&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/editConfiguration_Cache.html (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/editConfiguration_Cache.html Tue Jan  8 00:16:21 2019
@@ -14,18 +14,18 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-#if($TabName == $ResourceBundle.getString('LivelinkConnector.Cache'))
+#if($TabName == $ResourceBundle.getString('CswsConnector.Cache'))
 <table class="displaytable">
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.CacheLifetime'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.CacheLifetime'))</nobr></td>
     <td class="value">
       <input type="text" size="5" name="cachelifetime" value="$Encoder.attributeEscape($CACHELIFETIME)"/>
-      $Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.minutes'))
+      $Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.minutes'))
     </td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.CacheLRUSize'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.CacheLRUSize'))</nobr></td>
     <td class="value">
       <input type="text" size="5" name="cachelrusize" value="$Encoder.attributeEscape($CACHELRUSIZE)"/>
     </td>

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/editConfiguration_Server.html?rev=1850700&r1=1850699&r2=1850700&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/editConfiguration_Server.html (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/editConfiguration_Server.html Tue Jan  8 00:16:21 2019
@@ -18,14 +18,14 @@
 #if($SERVERHTTPSKEYSTORE)
 <input type="hidden" name="serverhttpskeystoredata" value="$Encoder.attributeEscape($SERVERHTTPSKEYSTORE)"/>
 #end
-#if($TabName == $ResourceBundle.getString('LivelinkConnector.Server'))
+#if($TabName == $ResourceBundle.getString('CswsConnector.Server'))
 <table class="displaytable">
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
-    <td class="description">$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerProtocol'))</td>
+    <td class="description">$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerProtocol'))</td>
     <td class="value">
       <select name="serverprotocol" size="2">
-        <option value="internal" #if($SERVERPROTOCOL == 'internal') selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.internal'))</option>
+        <option value="internal" #if($SERVERPROTOCOL == 'internal') selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.internal'))</option>
         <option value="http"     #if($SERVERPROTOCOL == 'http')     selected="selected" #{else} "" #end >http</option>
         <option value="https"    #if($SERVERPROTOCOL == 'https')    selected="selected" #{else} "" #end >https</option>
        </select>
@@ -33,7 +33,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerName'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerName'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="64" name="servername" value="$Encoder.attributeEscape($SERVERNAME)"/>
@@ -41,7 +41,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerPort'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerPort'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="5" name="serverport" value="$SERVERPORT"/>
@@ -49,7 +49,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerUserName'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerUserName'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="32" name="serverusername" value="$Encoder.attributeEscape($SERVERUSERNAME)"/>
@@ -57,7 +57,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerPassword'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerPassword'))</nobr>
     </td>
     <td class="value">
       <input type="password" size="32" name="serverpassword" value="$Encoder.attributeEscape($SERVERPASSWORD)"/>
@@ -66,7 +66,7 @@
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerHTTPCGIPath'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerHTTPCGIPath'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="32" name="serverhttpcgipath" value="$Encoder.attributeEscape($SERVERHTTPCGIPATH)"/>
@@ -74,9 +74,9 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerHTTPNTLMDomain'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerHTTPNTLMDomain'))</nobr>
       <br/>
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.SetIfNTLMAuthDesired'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.SetIfNTLMAuthDesired'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="32" name="serverhttpntlmdomain" value="$Encoder.attributeEscape($SERVERHTTPNTLMDOMAIN)"/>
@@ -84,7 +84,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerHTTPNTLMUserName'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerHTTPNTLMUserName'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="32" name="serverhttpntlmusername" value="$Encoder.attributeEscape($SERVERHTTPNTLMUSERNAME)"/>
@@ -92,7 +92,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerHTTPNTLMPassword'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerHTTPNTLMPassword'))</nobr>
     </td>
     <td class="value">
       <input type="password" size="32" name="serverhttpntlmpassword" value="$Encoder.attributeEscape($SERVERHTTPNTLMPASSWORD)"/>
@@ -101,7 +101,7 @@
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerSSLCertificateList'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerSSLCertificateList'))</nobr>
     </td>
     <td class="value">
       <input type="hidden" name="serverkeystorealias" value=""/>
@@ -111,8 +111,8 @@
         <tr>
           <td class="value">
             <input type="button" onclick='Javascript:ServerDeleteCertificate($Encoder.attributeJavascriptEscape($cert.Key))'
-                   alt="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.DeleteCert'))$Encoder.attributeEscape($cert.Key)"
-                   value="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.Delete'))"/>
+                   alt="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.DeleteCert'))$Encoder.attributeEscape($cert.Key)"
+                   value="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.Delete'))"/>
             $Encoder.bodyEscape($cert.Value)
           </td>
         </tr>
@@ -120,14 +120,14 @@
         #else
         <tr>
           <td class="message" colspan="2">
-            <nobr>$ResourceBundle.getString('LivelinkConnector.NoCertificatesPresent')</nobr>
+            <nobr>$ResourceBundle.getString('CswsConnector.NoCertificatesPresent')</nobr>
           </td>
         </tr>
         #end
       </table>
-      <input type="button" onclick='Javascript:ServerAddCertificate()' alt="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.AddCert'))"
-             value="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.Add'))"/>&nbsp;
-      $Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.Certificate'))
+      <input type="button" onclick='Javascript:ServerAddCertificate()' alt="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.AddCert'))"
+             value="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.Add'))"/>&nbsp;
+      $Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.Certificate'))
       <input name="servercertificate" size="50" type="file"/>
     </td>
   </tr>

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/viewConfiguration.html?rev=1850700&r1=1850699&r2=1850700&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/viewConfiguration.html (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/csws/viewConfiguration.html Tue Jan  8 00:16:21 2019
@@ -19,7 +19,7 @@
   <tr>
     <td class="description" colspan="1">
       <nobr>
-        $Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.Parameters'))
+        $Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.Parameters'))
       </nobr>
     </td>
     <td class="value" colspan="3">

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration.js?rev=1850700&r1=1850699&r2=1850700&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration.js (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration.js Tue Jan  8 00:16:21 2019
@@ -28,7 +28,7 @@
     {
       if (editconnection.servercertificate.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.ChooseACertificateFile'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.ChooseACertificateFile'))");
         editconnection.servercertificate.focus();
       }
       else
@@ -49,7 +49,7 @@
     {
       if (editconnection.ingestcertificate.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.ChooseACertificateFile'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.ChooseACertificateFile'))");
         editconnection.ingestcertificate.focus();
       }
       else
@@ -63,19 +63,19 @@
     {
       if (editconnection.serverport.value != "" && !isInteger(editconnection.serverport.value))
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.AValidNumberIsRequired'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.AValidNumberIsRequired'))");
         editconnection.serverport.focus();
         return false;
       }
       if (editconnection.ingestport.value != "" && !isInteger(editconnection.ingestport.value))
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.AValidNumberOrBlankIsRequired'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.AValidNumberOrBlankIsRequired'))");
         editconnection.ingestport.focus();
         return false;
       }
       if (editconnection.viewport.value != "" && !isInteger(editconnection.viewport.value))
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.AValidNumberOrBlankIsRequired'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.AValidNumberOrBlankIsRequired'))");
         editconnection.viewport.focus();
         return false;
       }
@@ -86,57 +86,57 @@
     {
       if (editconnection.servername.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.EnterALivelinkServerName'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.Server'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.EnterALivelinkServerName'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
         editconnection.servername.focus();
         return false;
       }
       if (editconnection.serverport.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.AServerPortNumberIsRequired'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.Server'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.AServerPortNumberIsRequired'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
         editconnection.serverport.focus();
         return false;
       }
       if (editconnection.serverhttpcgipath.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.EnterTheServerCgiPathToLivelink'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.Server'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.EnterTheServerCgiPathToLivelink'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
         editconnection.serverhttpcgipath.focus();
         return false;
       }
       if (editconnection.serverhttpcgipath.value.substring(0,1) != "/")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.TheServerCgiPathMustBeginWithACharacter'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.Server'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.TheServerCgiPathMustBeginWithACharacter'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
         editconnection.serverhttpcgipath.focus();
         return false;
       }
       if (editconnection.viewprotocol.value == "" && editconnection.ingestprotocol.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.SelectAViewProtocol'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.DocumentView'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.SelectAViewProtocol'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.DocumentView'))");
         editconnection.viewprotocol.focus();
         return false;
       }
       if (editconnection.viewcgipath.value == "" && editconnection.ingestcgipath.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.EnterTheViewCgiPathToLivelink'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.DocumentView'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.EnterTheViewCgiPathToLivelink'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.DocumentView'))");
         editconnection.viewcgipath.focus();
         return false;
       }
       if (editconnection.ingestcgipath.value != "" && editconnection.ingestcgipath.value.substring(0,1) != "/")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.TheIngestCgiPathMustBeBlankOrBeginWithACharacter'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.DocumentAccess'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.TheIngestCgiPathMustBeBlankOrBeginWithACharacter'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.DocumentAccess'))");
         editconnection.ingestcgipath.focus();
         return false;
       }
       if (editconnection.viewcgipath.value != "" && editconnection.viewcgipath.value.substring(0,1) != "/")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.TheViewCgiPathMustBeBlankOrBeginWithACharacter'))");
-        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.DocumentView'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.TheViewCgiPathMustBeBlankOrBeginWithACharacter'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.DocumentView'))");
         editconnection.viewcgipath.focus();
         return false;
       }

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_Access.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_Access.html?rev=1850700&r1=1850699&r2=1850700&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_Access.html (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_Access.html Tue Jan  8 00:16:21 2019
@@ -18,7 +18,7 @@
 #if($INGESTKEYSTORE)
 <input type="hidden" name="ingestkeystoredata" value="$Encoder.attributeEscape($INGESTKEYSTORE)"/>
 #end
-#if($TabName == $ResourceBundle.getString('LivelinkConnector.DocumentAccess'))
+#if($TabName == $ResourceBundle.getString('CswsConnector.DocumentAccess'))
 <table class="displaytable">
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   #if($MESSAGE)
@@ -27,10 +27,10 @@
   </td></tr>
   #end
   <tr>
-    <td class="description">$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentFetchProtocol'))</td>
+    <td class="description">$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentFetchProtocol'))</td>
     <td class="value">
       <select name="ingestprotocol" size="3">
-        <option value=""      #if($INGESTPROTOCOL == '')      selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.UseLAPI'))</option>
+        <option value=""      #if($INGESTPROTOCOL == '')      selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.UseLAPI'))</option>
         <option value="http"  #if($INGESTPROTOCOL == 'http')  selected="selected" #{else} "" #end >http</option>
         <option value="https" #if($INGESTPROTOCOL == 'https') selected="selected" #{else} "" #end >https</option>
       </select>
@@ -38,7 +38,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentFetchPort'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentFetchPort'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="5" name="ingestport" value="$!INGESTPORT"/>
@@ -47,7 +47,7 @@
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentFetchCGIPath'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentFetchCGIPath'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="32" name="ingestcgipath" value="$Encoder.attributeEscape($INGESTCGIPATH)"/>
@@ -55,9 +55,9 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentFetchNTLMDomain'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentFetchNTLMDomain'))</nobr>
       <br/>
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.SetIfNTLMAuthDesired'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.SetIfNTLMAuthDesired'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="32" name="ingestntlmdomain" value="$Encoder.attributeEscape($INGESTNTLMDOMAIN)"/>
@@ -65,9 +65,9 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentFetchNTLMUserName'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentFetchNTLMUserName'))</nobr>
       <br/>
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.SetIfDifferentFromServerUserName'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.SetIfDifferentFromServerUserName'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="32" name="ingestntlmusername" value="$Encoder.attributeEscape($INGESTNTLMUSERNAME)"/>
@@ -75,9 +75,9 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentFetchNTLMPassword'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentFetchNTLMPassword'))</nobr>
       <br/>
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.SetIfDifferentFromServerPassword'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.SetIfDifferentFromServerPassword'))</nobr>
     </td>
     <td class="value">
       <input type="password" size="32" name="ingestntlmpassword" value="$Encoder.attributeEscape($INGESTNTLMPASSWORD)"/>
@@ -86,7 +86,7 @@
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentFetchSSLCertificateList'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentFetchSSLCertificateList'))</nobr>
     </td>
     <td class="value">
       <input type="hidden" name="ingestkeystorealias" value=""/>
@@ -96,8 +96,8 @@
         <tr>
           <td class="value">
             <input type="button" onclick='Javascript:IngestDeleteCertificate($Encoder.attributeJavascriptEscape($cert.Key))'
-                   alt="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.DeleteCert'))$Encoder.attributeEscape($cert.Key)"
-                   value="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.Delete'))"/>
+                   alt="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.DeleteCert'))$Encoder.attributeEscape($cert.Key)"
+                   value="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.Delete'))"/>
             $Encoder.bodyEscape($cert.Value)
           </td>
         </tr>
@@ -105,14 +105,14 @@
         #else
         <tr>
           <td class="message" colspan="2">
-            <nobr>$ResourceBundle.getString('LivelinkConnector.NoCertificatesPresent')</nobr>
+            <nobr>$ResourceBundle.getString('CswsConnector.NoCertificatesPresent')</nobr>
           </td>
         </tr>
         #end
       </table>
-      <input type="button" onclick='Javascript:IngestAddCertificate()' alt="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.AddCert'))"
-             value="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.Add'))"/>&nbsp;
-      $Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.Certificate'))
+      <input type="button" onclick='Javascript:IngestAddCertificate()' alt="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.AddCert'))"
+             value="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.Add'))"/>&nbsp;
+      $Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.Certificate'))
       <input name="ingestcertificate" size="50" type="file"/>
     </td>
   </tr>

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_Server.html?rev=1850700&r1=1850699&r2=1850700&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_Server.html (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_Server.html Tue Jan  8 00:16:21 2019
@@ -18,14 +18,14 @@
 #if($SERVERHTTPSKEYSTORE)
 <input type="hidden" name="serverhttpskeystoredata" value="$Encoder.attributeEscape($SERVERHTTPSKEYSTORE)"/>
 #end
-#if($TabName == $ResourceBundle.getString('LivelinkConnector.Server'))
+#if($TabName == $ResourceBundle.getString('CswsConnector.Server'))
 <table class="displaytable">
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
-    <td class="description">$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerProtocol'))</td>
+    <td class="description">$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerProtocol'))</td>
     <td class="value">
       <select name="serverprotocol" size="2">
-        <option value="internal" #if($SERVERPROTOCOL == 'internal') selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.internal'))</option>
+        <option value="internal" #if($SERVERPROTOCOL == 'internal') selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.internal'))</option>
         <option value="http"     #if($SERVERPROTOCOL == 'http')     selected="selected" #{else} "" #end >http</option>
         <option value="https"    #if($SERVERPROTOCOL == 'https')    selected="selected" #{else} "" #end >https</option>
        </select>
@@ -33,7 +33,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerName'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerName'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="64" name="servername" value="$Encoder.attributeEscape($SERVERNAME)"/>
@@ -41,7 +41,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerPort'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerPort'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="5" name="serverport" value="$SERVERPORT"/>
@@ -49,7 +49,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerUserName'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerUserName'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="32" name="serverusername" value="$Encoder.attributeEscape($SERVERUSERNAME)"/>
@@ -57,7 +57,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerPassword'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerPassword'))</nobr>
     </td>
     <td class="value">
       <input type="password" size="32" name="serverpassword" value="$Encoder.attributeEscape($SERVERPASSWORD)"/>
@@ -66,7 +66,7 @@
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerHTTPCGIPath'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerHTTPCGIPath'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="32" name="serverhttpcgipath" value="$Encoder.attributeEscape($SERVERHTTPCGIPATH)"/>
@@ -74,9 +74,9 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerHTTPNTLMDomain'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerHTTPNTLMDomain'))</nobr>
       <br/>
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.SetIfNTLMAuthDesired'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.SetIfNTLMAuthDesired'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="32" name="serverhttpntlmdomain" value="$Encoder.attributeEscape($SERVERHTTPNTLMDOMAIN)"/>
@@ -84,7 +84,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerHTTPNTLMUserName'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerHTTPNTLMUserName'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="32" name="serverhttpntlmusername" value="$Encoder.attributeEscape($SERVERHTTPNTLMUSERNAME)"/>
@@ -92,7 +92,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerHTTPNTLMPassword'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerHTTPNTLMPassword'))</nobr>
     </td>
     <td class="value">
       <input type="password" size="32" name="serverhttpntlmpassword" value="$Encoder.attributeEscape($SERVERHTTPNTLMPASSWORD)"/>
@@ -101,7 +101,7 @@
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.ServerSSLCertificateList'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerSSLCertificateList'))</nobr>
     </td>
     <td class="value">
       <input type="hidden" name="serverkeystorealias" value=""/>
@@ -111,8 +111,8 @@
         <tr>
           <td class="value">
             <input type="button" onclick='Javascript:ServerDeleteCertificate($Encoder.attributeJavascriptEscape($cert.Key))'
-                   alt="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.DeleteCert'))$Encoder.attributeEscape($cert.Key)"
-                   value="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.Delete'))"/>
+                   alt="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.DeleteCert'))$Encoder.attributeEscape($cert.Key)"
+                   value="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.Delete'))"/>
             $Encoder.bodyEscape($cert.Value)
           </td>
         </tr>
@@ -120,14 +120,14 @@
         #else
         <tr>
           <td class="message" colspan="2">
-            <nobr>$ResourceBundle.getString('LivelinkConnector.NoCertificatesPresent')</nobr>
+            <nobr>$ResourceBundle.getString('CswsConnector.NoCertificatesPresent')</nobr>
           </td>
         </tr>
         #end
       </table>
-      <input type="button" onclick='Javascript:ServerAddCertificate()' alt="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.AddCert'))"
-             value="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.Add'))"/>&nbsp;
-      $Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.Certificate'))
+      <input type="button" onclick='Javascript:ServerAddCertificate()' alt="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.AddCert'))"
+             value="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.Add'))"/>&nbsp;
+      $Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.Certificate'))
       <input name="servercertificate" size="50" type="file"/>
     </td>
   </tr>

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_View.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_View.html?rev=1850700&r1=1850699&r2=1850700&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_View.html (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_View.html Tue Jan  8 00:16:21 2019
@@ -14,14 +14,14 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-#if($TabName == $ResourceBundle.getString('LivelinkConnector.DocumentView'))
+#if($TabName == $ResourceBundle.getString('CswsConnector.DocumentView'))
 <table class="displaytable">
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
-    <td class="description">$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentViewProtocol'))</td>
+    <td class="description">$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentViewProtocol'))</td>
     <td class="value">
       <select name="viewprotocol">
-        <option value=""      #if($VIEWPROTOCOL == '')      selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.SameAsFetchProtocol'))</option>
+        <option value=""      #if($VIEWPROTOCOL == '')      selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.SameAsFetchProtocol'))</option>
         <option value="http"  #if($VIEWPROTOCOL == 'http')  selected="selected" #{else} "" #end >http</option>
         <option value="https" #if($VIEWPROTOCOL == 'https') selected="selected" #{else} "" #end >https</option>
       </select>
@@ -29,9 +29,9 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentViewServerName'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentViewServerName'))</nobr>
       <br/>
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.BlankSameAsFetchServer'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.BlankSameAsFetchServer'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="64" name="viewservername" value="$Encoder.attributeEscape($VIEWSERVERNAME)"/>
@@ -40,7 +40,7 @@
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentViewPort'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentViewPort'))</nobr>
       <br/>
       <nobr>(blank = same as fetch port)</nobr>
     </td>
@@ -50,9 +50,9 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentViewCGIPath'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentViewCGIPath'))</nobr>
       <br/>
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.BlankSameAsFetchServer'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.BlankSameAsFetchServer'))</nobr>
     </td>
     <td class="value">
       <input type="text" size="32" name="viewcgipath" value="$Encoder.attributeEscape($VIEWCGIPATH)"/>
@@ -60,13 +60,13 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentViewAction'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentViewAction'))</nobr>
     </td>
     <td class="value">
       <select name="viewaction">
-        <option value="download"  #if($VIEWACTION == 'download')  selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentViewActionDownload'))</option>
-        <option value="open"      #if($VIEWACTION == 'open')      selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentViewActionOpen'))</option>
-        <option value="overview"  #if($VIEWACTION == 'overview')  selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DocumentViewActionOverview'))</option>
+        <option value="download"  #if($VIEWACTION == 'download')  selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentViewActionDownload'))</option>
+        <option value="open"      #if($VIEWACTION == 'open')      selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentViewActionOpen'))</option>
+        <option value="overview"  #if($VIEWACTION == 'overview')  selected="selected" #{else} "" #end >$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentViewActionOverview'))</option>
       </select>
     </td>
   </tr>

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification.js?rev=1850700&r1=1850699&r2=1850700&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification.js (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification.js Tue Jan  8 00:16:21 2019
@@ -29,7 +29,7 @@
     console.log(anchorvalue);
       if (editjob.${SEQPREFIX}pathaddon.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.SelectAFolderFirst'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.SelectAFolderFirst'))");
         editjob.${SEQPREFIX}pathaddon.focus();
         return;
       }
@@ -41,7 +41,7 @@
     {
       if (editjob.${SEQPREFIX}specfile.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.TypeInAFileSpecification'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.TypeInAFileSpecification'))");
         editjob.${SEQPREFIX}specfile.focus();
         return;
       }
@@ -52,7 +52,7 @@
     {
       if (editjob.${SEQPREFIX}spectoken.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.TypeInAnAccessToken'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.TypeInAnAccessToken'))");
         editjob.${SEQPREFIX}spectoken.focus();
         return;
       }
@@ -63,7 +63,7 @@
     {
       if (editjob.${SEQPREFIX}metadataaddon.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.SelectAFolderFirst'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.SelectAFolderFirst'))");
         editjob.${SEQPREFIX}metadataaddon.focus();
         return;
       }
@@ -74,7 +74,7 @@
     {
       if (editjob.${SEQPREFIX}metadataaddon.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.SelectAWorkspaceFirst'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.SelectAWorkspaceFirst'))");
         editjob.${SEQPREFIX}metadataaddon.focus();
         return;
       }
@@ -85,7 +85,7 @@
     {
       if (editjob.${SEQPREFIX}categoryaddon.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.SelectACategoryFirst'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.SelectACategoryFirst'))");
         editjob.${SEQPREFIX}categoryaddon.focus();
         return;
       }
@@ -96,7 +96,7 @@
     {
       if (editjob.${SEQPREFIX}attributeselect.value == "" && editjob.${SEQPREFIX}attributeall.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.SelectAtLeastOneAttributeFirst'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.SelectAtLeastOneAttributeFirst'))");
         editjob.${SEQPREFIX}attributeselect.focus();
         return;
       }
@@ -107,13 +107,13 @@
     {
       if (editjob.${SEQPREFIX}specmatch.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.MatchStringCannotBeEmpty'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.MatchStringCannotBeEmpty'))");
         editjob.${SEQPREFIX}specmatch.focus();
         return;
       }
       if (!isRegularExpression(editjob.${SEQPREFIX}specmatch.value))
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LivelinkConnector.MatchStringMustBeValidRegularExpression'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.MatchStringMustBeValidRegularExpression'))");
         editjob.${SEQPREFIX}specmatch.focus();
         return;
       }

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification_Filters.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification_Filters.html?rev=1850700&r1=1850699&r2=1850700&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification_Filters.html (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification_Filters.html Tue Jan  8 00:16:21 2019
@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 
-#if($TabName == $ResourceBundle.getString('LivelinkConnector.Filters') && ${SeqNum} == ${SelectedNum})
+#if($TabName == $ResourceBundle.getString('CswsConnector.Filters') && ${SeqNum} == ${SelectedNum})
 <table class="displaytable">
   <tr><td class="separator" colspan="2"><hr/></td></tr>
 
@@ -28,7 +28,7 @@
       <a name="s${SeqNum}_filespec_${filtercounter}">
         <input type="button" value="Delete"
                onClick="Javascript:s${SeqNum}_SpecOp('s${SeqNum}_fileop_${filtercounter}','Delete','s${SeqNum}_filespec_${filtercounter}')"
-               alt="$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DeleteFilespec'))${filtercounter}"/>
+               alt="$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DeleteFilespec'))${filtercounter}"/>
       </a>
     </td>
     <td class="value">
@@ -47,7 +47,7 @@
   #if($filtercounter == 0)
   <tr>
     <td class="message" colspan="2">
-      $Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.NoIncludeExcludeFilesDefined'))
+      $Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.NoIncludeExcludeFilesDefined'))
     </td>
   </tr>
   #end
@@ -62,13 +62,13 @@
         #set($anchorSuffix = $filtercounter+1)
         <input type="button" value="Add"
                onClick="Javascript:s${SeqNum}_SpecAddFilespec('s${SeqNum}_filespec_${anchorSuffix}')"
-              alt="$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.AddFileSpecification'))"/>
+              alt="$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.AddFileSpecification'))"/>
       </a>
     </td>
     <td class="value">
       <select name="s${SeqNum}_specfiletype">
-      <option value="include" selected="selected">$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.Include'))</option>
-      <option value="exclude">$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.Exclude'))</option>
+      <option value="include" selected="selected">$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.Include'))</option>
+      <option value="exclude">$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.Exclude'))</option>
       </select>
       <input type="text" size="30" name="s${SeqNum}_specfile" value=""/>
     </td>

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification_Metadata.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification_Metadata.html?rev=1850700&r1=1850699&r2=1850700&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification_Metadata.html (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification_Metadata.html Tue Jan  8 00:16:21 2019
@@ -15,23 +15,23 @@
  limitations under the License.
 -->
 
-#if($TabName == $ResourceBundle.getString('LivelinkConnector.Metadata') && ${SeqNum} == ${SelectedNum})
+#if($TabName == $ResourceBundle.getString('CswsConnector.Metadata') && ${SeqNum} == ${SelectedNum})
 <input type="hidden" name="s${SeqNum}_specmappingcount" value="$MATCHMAP.size()"/>
 <input type="hidden" name="s${SeqNum}_specmappingop" value=""/>
 <table class="displaytable">
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
     <td class="description" colspan="1">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.IngestALLMetadata'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.IngestALLMetadata'))</nobr>
     </td>
     <td class="value" colspan="3">
       <nobr>
         <input type="radio" name="s${SeqNum}_specallmetadata" value="true"  #if($INGESTALLMETADATA) checked="true" #{else} "" #end />
-        $Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.Yes'))
+        $Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.Yes'))
       </nobr>&nbsp;
       <nobr>
         <input type="radio" name="s${SeqNum}_specallmetadata" value="false" #if(!$INGESTALLMETADATA) checked="true" #{else} "" #end/>
-        $Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.No'))
+        $Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.No'))
       </nobr>
     </td>
   </tr>
@@ -48,7 +48,7 @@
       <a name="s${SeqNum}_metadata_${counter}">
         <input type="button" value="Delete"
                onClick="Javascript:s${SeqNum}_SpecOp('s${SeqNum}_metadataop_${counter}','Delete','s${SeqNum}_metadata_${counter}')"
-               alt="$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DeleteMetadata'))${counter}"/>
+               alt="$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DeleteMetadata'))${counter}"/>
       </a>
     </td>
     <td class="value" colspan="3">
@@ -66,7 +66,7 @@
   #if($counter == 0)
   <tr>
     <td class="message" colspan="4">
-      $Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.NoMetadataSpecified'))
+      $Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.NoMetadataSpecified'))
     </td>
   </tr>
   #end
@@ -86,7 +86,7 @@
       <a name="s${SeqNum}_metadata_${counter}">
         <input type="button" value="Add"
                onClick="Javascript:s${SeqNum}_SpecAddMetadata('s${SeqNum}_metadata_${anchorSuffix}')"
-              alt="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.AddMetadataItem'))"/>
+              alt="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.AddMetadataItem'))"/>
       </a>
     </td>
     <td class="value" colspan="3">
@@ -95,10 +95,10 @@
         <tr>
           <td class="value">
             <input type="checkbox" name="s${SeqNum}_attributeall" value="true"/>
-            $Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.AllAttributesInThisCategory'))
+            $Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.AllAttributesInThisCategory'))
             <br/>
             <select name="s${SeqNum}_attributeselect">
-              <option value="" selected="selected">$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.PickAttributes'))</option>
+              <option value="" selected="selected">$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.PickAttributes'))</option>
               #foreach($attrName in $ATTRIBUTELIST)
               <option value="$Encoder.attributeEscape($attrName)">$Encoder.bodyEscape($attrName)</option>
               #end
@@ -112,10 +112,10 @@
       <a name="s${SeqNum}_metadata_${counter}">
         <input type="button" value="+"
                onClick="Javascript:s${SeqNum}_SpecSetWorkspace('s${SeqNum}_metadata_${anchorSuffix}')"
-               alt="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.AddToMetadataPath'))"/>
+               alt="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.AddToMetadataPath'))"/>
       </a>
       <select name="s${SeqNum}_metadataaddon">
-        <option value="" selected="selected">$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.PickWorkspace'))</option>
+        <option value="" selected="selected">$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.PickWorkspace'))</option>
         #foreach($workSpace in $WORKSPACELIST)
           <option value="$Encoder.attributeEscape($workSpace)">$Encoder.bodyEscape($workSpace)</option>
         #end
@@ -128,15 +128,15 @@
       #else
         <input type="button" value="-"
                onClick='Javascript:s${SeqNum}_SpecOp("s${SeqNum}_metadataop","Up","s${SeqNum}_metadata_${counter}")'
-               alt="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.BackUpMetadataPath'))"/>&nbsp;
+               alt="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.BackUpMetadataPath'))"/>&nbsp;
         $Encoder.bodyEscape($CATEGORYSOFAR)
       #end
       #if($CHILDLIST && $CHILDLIST.size() > 0)
         <input type="button" value="+"
                onClick='Javascript:s${SeqNum}_SpecAddToMetadata("s${SeqNum}_metadata_${counter}")'
-               alt="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.AddToMetadataPath'))"/>&nbsp;
+               alt="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.AddToMetadataPath'))"/>&nbsp;
         <select name="s${SeqNum}_metadataaddon">
-          <option value="" selected="selected">$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.PickAFolder'))</option>
+          <option value="" selected="selected">$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.PickAFolder'))</option>
         #foreach($child in $CHILDLIST)
           <option value="$Encoder.attributeEscape($child)">$Encoder.bodyEscape($child)</option>
         #end
@@ -145,9 +145,9 @@
       #if($CATEGORYLIST && $CATEGORYLIST.size() > 0)
         <input type="button" value="+"
                onClick='Javascript:s${SeqNum}_SpecAddCategory("s${SeqNum}_metadata_${counter}")'
-               alt="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.AddCategory'))"/>&nbsp;
+               alt="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.AddCategory'))"/>&nbsp;
         <select name="s${SeqNum}_categoryaddon">
-          <option value="" selected="selected">$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.PickACategory'))</option>
+          <option value="" selected="selected">$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.PickACategory'))</option>
           #foreach($category in $CATEGORYLIST)
             <option value="$Encoder.attributeEscape($category)">$Encoder.bodyEscape($category)</option>
           #end
@@ -159,14 +159,14 @@
   <tr><td class="separator" colspan="4"><hr/></td></tr>
   <tr>
     <td class="description" colspan="1">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.PathAttributeName'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.PathAttributeName'))</nobr>
     </td>
     <td class="value" colspan="1">
       <input type="text" name="s${SeqNum}_specpathnameattribute" size="20"
              value="$Encoder.attributeEscape($PATHNAMEATTRIBUTE)"/>
     </td>
     <td class="description" colspan="1">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.PathSeparatorString'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.PathSeparatorString'))</nobr>
     </td>
     <td class="value" colspan="1">
       <input type="text" name="s${SeqNum}_specpathnameseparator" size="20"
@@ -181,7 +181,7 @@
       <input type="hidden" name="s${SeqNum}_specmappingop_${foreach.index}" value=""/>
       <a name="s${SeqNum}_mapping_${foreach.index}">
         <input type="button" onClick='Javascript:s${SeqNum}_SpecOp("s${SeqNum}_specmappingop_${foreach.index}","Delete","s${SeqNum}_mapping_${foreach.index}")'
-                 alt="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.DeleteMapping'))${foreach.index}" value="Delete"/>
+                 alt="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.DeleteMapping'))${foreach.index}" value="Delete"/>
       </a>
     </td>
     <td class="value">
@@ -198,7 +198,7 @@
   #if($matchMapCount == 0)
     <tr>
       <td colspan="4" class="message">
-        $Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.NoMappingsSpecified'))
+        $Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.NoMappingsSpecified'))
       </td>
     </tr>
   #end
@@ -208,7 +208,7 @@
       #set($anchorSuffix = $matchMapCount +1)
       <a name="s${SeqNum}_mapping_${matchMapCount}">
         <input type="button" onClick='Javascript:s${SeqNum}_SpecAddMapping("s${SeqNum}_mapping_${anchorSuffix}")'
-               alt="$Encoder.attributeEscape($ResourceBundle.getString('LivelinkConnector.AddToMappings'))" value="Add"/>
+               alt="$Encoder.attributeEscape($ResourceBundle.getString('CswsConnector.AddToMappings'))" value="Add"/>
       </a>
     </td>
     <td class="value">Match regexp:&nbsp;<input type="text" name="s${SeqNum}_specmatch" size="32" value=""/></td>

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification_Paths.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification_Paths.html?rev=1850700&r1=1850699&r2=1850700&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification_Paths.html (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editSpecification_Paths.html Tue Jan  8 00:16:21 2019
@@ -15,12 +15,12 @@
  limitations under the License.
 -->
 
-#if($TabName == $ResourceBundle.getString('LivelinkConnector.Paths') && ${SeqNum} == ${SelectedNum})
+#if($TabName == $ResourceBundle.getString('CswsConnector.Paths') && ${SeqNum} == ${SelectedNum})
 <table class="displaytable">
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.CrawlUserWorkspaces'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.CrawlUserWorkspaces'))</nobr>
     </td>
     <td class="value">
   #if($USERWORKSPACES)
@@ -42,7 +42,7 @@
       <a name="s${SeqNum}_path_${pathcounter}">
         <input type="button" value="Delete"
                onClick="Javascript:s${SeqNum}_SpecOp('s${SeqNum}_pathop_${pathcounter}','Delete','s${SeqNum}_path_${pathcounter}')"
-               alt="$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.DeletePath'))${pathcounter}"/>
+               alt="$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DeletePath'))${pathcounter}"/>
       </a>
     </td>
     <td class="value">
@@ -59,7 +59,7 @@
   #if($pathcounter == 0)
   <tr>
     <td class="message" colspan="2">
-      $Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.NoStartingPointsDefined'))
+      $Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.NoStartingPointsDefined'))
     </td>
   </tr>
   #end
@@ -78,7 +78,7 @@
         #set($anchorSuffix = $pathcounter+1)
         <input type="button" value="Add"
                onClick="Javascript:s${SeqNum}_SpecOp('s${SeqNum}_pathop','Add','s${SeqNum}_path_${anchorSuffix}')"
-              alt="$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.AddPath'))"/>
+              alt="$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.AddPath'))"/>
       </a>
     </td>
     <td class="value">
@@ -93,9 +93,9 @@
     #if($CHILDLIST && $CHILDLIST.size() > 0)
       <input type="button" value="+"
              onClick="Javascript:s${SeqNum}_SpecAddToPath('s${SeqNum}_path_${pathcounter}')"
-             alt="$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.AddPath'))"/>
+             alt="$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.AddPath'))"/>
       <select name="s${SeqNum}_pathaddon">
-        <option value="" selected="selected">$Encoder.bodyEscape($ResourceBundle.getString('LivelinkConnector.PickAFolder'))</option>
+        <option value="" selected="selected">$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.PickAFolder'))</option>
         #foreach($child in $CHILDLIST)
           <option value="$Encoder.attributeEscape($child)">$Encoder.bodyEscape($child)</option>
         #end