From commits-return-9981-archive-asf-public=cust-asf.ponee.io@manifoldcf.apache.org Tue Mar 5 23:35:38 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 41DEE18067C for ; Wed, 6 Mar 2019 00:35:37 +0100 (CET) Received: (qmail 50838 invoked by uid 500); 5 Mar 2019 23:35:36 -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 50829 invoked by uid 99); 5 Mar 2019 23:35:36 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Mar 2019 23:35:36 +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 9F9103A0A22 for ; Tue, 5 Mar 2019 23:35:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1854878 - in /manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main: java/org/apache/manifoldcf/crawler/connectors/csws/ java/org/apache/manifoldcf/csws/ native2ascii/org/apache/manifoldcf/crawler/connectors/csws/ resource... Date: Tue, 05 Mar 2019 23:35:35 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190305233535.9F9103A0A22@svn01-us-west.apache.org> Author: kwright Date: Tue Mar 5 23:35:34 2019 New Revision: 1854878 URL: http://svn.apache.org/viewvc?rev=1854878&view=rev Log: Add a search service Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsParameters.java manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_en_US.properties manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_es_ES.properties manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_fr_FR.properties manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_ja_JP.properties manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_zh_CN.properties manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration.js manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_Server.html Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java?rev=1854878&r1=1854877&r2=1854878&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java (original) +++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java Tue Mar 5 23:35:34 2019 @@ -185,6 +185,7 @@ public class CswsConnector extends org.a private String documentManagementServicePath = null; private String contentServiceServicePath = null; private String memberServiceServicePath = null; + private String searchServiceServicePath = null; private String serverHTTPNTLMDomain = null; private String serverHTTPNTLMUsername = null; private String serverHTTPNTLMPassword = null; @@ -367,6 +368,7 @@ public class CswsConnector extends org.a documentManagementServicePath = params.getParameter(CswsParameters.documentManagementPath); contentServiceServicePath = params.getParameter(CswsParameters.contentServicePath); memberServiceServicePath = params.getParameter(CswsParameters.memberServicePath); + searchServiceServicePath = params.getParameter(CswsParameters.searchServicePath); serverHTTPNTLMDomain = params.getParameter(CswsParameters.serverHTTPNTLMDomain); serverHTTPNTLMUsername = params.getParameter(CswsParameters.serverHTTPNTLMUsername); serverHTTPNTLMPassword = params.getObfuscatedParameter(CswsParameters.serverHTTPNTLMPassword); @@ -517,6 +519,7 @@ public class CswsConnector extends org.a final String documentManagementServiceURL = baseURL + documentManagementServicePath; final String contentServiceServiceURL = baseURL + contentServiceServicePath; final String memberServiceServiceURL = baseURL + memberServiceServicePath; + final String searchServiceServiceURL = baseURL + searchServiceServicePath; // Build web services connection management object if (Logging.connectors.isDebugEnabled()) @@ -526,7 +529,8 @@ public class CswsConnector extends org.a } // Construct a new csws session object for setting up this session - cswsSession = new CswsSession(userName, password, 1000L * 60L * 15L, authenticationServiceURL, documentManagementServiceURL, contentServiceServiceURL, memberServiceServiceURL); + cswsSession = new CswsSession(userName, password, 1000L * 60L * 15L, + authenticationServiceURL, documentManagementServiceURL, contentServiceServiceURL, memberServiceServiceURL, searchServiceServiceURL); final GetSessionThread t = new GetSessionThread(); try @@ -1462,6 +1466,9 @@ public class CswsConnector extends org.a String memberServiceServicePath = parameters.getParameter(CswsParameters.memberServicePath); if (memberServiceServicePath == null) memberServiceServicePath = ""; + String searchServiceServicePath = parameters.getParameter(CswsParameters.searchServicePath); + if (searchServiceServicePath == null) + searchServiceServicePath = ""; String serverHTTPNTLMDomain = parameters.getParameter(CswsParameters.serverHTTPNTLMDomain); if(serverHTTPNTLMDomain == null) @@ -1517,6 +1524,7 @@ public class CswsConnector extends org.a velocityContext.put("CONTENTSERVICESERVICEPATH", contentServiceServicePath); velocityContext.put("DOCUMENTMANAGEMENTSERVICEPATH", documentManagementServicePath); velocityContext.put("MEMBERSERVICESERVICEPATH", memberServiceServicePath); + velocityContext.put("SEARCHSERVICESERVICEPATH", searchServiceServicePath); velocityContext.put("SERVERHTTPNTLMDOMAIN",serverHTTPNTLMDomain); velocityContext.put("SERVERHTTPNTLMUSERNAME",serverHTTPNTLMUserName); @@ -1617,6 +1625,9 @@ public class CswsConnector extends org.a String memberServiceServicePath = variableContext.getParameter("memberserviceservicepath"); if (memberServiceServicePath != null) parameters.setParameter(CswsParameters.memberServicePath, memberServiceServicePath); + String searchServiceServicePath = variableContext.getParameter("searchserviceservicepath"); + if (searchServiceServicePath != null) + parameters.setParameter(CswsParameters.searchServicePath, searchServiceServicePath); String serverHTTPNTLMDomain = variableContext.getParameter("serverhttpntlmdomain"); if (serverHTTPNTLMDomain != null) Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsParameters.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsParameters.java?rev=1854878&r1=1854877&r2=1854878&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsParameters.java (original) +++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsParameters.java Tue Mar 5 23:35:34 2019 @@ -53,6 +53,8 @@ public class CswsParameters public final static String contentServicePath = "Server ContentService Service path"; /** DocumentManagement service CGI path */ public final static String documentManagementPath = "Server DocumentManagement Service path"; + /** SearchService service CGI path */ + public final static String searchServicePath = "Server SearchService Service path"; /** MemberService service CGI path */ public final static String memberServicePath = "Server MemberService Service path"; /** Server domain, if NTLM */ Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_en_US.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_en_US.properties?rev=1854878&r1=1854877&r2=1854878&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_en_US.properties (original) +++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_en_US.properties Tue Mar 5 23:35:34 2019 @@ -39,6 +39,7 @@ CswsConnector.AuthenticationServicePath= CswsConnector.DocumentManagementServicePath=DocumentManagement service path: CswsConnector.ContentServiceServicePath=ContentService service path: CswsConnector.MemberServiceServicePath=MemberService service path: +CswsConnector.SearchServiceServicePath=SearchService service path: CswsConnector.UserNameRegularExpression=User name regular expression: CswsConnector.LivelinkUserExpression=Livelink user expression: CswsConnector.Parameters=Parameters: @@ -54,6 +55,8 @@ CswsConnector.EnterTheMemberServiceServi CswsConnector.TheMemberServiceServicePathMustBeginWithACharacter=The MemberService service path must begin with a / character CswsConnector.EnterTheContentServiceServicePath=Enter the ContentService service path CswsConnector.TheContentServiceServicePathMustBeginWithACharacter=The ContentService service path must begin with a / character +CswsConnector.EnterTheSearchServiceServicePath=Enter the SearchService service path +CswsConnector.TheSearchServiceServicePathMustBeginWithACharacter=The SearchService service path must begin with a / character CswsConnector.AServerPortNumberIsRequired=A server port number is required CswsConnector.TheViewCgiPathMustBeBlankOrBeginWithACharacter=The view cgi path must be blank, or begin with a / character CswsConnector.NoCertificatesPresent=No certificates present Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_es_ES.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_es_ES.properties?rev=1854878&r1=1854877&r2=1854878&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_es_ES.properties (original) +++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_es_ES.properties Tue Mar 5 23:35:34 2019 @@ -40,6 +40,7 @@ CswsConnector.AuthenticationServicePath= CswsConnector.DocumentManagementServicePath=DocumentManagement service path: CswsConnector.ContentServiceServicePath=ContentService service path: CswsConnector.MemberServiceServicePath=MemberService service path: +CswsConnector.SearchServiceServicePath=SearchService service path: CswsConnector.UserNameRegularExpression=Nombre de usuario expresión regular: CswsConnector.LivelinkUserExpression=Expresión user link directo: CswsConnector.Parameters=Paràmetros: @@ -55,6 +56,8 @@ CswsConnector.EnterTheMemberServiceServi CswsConnector.TheMemberServiceServicePathMustBeginWithACharacter=The MemberService service path must begin with a / character CswsConnector.EnterTheContentServiceServicePath=Enter the ContentService service path CswsConnector.TheContentServiceServicePathMustBeginWithACharacter=The ContentService service path must begin with a / character +CswsConnector.EnterTheSearchServiceServicePath=Enter the SearchService service path +CswsConnector.TheSearchServiceServicePathMustBeginWithACharacter=The SearchService service path must begin with a / character CswsConnector.AServerPortNumberIsRequired=Se requiere un número de puerto del servidor CswsConnector.TheViewCgiPathMustBeBlankOrBeginWithACharacter=El camino vista cgi debe estar en blanco , o comenzar con un / carácter CswsConnector.NoCertificatesPresent=Ningún presente de certificados Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_fr_FR.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_fr_FR.properties?rev=1854878&r1=1854877&r2=1854878&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_fr_FR.properties (original) +++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_fr_FR.properties Tue Mar 5 23:35:34 2019 @@ -38,6 +38,8 @@ CswsConnector.EnterTheMemberServiceServi CswsConnector.TheMemberServiceServicePathMustBeginWithACharacter=The MemberService service path must begin with a / character CswsConnector.EnterTheContentServiceServicePath=Enter the ContentService service path CswsConnector.TheContentServiceServicePathMustBeginWithACharacter=The ContentService service path must begin with a / character +CswsConnector.EnterTheSearchServiceServicePath=Enter the SearchService service path +CswsConnector.TheSearchServiceServicePathMustBeginWithACharacter=The SearchService service path must begin with a / character CswsConnector.AServerPortNumberIsRequired=Un numéro de port serveur est nécessaire CswsConnector.UserNameRegularExpressionCannotBeNull=Une expression régulière de nom d'utilisateur ne peut être null CswsConnector.ServerName=Nom du serveur: @@ -48,6 +50,7 @@ CswsConnector.AuthenticationServicePath= CswsConnector.DocumentManagementServicePath=DocumentManagement service path: CswsConnector.ContentServiceServicePath=ContentService service path: CswsConnector.MemberServiceServicePath=MemberService service path: +CswsConnector.SearchServiceServicePath=SearchService service path: CswsConnector.UserNameRegularExpression=Expression régulière du nom d'utilisateur: CswsConnector.LivelinkUserExpression=Expression de l'utilisateur Livelink: CswsConnector.Parameters=Paramètres: Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_ja_JP.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_ja_JP.properties?rev=1854878&r1=1854877&r2=1854878&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_ja_JP.properties (original) +++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/csws/common_ja_JP.properties Tue Mar 5 23:35:34 2019 @@ -38,6 +38,8 @@ CswsConnector.EnterTheMemberServiceServi CswsConnector.TheMemberServiceServicePathMustBeginWithACharacter=The MemberService service path must begin with a / character CswsConnector.EnterTheContentServiceServicePath=Enter the ContentService service path CswsConnector.TheContentServiceServicePathMustBeginWithACharacter=The ContentService service path must begin with a / character +CswsConnector.EnterTheSearchServiceServicePath=Enter the SearchService service path +CswsConnector.TheSearchServiceServicePathMustBeginWithACharacter=The SearchService service path must begin with a / character CswsConnector.AServerPortNumberIsRequired=サーバポート番号を入力してください CswsConnector.UserNameRegularExpressionCannotBeNull=ユーザ名正規表現を入力してください CswsConnector.ServerName=サーバ名： @@ -48,6 +50,7 @@ CswsConnector.AuthenticationServicePath= CswsConnector.DocumentManagementServicePath=DocumentManagement service path: CswsConnector.ContentServiceServicePath=ContentService service path: CswsConnector.MemberServiceServicePath=MemberService service path: +CswsConnector.SearchServiceServicePath=SearchService service path: CswsConnector.UserNameRegularExpression=ユーザ名正規表現式： CswsConnector.LivelinkUserExpression=Livelinkユーザ式： CswsConnector.Parameters=引数： 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=1854878&r1=1854877&r2=1854878&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 Mar 5 23:35:34 2019 @@ -40,6 +40,7 @@ CswsConnector.AuthenticationServicePath= CswsConnector.DocumentManagementServicePath=DocumentManagement service path: CswsConnector.ContentServiceServicePath=ContentService service path: CswsConnector.MemberServiceServicePath=MemberService service path: +CswsConnector.SearchServiceServicePath=SearchService service path: CswsConnector.UserNameRegularExpression=用户名正则表达式: CswsConnector.LivelinkUserExpression=Livelink用户表达式: CswsConnector.Parameters=参数: @@ -55,6 +56,8 @@ CswsConnector.EnterTheMemberServiceServi CswsConnector.TheMemberServiceServicePathMustBeginWithACharacter=The MemberService service path must begin with a / character CswsConnector.EnterTheContentServiceServicePath=Enter the ContentService service path CswsConnector.TheContentServiceServicePathMustBeginWithACharacter=The ContentService service path must begin with a / character +CswsConnector.EnterTheSearchServiceServicePath=Enter the SearchService service path +CswsConnector.TheSearchServiceServicePathMustBeginWithACharacter=The SearchService service path must begin with a / character CswsConnector.AServerPortNumberIsRequired=请输入服务器端口号 CswsConnector.TheViewCgiPathMustBeBlankOrBeginWithACharacter=显示CGI路径需设为空或始于‘/’字符 CswsConnector.NoCertificatesPresent=证书不存在 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=1854878&r1=1854877&r2=1854878&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 Mar 5 23:35:34 2019 @@ -128,6 +128,20 @@ editconnection.contentserviceservicepath.focus(); return false; } + if (editconnection.searchserviceservicepath.value == "") + { + alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.EnterTheSearchServiceServicePath'))"); + SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))"); + editconnection.searchserviceservicepath.focus(); + return false; + } + if (editconnection.searchserviceservicepath.value.substring(0,1) != "/") + { + alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.TheSearchServiceServicePathMustBeginWithACharacter'))"); + SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))"); + editconnection.searchserviceservicepath.focus(); + return false; + } if (editconnection.viewprotocol.value == "") { 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=1854878&r1=1854877&r2=1854878&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 Mar 5 23:35:34 2019 @@ -95,6 +95,14 @@ + + + $Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.SearchServiceServicePath')) + + + + +
@@ -167,4 +175,10 @@ + + + + + + #end \ No newline at end of file