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 @@
<input type="text" size="32" name="memberserviceservicepath"
value="$Encoder.attributeEscape($MEMBERSERVICESERVICEPATH)"/>
</td>
</tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.SearchServiceServicePath'))</nobr>
+ </td>
+ <td class="value">
+ <input type="text" size="32" name="searchserviceservicepath"
value="$Encoder.attributeEscape($SEARCHSERVICESERVICEPATH)"/>
+ </td>
+ </tr>
<tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
@@ -167,4 +175,10 @@
<input type="hidden" name="serverhttpntlmdomain"
value="$Encoder.attributeEscape($SERVERHTTPNTLMDOMAIN)"/>
<input type="hidden" name="serverhttpntlmusername"
value="$Encoder.attributeEscape($SERVERHTTPNTLMUSERNAME)"/>
<input type="hidden" name="serverhttpntlmpassword"
value="$Encoder.attributeEscape($SERVERHTTPNTLMPASSWORD)"/>
+<input type="hidden" name="authenticationservicepath"
value="$Encoder.attributeEscape($AUTHENTICATIONSERVICEPATH)"/>
+<input type="hidden" name="documentmanagementservicepath"
value="$Encoder.attributeEscape($DOCUMENTMANAGEMENTSERVICEPATH)"/>
+<input type="hidden" name="contentserviceservicepath"
value="$Encoder.attributeEscape($CONTENTSERVICESERVICEPATH)"/>
+<input type="hidden" name="memberserviceservicepath"
value="$Encoder.attributeEscape($MEMBERSERVICESERVICEPATH)"/>
+<input type="hidden" name="searchserviceservicepath"
value="$Encoder.attributeEscape($SEARCHSERVICESERVICEPATH)"/>
+
#end
\ No newline at end of file