manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1853138 - 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 Thu, 07 Feb 2019 14:14:46 GMT
Author: kwright
Date: Thu Feb  7 14:14:46 2019
New Revision: 1853138

URL: http://svn.apache.org/viewvc?rev=1853138&view=rev
Log:
Various changes to take out LAPI stuff and put in UI for web services config

Removed:
    manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/csws/editConfiguration_Access.html
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/crawler/connectors/csws/GetConnectionInfo.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=1853138&r1=1853137&r2=1853138&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 Thu Feb  7 14:14:46 2019
@@ -149,12 +149,10 @@ public class CswsConnector extends org.a
   // Idle session expiration interval
   private final static long expirationInterval = 300000L;
 
-  // Data required for maintaining livelink connection
-  private LAPI_DOCUMENTS LLDocs = null;
-  private LAPI_ATTRIBUTES LLAttributes = null;
-  private LAPI_USERS LLUsers = null;
+  // Data required for maintaining csws connection
+  // MHL
   
-  private LLSERVER llServer = null;
+  // Various IDs we need
   private int LLENTWK_VOL;
   private int LLENTWK_ID;
   private int LLCATWK_VOL;
@@ -166,29 +164,21 @@ public class CswsConnector extends org.a
   private int serverPort = -1;
   private String serverUsername = null;
   private String serverPassword = null;
-  private String serverHTTPCgi = null;
+  private String authenticationServicePath = null;
+  private String documentManagementServicePath = null;
+  private String contentServiceServicePath = null;
+  private String memberServiceServicePath = null;
   private String serverHTTPNTLMDomain = null;
   private String serverHTTPNTLMUsername = null;
   private String serverHTTPNTLMPassword = null;
   private IKeystoreManager serverHTTPSKeystore = null;
 
-  private String ingestProtocol = null;
-  private String ingestPort = null;
-  private String ingestCgiPath = null;
-
   private String viewProtocol = null;
   private String viewServerName = null;
   private String viewPort = null;
   private String viewCgiPath = null;
   private String viewAction = null;
 
-  private String ingestNtlmDomain = null;
-  private String ingestNtlmUsername = null;
-  private String ingestNtlmPassword = null;
-
-  // SSL support for ingestion
-  private IKeystoreManager ingestKeystoreManager = null;
-
   // Connection management
   private HttpClientConnectionManager connectionManager = null;
   private HttpClient httpClient = null;
@@ -196,9 +186,6 @@ public class CswsConnector extends org.a
   // Base path for viewing
   private String viewBasePath = null;
 
-  // Ingestion port number
-  private int ingestPortNumber = -1;
-
   // Activities list
   private static final String[] activitiesList = new String[]{ACTIVITY_SEED,ACTIVITY_FETCH};
 
@@ -269,20 +256,14 @@ public class CswsConnector extends org.a
       try
       {
         // Create the session
-        llServer = new LLSERVER(!serverProtocol.equals("internal"),serverProtocol.equals("https"),
-          serverName,serverPort,serverUsername,serverPassword,
-          serverHTTPCgi,serverHTTPNTLMDomain,serverHTTPNTLMUsername,serverHTTPNTLMPassword,
-          serverHTTPSKeystore);
-
-        LLDocs = new LAPI_DOCUMENTS(llServer.getLLSession());
-        LLAttributes = new LAPI_ATTRIBUTES(llServer.getLLSession());
-        LLUsers = new LAPI_USERS(llServer.getLLSession());
+        // MHL
         
         if (Logging.connectors.isDebugEnabled())
         {
           String passwordExists = (serverPassword!=null&&serverPassword.length()>0)?"password exists":"";
           Logging.connectors.debug("Csws: Csws Session: Server='"+serverName+"'; port='"+serverPort+"'; user name='"+serverUsername+"'; "+passwordExists);
         }
+        /* Here we need to obtain IDs for LLENTWK and LLCATWK
         LLValue entinfo = new LLValue().setAssoc();
 
         int status;
@@ -304,6 +285,7 @@ public class CswsConnector extends org.a
         }
         else
           throw new ManifoldCFException("Error accessing category workspace: "+status);
+          */
       }
       catch (Throwable e)
       {
@@ -347,11 +329,6 @@ public class CswsConnector extends org.a
     return new String[]{serverName};
   }
 
-  protected HttpHost getHost()
-  {
-    return new HttpHost(llServer.getHost(),ingestPortNumber,ingestProtocol);
-  }
-
   protected void getSessionParameters()
     throws ManifoldCFException
   {
@@ -359,56 +336,62 @@ public class CswsConnector extends org.a
     {
       // Do the initial setup part (what used to be part of connect() itself)
 
-      // Get the parameters
-      ingestProtocol = params.getParameter(CswsParameters.ingestProtocol);
-      ingestPort = params.getParameter(CswsParameters.ingestPort);
-      ingestCgiPath = params.getParameter(CswsParameters.ingestCgiPath);
-
       viewProtocol = params.getParameter(CswsParameters.viewProtocol);
       viewServerName = params.getParameter(CswsParameters.viewServerName);
       viewPort = params.getParameter(CswsParameters.viewPort);
       viewCgiPath = params.getParameter(CswsParameters.viewCgiPath);
       viewAction = params.getParameter(CswsParameters.viewAction);
 
-      ingestNtlmDomain = params.getParameter(CswsParameters.ingestNtlmDomain);
-      ingestNtlmUsername = params.getParameter(CswsParameters.ingestNtlmUsername);
-      ingestNtlmPassword = params.getObfuscatedParameter(CswsParameters.ingestNtlmPassword);
-
       serverProtocol = params.getParameter(CswsParameters.serverProtocol);
       String serverPortString = params.getParameter(CswsParameters.serverPort);
       serverUsername = params.getParameter(CswsParameters.serverUsername);
       serverPassword = params.getObfuscatedParameter(CswsParameters.serverPassword);
-      serverHTTPCgi = params.getParameter(CswsParameters.serverHTTPCgiPath);
+      authenticationServicePath = params.getParameter(CswsParameters.authenticationPath);
+      documentManagementServicePath = params.getParameter(CswsParameters.documentManagementPath);
+      contentServiceServicePath = params.getParameter(CswsParameters.contentServicePath);
+      memberServiceServicePath = params.getParameter(CswsParameters.memberServicePath);
       serverHTTPNTLMDomain = params.getParameter(CswsParameters.serverHTTPNTLMDomain);
       serverHTTPNTLMUsername = params.getParameter(CswsParameters.serverHTTPNTLMUsername);
       serverHTTPNTLMPassword = params.getObfuscatedParameter(CswsParameters.serverHTTPNTLMPassword);
 
-      if (ingestProtocol == null || ingestProtocol.length() == 0)
-        ingestProtocol = null;
-      if (viewProtocol == null || viewProtocol.length() == 0)
+
+      // Server parameter processing
+
+      if (serverProtocol == null || serverProtocol.length() == 0)
+        serverProtocol = "http";
+      
+      if (serverPortString == null)
+        serverPort = 2099;
+      else
+        serverPort = new Integer(serverPortString).intValue();
+      
+      if (serverHTTPNTLMDomain != null && serverHTTPNTLMDomain.length() == 0)
+        serverHTTPNTLMDomain = null;
+      if (serverHTTPNTLMUsername == null || serverHTTPNTLMUsername.length() == 0)
       {
-        if (ingestProtocol == null)
-          viewProtocol = "http";
-        else
-          viewProtocol = ingestProtocol;
+        serverHTTPNTLMUsername = null;
+        serverHTTPNTLMPassword = null;
       }
+      
+      // Set up server ssl if indicated
+      String serverHTTPSKeystoreData = params.getParameter(CswsParameters.serverHTTPSKeystore);
+      if (serverHTTPSKeystoreData != null)
+        serverHTTPSKeystore = KeystoreManagerFactory.make("",serverHTTPSKeystoreData);
 
-      if (ingestPort == null || ingestPort.length() == 0)
+      // View parameters
+      // View parameter processing
+      
+      if (viewProtocol == null || viewProtocol.length() == 0)
       {
-        if (ingestProtocol != null)
-        {
-          if (!ingestProtocol.equals("https"))
-            ingestPort = "80";
-          else
-            ingestPort = "443";
-        }
+        if (serverProtocol == null)
+          viewProtocol = "http";
         else
-          ingestPort = null;
+          viewProtocol = serverProtocol;
       }
 
       if (viewPort == null || viewPort.length() == 0)
       {
-        if (ingestProtocol == null || !viewProtocol.equals(ingestProtocol))
+        if (serverProtocol == null || !viewProtocol.equals(serverProtocol))
         {
           if (!viewProtocol.equals("https"))
             viewPort = "80";
@@ -416,19 +399,7 @@ public class CswsConnector extends org.a
             viewPort = "443";
         }
         else
-          viewPort = ingestPort;
-      }
-
-      if (ingestPort != null)
-      {
-        try
-        {
-          ingestPortNumber = Integer.parseInt(ingestPort);
-        }
-        catch (NumberFormatException e)
-        {
-          throw new ManifoldCFException("Bad ingest port: "+e.getMessage(),e);
-        }
+          viewPort = serverPort;
       }
 
       String viewPortString;
@@ -453,60 +424,8 @@ public class CswsConnector extends org.a
       }
 
       if (viewCgiPath == null || viewCgiPath.length() == 0)
-        viewCgiPath = ingestCgiPath;
-
-      if (ingestNtlmDomain != null && ingestNtlmDomain.length() == 0)
-        ingestNtlmDomain = null;
-      if (ingestNtlmDomain == null)
-      {
-        ingestNtlmUsername = null;
-        ingestNtlmPassword = null;
-      }
-      else
-      {
-        if (ingestNtlmUsername == null || ingestNtlmUsername.length() == 0)
-        {
-          ingestNtlmUsername = serverUsername;
-          if (ingestNtlmPassword == null || ingestNtlmPassword.length() == 0)
-            ingestNtlmPassword = serverPassword;
-        }
-        else
-        {
-          if (ingestNtlmPassword == null)
-            ingestNtlmPassword = "";
-        }
-      }
-
-      // Set up ingest ssl if indicated
-      String ingestKeystoreData = params.getParameter(CswsParameters.ingestKeystore);
-      if (ingestKeystoreData != null)
-        ingestKeystoreManager = KeystoreManagerFactory.make("",ingestKeystoreData);
-
-
-      // Server parameter processing
-
-      if (serverProtocol == null || serverProtocol.length() == 0)
-        serverProtocol = "internal";
+        viewCgiPath = "";
       
-      if (serverPortString == null)
-        serverPort = 2099;
-      else
-        serverPort = new Integer(serverPortString).intValue();
-      
-      if (serverHTTPNTLMDomain != null && serverHTTPNTLMDomain.length() == 0)
-        serverHTTPNTLMDomain = null;
-      if (serverHTTPNTLMUsername == null || serverHTTPNTLMUsername.length() == 0)
-      {
-        serverHTTPNTLMUsername = null;
-        serverHTTPNTLMPassword = null;
-      }
-      
-      // Set up server ssl if indicated
-      String serverHTTPSKeystoreData = params.getParameter(CswsParameters.serverHTTPSKeystore);
-      if (serverHTTPSKeystoreData != null)
-        serverHTTPSKeystore = KeystoreManagerFactory.make("",serverHTTPSKeystoreData);
-
-      // View parameters
       if (viewServerName == null || viewServerName.length() == 0)
         viewServerName = serverName;
 
@@ -527,9 +446,9 @@ public class CswsConnector extends org.a
 
       // Set up ingest ssl if indicated
       SSLConnectionSocketFactory myFactory = null;
-      if (ingestKeystoreManager != null)
+      if (serverKeystoreManager != null)
       {
-        myFactory = new SSLConnectionSocketFactory(new InterruptibleSocketFactory(ingestKeystoreManager.getSecureSocketFactory(), connectionTimeout),
+        myFactory = new SSLConnectionSocketFactory(new InterruptibleSocketFactory(serverKeystoreManager.getSecureSocketFactory(), connectionTimeout),
           NoopHostnameVerifier.INSTANCE);
       }
       else
@@ -553,10 +472,10 @@ public class CswsConnector extends org.a
       CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
 
       // Set up authentication to use
-      if (ingestNtlmDomain != null)
+      if (serverHTTPNTLMDomain != null)
       {
         credentialsProvider.setCredentials(AuthScope.ANY,
-          new NTCredentials(ingestNtlmUsername,ingestNtlmPassword,currentHost,ingestNtlmDomain));
+          new NTCredentials(serverHTTPNTLMUsername,serverHTTPNTLMPassword,currentHost,serverHTTPNTLMDomain));
       }
 
       HttpClientBuilder builder = HttpClients.custom()
@@ -639,69 +558,9 @@ public class CswsConnector extends org.a
       // Destroy saved session setup and repeat it
       hasConnected = false;
       getSession();
-
-      // Now, set up trial of ingestion connection
-      if (ingestProtocol != null)
-      {
-        String contextMsg = "for document access";
-        String ingestHttpAddress = ingestCgiPath;
-
-        HttpClient client = getInitializedClient(contextMsg);
-        HttpGet method = new HttpGet(getHost().toURI() + ingestHttpAddress);
-        method.setHeader(new BasicHeader("Accept","*/*"));
-        try
-        {
-          int statusCode = executeMethodViaThread(client,method);
-          switch (statusCode)
-          {
-          case 502:
-            return "Fetch test had transient 502 error response";
-
-          case HttpStatus.SC_UNAUTHORIZED:
-            return "Fetch test returned UNAUTHORIZED (401) response; check the security credentials and configuration";
-
-          case HttpStatus.SC_OK:
-            return super.check();
-
-          default:
-            return "Fetch test returned an unexpected response code of "+Integer.toString(statusCode);
-          }
-        }
-        catch (InterruptedException e)
-        {
-          throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
-        }
-        catch (java.net.SocketTimeoutException e)
-        {
-          return "Fetch test timed out reading from the Csws HTTP Server: "+e.getMessage();
-        }
-        catch (java.net.SocketException e)
-        {
-          return "Fetch test received a socket error reading from Csws HTTP Server: "+e.getMessage();
-        }
-        catch (javax.net.ssl.SSLHandshakeException e)
-        {
-          return "Fetch test was unable to set up a SSL connection to Csws HTTP Server: "+e.getMessage();
-        }
-        catch (ConnectTimeoutException e)
-        {
-          return "Fetch test connection timed out reading from Csws HTTP Server: "+e.getMessage();
-        }
-        catch (InterruptedIOException e)
-        {
-          throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
-        }
-        catch (HttpException e)
-        {
-          return "Fetch test had an HTTP exception: "+e.getMessage();
-        }
-        catch (IOException e)
-        {
-          return "Fetch test had an IO failure: "+e.getMessage();
-        }
-      }
-      else
-        return super.check();
+      // Do a check of all web services
+      // MHL
+      return super.check();
     }
     catch (ServiceInterruption e)
     {
@@ -731,13 +590,6 @@ public class CswsConnector extends org.a
       hasConnected = false;
       expirationTime = -1L;
 
-      // Shutdown livelink connection
-      if (llServer != null)
-      {
-        llServer.disconnect();
-        llServer = null;
-      }
-      
       // Shutdown pool
       if (connectionManager != null)
       {
@@ -766,15 +618,6 @@ public class CswsConnector extends org.a
     hasSessionParameters = false;
     hasConnected = false;
     expirationTime = -1L;
-    if (llServer != null)
-    {
-      llServer.disconnect();
-      llServer = null;
-    }
-    LLDocs = null;
-    LLAttributes = null;
-    ingestKeystoreManager = null;
-    ingestPortNumber = -1;
 
     serverProtocol = null;
     serverName = null;
@@ -1024,6 +867,9 @@ public class CswsConnector extends org.a
     CswsContext llc = new CswsContext();
     
     // First, grab the root LLValue
+    // MHL
+    ObjectInformation rootValue = null;
+    /*
     ObjectInformation rootValue = llc.getObjectInformation(LLENTWK_VOL,LLENTWK_ID);
     if (!rootValue.exists())
     {
@@ -1032,7 +878,8 @@ public class CswsConnector extends org.a
       throw new ServiceInterruption("Service interruption during seeding",new ManifoldCFException("Could not looking root workspace object during seeding"),System.currentTimeMillis()+60000L,
         System.currentTimeMillis()+600000L,-1,true);
     }
-
+    */
+    
     // Walk the specification for the "startpoint" types.  Amalgamate these into a list of strings.
     // Presume that all roots are startpoint nodes
     boolean doUserWorkspaces = false;
@@ -1073,6 +920,8 @@ public class CswsConnector extends org.a
       if (doUserWorkspaces)
       {
         // Do ListUsers and enumerate the values.
+        // MHL - TBD
+        /*
         int sanityRetryCount = FAILURE_RETRY_COUNT;
         while (true)
         {
@@ -1080,17 +929,17 @@ public class CswsConnector extends org.a
           try
           {
             t.start();
-	    LLValue childrenDocs;
+            // MHL - need the web services equivalent
+            LLValue childrenDocs;
 	    try
-	    {
-	      childrenDocs = t.finishUp();
-	    }
-	    catch (ManifoldCFException e)
-	    {
-	      sanityRetryCount = assessRetry(sanityRetryCount,e);
-	      continue;
-	    }
-
+            {
+              childrenDocs = t.finishUp();
+            }
+            catch (ManifoldCFException e)
+            {
+              sanityRetryCount = assessRetry(sanityRetryCount,e);
+              continue;
+            }
             int size = 0;
 
             if (childrenDocs.isRecord())
@@ -1125,6 +974,7 @@ public class CswsConnector extends org.a
             continue;
           }
         }
+        */
       }
       
     }
@@ -1257,7 +1107,6 @@ public class CswsConnector extends org.a
         
       // We were able to get rights, so object still exists.
           
-      // Changed folder versioning for MCF 2.0
       if (isFolder)
       {
         // === Csws folder ===
@@ -1265,7 +1114,10 @@ public class CswsConnector extends org.a
         // The code below assumes one-level only, so we always scan folders and there's no versioning
         if (Logging.connectors.isDebugEnabled())
           Logging.connectors.debug("Csws: Processing folder "+Integer.toString(vol)+":"+Integer.toString(objID));
-
+        
+        // TBD
+        
+        /*
         int sanityRetryCount = FAILURE_RETRY_COUNT;
         while (true)
         {
@@ -1347,6 +1199,7 @@ public class CswsConnector extends org.a
             continue;
           }
         }
+        */
         if (Logging.connectors.isDebugEnabled())
           Logging.connectors.debug("Csws: Done processing folder "+Integer.toString(vol)+":"+Integer.toString(objID));
       }
@@ -1486,7 +1339,7 @@ public class CswsConnector extends org.a
     protected final int objID;
     protected final String filterString;
     protected Throwable exception = null;
-    protected LLValue rval = null;
+    //protected LLValue rval = null;
 
     public ListObjectsThread(int vol, int objID, String filterString)
     {
@@ -1501,6 +1354,8 @@ public class CswsConnector extends org.a
     {
       try
       {
+        // MHL - TBD
+        /*
         LLValue childrenDocs = new LLValue();
         int status = LLDocs.ListObjects(vol, objID, null, filterString, LAPI_DOCUMENTS.PERM_SEECONTENTS, childrenDocs);
         if (status != 0)
@@ -1508,6 +1363,7 @@ public class CswsConnector extends org.a
           throw new ManifoldCFException("Error retrieving contents of folder "+Integer.toString(vol)+":"+Integer.toString(objID)+" : Status="+Integer.toString(status)+" ("+llServer.getErrors()+")");
         }
         rval = childrenDocs;
+        */
       }
       catch (Throwable e)
       {
@@ -1531,7 +1387,7 @@ public class CswsConnector extends org.a
 	else
 	  throw new RuntimeException("Unrecognized exception type: "+thr.getClass().getName()+": "+thr.getMessage(),thr);
       }
-      return rval;
+      return null;//rval;
     }
   }
 
@@ -1546,7 +1402,6 @@ public class CswsConnector extends org.a
     // it becomes worthwhile, because we will be able to do what is needed to look up the correct CATID node
     // only once per n requests!  So it's a tradeoff between the advantage gained by threading, and the
     // savings gained by CATID lookup.
-    // Note that at Shell, the fact that the network hiccups a lot makes it better to choose a smaller value.
     return 6;
   }
 
@@ -1572,7 +1427,6 @@ public class CswsConnector extends org.a
     throws ManifoldCFException, IOException
   {
     tabsArray.add(Messages.getString(locale,"CswsConnector.Server"));
-    tabsArray.add(Messages.getString(locale,"CswsConnector.DocumentAccess"));
     tabsArray.add(Messages.getString(locale,"CswsConnector.DocumentView"));
     
     Messages.outputResourceWithVelocity(out, locale, EDIT_CONFIGURATION_JS, null, true);
@@ -1596,11 +1450,9 @@ public class CswsConnector extends org.a
     velocityContext.put(TAB_NAME_PARAM,tabName);
 
     fillInServerTab(velocityContext, out, parameters);
-    fillInDocumentAccessTab(velocityContext, out, parameters);
     fillInDocumentViewTab(velocityContext, out, parameters);
 
     Messages.outputResourceWithVelocity(out, locale, EDIT_CONFIGURATION_SERVER_HTML, velocityContext);
-    Messages.outputResourceWithVelocity(out, locale, EDIT_CONFIGURATION_ACCESS_HTML, velocityContext);
     Messages.outputResourceWithVelocity(out, locale, EDIT_CONFIGURATION_VIEW_HTML, velocityContext);
   }
 
@@ -1610,7 +1462,7 @@ public class CswsConnector extends org.a
     // LAPI parameters
     String serverProtocol = parameters.getParameter(CswsParameters.serverProtocol);
     if (serverProtocol == null)
-      serverProtocol = "internal";
+      serverProtocol = "http";
     String serverName = parameters.getParameter(CswsParameters.serverName);
     if (serverName == null)
       serverName = "localhost";
@@ -1625,9 +1477,20 @@ public class CswsConnector extends org.a
       serverPassword = "";
     else
       serverPassword = out.mapPasswordToKey(serverPassword);
-    String serverHTTPCgiPath = parameters.getParameter(CswsParameters.serverHTTPCgiPath);
-    if (serverHTTPCgiPath == null)
-      serverHTTPCgiPath = "/livelink/livelink.exe";
+    
+    String authenticationServicePath = parameters.getParameter(CswsParameters.authenticationPath);
+    if (authenticationServicePath == null)
+      authenticationServicePath = "";
+    String contentServiceServicePath = parameters.getParameter(CswsParameters.contentServicePath);
+    if (contentServiceServicePath == null)
+      contentServiceServicePath = "";
+    String documentManagementServicePath = parameters.getParameter(CswsParameters.documentManagementPath);
+    if (documentManagementServicePath == null)
+      documentManagementServicePath = "";
+    String memberServiceServicePath = parameters.getParameter(CswsParameters.memberServicePath);
+    if (memberServiceServicePath == null)
+      memberServiceServicePath = "";
+    
     String serverHTTPNTLMDomain = parameters.getParameter(CswsParameters.serverHTTPNTLMDomain);
     if(serverHTTPNTLMDomain == null)
       serverHTTPNTLMDomain = "";
@@ -1677,7 +1540,12 @@ public class CswsConnector extends org.a
     velocityContext.put("SERVERPORT",serverPort);
     velocityContext.put("SERVERUSERNAME",serverUserName);
     velocityContext.put("SERVERPASSWORD",serverPassword);
-    velocityContext.put("SERVERHTTPCGIPATH",serverHTTPCgiPath);
+    
+    velocityContext.put("AUTHENTICATIONSERVICEPATH", authenticationServicePath);
+    velocityContext.put("CONTENTSERVICESERVICEPATH", contentServiceServicePath);
+    velocityContext.put("DOCUMENTMANAGEMENTSERVICEPATH", documentManagementServicePath);
+    velocityContext.put("MEMBERSERVICESERVICEPATH", memberServiceServicePath);
+
     velocityContext.put("SERVERHTTPNTLMDOMAIN",serverHTTPNTLMDomain);
     velocityContext.put("SERVERHTTPNTLMUSERNAME",serverHTTPNTLMUserName);
     velocityContext.put("SERVERHTTPNTLMPASSWORD",serverHTTPNTLMPassword);
@@ -1689,76 +1557,6 @@ public class CswsConnector extends org.a
       velocityContext.put("MESSAGE", message);
   }
 
-  /** Fill in Document Access tab */
-  protected static void fillInDocumentAccessTab(Map<String,Object> velocityContext, IHTTPOutput out, ConfigParams parameters)
-  {
-    // Document access parameters
-    String ingestProtocol = parameters.getParameter(CswsParameters.ingestProtocol);
-    if(ingestProtocol == null)
-      ingestProtocol = "";
-    String ingestPort = parameters.getParameter(CswsParameters.ingestPort);
-    if(ingestPort == null)
-      ingestPort = "";
-    String ingestCgiPath = parameters.getParameter(CswsParameters.ingestCgiPath);
-    if(ingestCgiPath == null)
-      ingestCgiPath = "";
-    String ingestNtlmUsername = parameters.getParameter(CswsParameters.ingestNtlmUsername);
-    if(ingestNtlmUsername == null)
-      ingestNtlmUsername = "";
-    String ingestNtlmPassword = parameters.getObfuscatedParameter(CswsParameters.ingestNtlmPassword);
-    if (ingestNtlmPassword == null)
-      ingestNtlmPassword = "";
-    else
-      ingestNtlmPassword = out.mapPasswordToKey(ingestNtlmPassword);
-    String ingestNtlmDomain = parameters.getParameter(CswsParameters.ingestNtlmDomain);
-    if(ingestNtlmDomain == null)
-      ingestNtlmDomain = "";
-    String ingestKeystore = parameters.getParameter(CswsParameters.ingestKeystore);
-
-    IKeystoreManager localIngestKeystore;
-    Map<String,String> ingestCertificatesMap = null;
-    String message = null;
-
-    try{
-      if (ingestKeystore == null)
-        localIngestKeystore = KeystoreManagerFactory.make("");
-      else
-        localIngestKeystore = KeystoreManagerFactory.make("",ingestKeystore);
-
-      String[] contents = localIngestKeystore.getContents();
-      if (contents.length > 0)
-      {
-        ingestCertificatesMap = new HashMap<>();
-        int i = 0;
-        while (i < contents.length)
-        {
-          String alias = contents[i];
-          String description = localIngestKeystore.getDescription(alias);
-          if (description.length() > 128)
-            description = description.substring(0,125) + "...";
-          ingestCertificatesMap.put(alias,description);
-          i++;
-        }
-      }
-
-    } catch (ManifoldCFException e) {
-      message = e.getMessage();
-      Logging.connectors.warn(e);
-    }
-
-    velocityContext.put("INGESTPROTOCOL",ingestProtocol);
-    velocityContext.put("INGESTPORT",ingestPort);
-    velocityContext.put("INGESTCGIPATH",ingestCgiPath);
-    velocityContext.put("INGESTNTLMUSERNAME",ingestNtlmUsername);
-    velocityContext.put("INGESTNTLMPASSWORD",ingestNtlmPassword);
-    velocityContext.put("INGESTNTLMDOMAIN",ingestNtlmDomain);
-    velocityContext.put("INGESTKEYSTORE",ingestKeystore);
-    if(ingestCertificatesMap != null)
-      velocityContext.put("INGESTCERTIFICATESMAP", ingestCertificatesMap);
-    if(message != null)
-      velocityContext.put("MESSAGE", message);
-  }
-
   /** Fill in Document View tab */
   protected static void fillInDocumentViewTab(Map<String,Object> velocityContext, IHTTPOutput out, ConfigParams parameters)
   {
@@ -1834,9 +1632,25 @@ public class CswsConnector extends org.a
     String serverPassword = variableContext.getParameter("serverpassword");
     if (serverPassword != null)
       parameters.setObfuscatedParameter(CswsParameters.serverPassword,variableContext.mapKeyToPassword(serverPassword));
+    
+    // MHL ???
+    String authenticationServicePath = variableContext.getParameter("authenticationservicepath");
+    if (authenticationServicePath != null)
+      parameters.setParameter(CswsParameters.authenticationPath, authenticationServicePath);
+    String contentServiceServicePath = variableContext.getParameter("contentserviceservicepath");
+    if (contentServiceServicePath != null)
+      parameters.setParameter(CswsParameters.contentServicePath, contentServiceServicePath);
+    String documentManagementServicePath = variableContext.getParameter("documentmanagementservicepath");
+    if (documentManagermentServicePath != null)
+      parameters.setParameter(CswsParameters.documentManagementPath, documentManagementServicePath);
+    String memberServiceServicePath = variableContext.getParameter("memberserviceservicepath");
+    if (memberServiceServicePath != null)
+      parameters.setParameter(CswsParameters.memberServicePath, memberServiceServicePath);
+
     String serverHTTPCgiPath = variableContext.getParameter("serverhttpcgipath");
     if (serverHTTPCgiPath != null)
       parameters.setParameter(CswsParameters.serverHTTPCgiPath,serverHTTPCgiPath);
+    
     String serverHTTPNTLMDomain = variableContext.getParameter("serverhttpntlmdomain");
     if (serverHTTPNTLMDomain != null)
       parameters.setParameter(CswsParameters.serverHTTPNTLMDomain,serverHTTPNTLMDomain);
@@ -1902,81 +1716,6 @@ public class CswsConnector extends org.a
     }
     parameters.setParameter(CswsParameters.serverHTTPSKeystore,serverHTTPSKeystoreValue);
     
-    // Ingest parameters
-    String ingestProtocol = variableContext.getParameter("ingestprotocol");
-    if (ingestProtocol != null)
-      parameters.setParameter(CswsParameters.ingestProtocol,ingestProtocol);
-    String ingestPort = variableContext.getParameter("ingestport");
-    if (ingestPort != null)
-      parameters.setParameter(CswsParameters.ingestPort,ingestPort);
-    String ingestCgiPath = variableContext.getParameter("ingestcgipath");
-    if (ingestCgiPath != null)
-      parameters.setParameter(CswsParameters.ingestCgiPath,ingestCgiPath);
-    String ingestNtlmDomain = variableContext.getParameter("ingestntlmdomain");
-    if (ingestNtlmDomain != null)
-      parameters.setParameter(CswsParameters.ingestNtlmDomain,ingestNtlmDomain);
-    String ingestNtlmUsername = variableContext.getParameter("ingestntlmusername");
-    if (ingestNtlmUsername != null)
-      parameters.setParameter(CswsParameters.ingestNtlmUsername,ingestNtlmUsername);
-    String ingestNtlmPassword = variableContext.getParameter("ingestntlmpassword");
-    if (ingestNtlmPassword != null)
-      parameters.setObfuscatedParameter(CswsParameters.ingestNtlmPassword,variableContext.mapKeyToPassword(ingestNtlmPassword));
-    
-    String ingestKeystoreValue = variableContext.getParameter("ingestkeystoredata");
-    final String ingestConfigOp = variableContext.getParameter("ingestconfigop");
-    if (ingestConfigOp != null)
-    {
-      if (ingestConfigOp.equals("Delete"))
-      {
-        String alias = variableContext.getParameter("ingestkeystorealias");
-        final IKeystoreManager mgr;
-        if (ingestKeystoreValue != null)
-          mgr = KeystoreManagerFactory.make("",ingestKeystoreValue);
-        else
-          mgr = KeystoreManagerFactory.make("");
-        mgr.remove(alias);
-        ingestKeystoreValue = mgr.getString();
-      }
-      else if (ingestConfigOp.equals("Add"))
-      {
-        String alias = IDFactory.make(threadContext);
-        byte[] certificateValue = variableContext.getBinaryBytes("ingestcertificate");
-        final IKeystoreManager mgr;
-        if (ingestKeystoreValue != null)
-          mgr = KeystoreManagerFactory.make("",ingestKeystoreValue);
-        else
-          mgr = KeystoreManagerFactory.make("");
-        java.io.InputStream is = new java.io.ByteArrayInputStream(certificateValue);
-        String certError = null;
-        try
-        {
-          mgr.importCertificate(alias,is);
-        }
-        catch (Throwable e)
-        {
-          certError = e.getMessage();
-        }
-        finally
-        {
-          try
-          {
-            is.close();
-          }
-          catch (IOException e)
-          {
-            // Eat this exception
-          }
-        }
-
-        if (certError != null)
-        {
-          return "Illegal certificate: "+certError;
-        }
-        ingestKeystoreValue = mgr.getString();
-      }
-    }
-    parameters.setParameter(CswsParameters.ingestKeystore,ingestKeystoreValue);
-
     return null;
   }
   

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/GetConnectionInfo.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/GetConnectionInfo.java?rev=1853138&r1=1853137&r2=1853138&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/GetConnectionInfo.java (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/GetConnectionInfo.java Thu Feb  7 14:14:46 2019
@@ -41,7 +41,7 @@ public class GetConnectionInfo
       System.err.println("Usage: GetConnectionInfo <connection_name>");
       System.err.println("");
       System.err.println("The result will be printed to standard out, in UTF-8 encoding, and will contain the following columns:");
-      System.err.println("    livelink_server");
+      System.err.println("    csws_server");
       System.exit(1);
     }
 
@@ -56,12 +56,12 @@ public class GetConnectionInfo
       if (connection == null)
         throw new ManifoldCFException("Connection "+connectionName+" does not exist");
 
-      if (connection.getClassName() == null || !connection.getClassName().equals("org.apache.manifoldcf.crawler.connectors.livelink.LivelinkConnector"))
-        throw new ManifoldCFException("Command can only be used on working Livelink connections.");
+      if (connection.getClassName() == null || !connection.getClassName().equals("org.apache.manifoldcf.crawler.connectors.csws.CswsConnector"))
+        throw new ManifoldCFException("Command can only be used on working Csws connections.");
 
       ConfigParams cfg = connection.getConfigParams();
 
-      UTF8Stdout.println(commaEscape(cfg.getParameter(LiveLinkParameters.serverName)));
+      UTF8Stdout.println(commaEscape(cfg.getParameter(CswsParameters.serverName)));
 
       System.err.println("Connection info done");
     }

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=1853138&r1=1853137&r2=1853138&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 Thu Feb  7 14:14:46 2019
@@ -24,22 +24,6 @@ public class CswsParameters
 {
   public static final String _rcsid = "@(#)$Id: LiveLinkParameters.java 988245 2010-08-23 18:39:35Z kwright $";
 
-  // These parameters are for ingestion: picking up a document after we discover it through LAPI
-  /** Ingestion CGI protocol */
-  public final static String ingestProtocol = "Protocol";
-  /** Ingestion CGI port **/
-  public final static String ingestPort = "Port";
-  /** Ingestion CGI path (path to fetch document from for ingestion) */
-  public final static String ingestCgiPath = "CGI path";
-  /** NTLM username */
-  public final static String ingestNtlmUsername = "NTLM user name";
-  /** NTLM password */
-  public final static String ingestNtlmPassword = "NTLM password";
-  /** NTLM domain (set if NTLM desired) */
-  public final static String ingestNtlmDomain = "NTLM domain";
-  /** Livelink SSL keystore */
-  public final static String ingestKeystore = "SSL keystore";
-  
   // These parameters are for viewing: constructing a URL the user can use to view the document
   /** View CGI protocol */
   public final static String viewProtocol = "View protocol";
@@ -52,8 +36,8 @@ public class CswsParameters
   /** Document View Action**/
   public final static String viewAction = "View Action";
   
-  // These parameters are for LAPI
-  /** Connection options; choices are "internal", "http", "https" */
+  // These parameters are for Web Services
+  /** Connection options; choices are "http", "https" */
   public final static String serverProtocol = "Server protocol";
   /** Server name */
   public final static String serverName = "Server name";
@@ -63,8 +47,14 @@ public class CswsParameters
   public final static String serverUsername = "Server user name";
   /** Server password */
   public final static String serverPassword = "Server password";
-  /** Server CGI path (path to use for viewing) */
-  public final static String serverHTTPCgiPath = "Server HTTP CGI path";
+  /** Authentication service CGI path */
+  public final static String authenticationPath = "Server Authentication Service path";
+  /** ContentService service CGI path */
+  public final static String contentServicePath = "Server ContentService Service path";
+  /** DocumentManagement service CGI path */
+  public final static String documentManagementPath = "Server DocumentManagement Service path";
+  /** MemberService service CGI path */
+  public final static String memberServicePath = "Server MemberService Service path";
   /** Server domain, if NTLM */
   public final static String serverHTTPNTLMDomain = "Server HTTP NTLM domain";
   /** Server HTTP user */

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=1853138&r1=1853137&r2=1853138&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 Thu Feb  7 14:14:46 2019
@@ -20,7 +20,6 @@ CswsConnector.CacheLifetime=Cache lifeti
 CswsConnector.CacheLRUSize=Cache LRU size:
 CswsConnector.minutes=minutes
 CswsConnector.Server=Server
-CswsConnector.DocumentAccess=Document Access
 CswsConnector.DocumentView=Document View
 CswsConnector.Paths=Paths
 CswsConnector.Filters=Filters
@@ -36,6 +35,10 @@ CswsConnector.ServerName=Server name:
 CswsConnector.ServerPort=Server port:
 CswsConnector.ServerUserName=Server user name:
 CswsConnector.ServerPassword=Server password:
+CswsConnector.AuthenticationServicePath=Authentication service path:
+CswsConnector.DocumentManagementServicePath=DocumentManagement service path:
+CswsConnector.ContentServiceServicePath=ContentService service path:
+CswsConnector.MemberServiceServicePath=MemberService service path:
 CswsConnector.UserNameRegularExpression=User name regular expression:
 CswsConnector.LivelinkUserExpression=Livelink user expression:
 CswsConnector.Parameters=Parameters:
@@ -43,28 +46,22 @@ CswsConnector.ChooseACertificateFile=Cho
 CswsConnector.AValidNumberIsRequired=A valid number is required
 CswsConnector.AValidNumberOrBlankIsRequired=A valid number, or blank, is required
 CswsConnector.EnterALivelinkServerName=Enter a livelink server name
+CswsConnector.EnterTheAuthenticationServicePath=Enter the Authentication service path
+CswsConnector.TheAuthenticationServicePathMustBeginWithACharacter=The Authentication service path must begin with a / character
+CswsConnector.EnterTheDocumentManagementServicePath=Enter the DocumentManagement service path
+CswsConnector.TheDocumentManagementServicePathMustBeginWithACharacter=The DocumentManager service path must begin with a / character
+CswsConnector.EnterTheMemberServiceServicePath=Enter the MemberService service path
+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.AServerPortNumberIsRequired=A server port number is required
-CswsConnector.EnterTheCrawlCgiPathToLivelink=Enter the crawl cgi path to livelink
-CswsConnector.TheIngestCgiPathMustBeginWithACharacter=The ingest cgi path must begin with a / character
 CswsConnector.TheViewCgiPathMustBeBlankOrBeginWithACharacter=The view cgi path must be blank, or begin with a / character
-CswsConnector.DocumentFetchProtocol=Document fetch protocol:
-CswsConnector.DocumentFetchPort=Document fetch port:
-CswsConnector.DocumentFetchSSLCertificateList=Document fetch SSL certificate list:
 CswsConnector.NoCertificatesPresent=No certificates present
 CswsConnector.DeleteCert=Delete cert 
 CswsConnector.AddCert=Add cert
 CswsConnector.Certificate=Certificate:
-CswsConnector.DocumentFetchCGIPath=Document fetch CGI path:
-CswsConnector.DocumentFetchNTLMDomain=Document fetch NTLM domain:
-CswsConnector.SetIfNTLMAuthDesired=(set if NTLM auth desired)
-CswsConnector.DocumentFetchNTLMUserName=Document fetch NTLM user name:
-CswsConnector.SetIfDifferentFromServerUserName=(set if different from server user name)
-CswsConnector.DocumentFetchNTLMPassword=Document fetch NTLM password:
-CswsConnector.SetIfDifferentFromServerPassword=(set if different from server password)
 CswsConnector.DocumentViewProtocol=Document view protocol:
-CswsConnector.SameAsFetchProtocol=Same as fetch protocol
 CswsConnector.DocumentViewServerName=Document view server name:
-CswsConnector.BlankSameAsFetchServer=(blank = same as fetch server)
 CswsConnector.DocumentViewPort=Document view port:
 CswsConnector.DocumentViewCGIPath=Document view CGI path
 CswsConnector.DocumentViewAction=Document view action
@@ -137,19 +134,13 @@ CswsConnector.CacheLRUSizeCannotBeNull=C
 CswsConnector.CacheLRUSizeMustBeAnInteger=Cache LRU size must be an integer
 
 CswsConnector.ServerProtocol=Server protocol:
-CswsConnector.internal=internal
-CswsConnector.ServerHTTPCGIPath=Server HTTP CGI path:
 CswsConnector.ServerHTTPNTLMDomain=Server HTTP domain:
 CswsConnector.ServerHTTPNTLMUserName=Server HTTP NTLM user name:
 CswsConnector.ServerHTTPNTLMPassword=Server HTTP NTLM password:
 CswsConnector.ServerSSLCertificateList=Server SSL certificate list:
-CswsConnector.EnterTheServerCgiPathToLivelink=Enter the server CGI path to reach Livelink
-CswsConnector.TheServerCgiPathMustBeginWithACharacter=The server CGI path must begin with a '/' character
 CswsConnector.Delete=Delete
 CswsConnector.Add=Add
 CswsConnector.CrawlUserWorkspaces=Crawl user workspaces?
 
 CswsConnector.EnterTheViewCgiPathToLivelink=Enter the view CGI path to LiveLink
-CswsConnector.TheIngestCgiPathMustBeBlankOrBeginWithACharacter=The ingestion CGI path must be blank or begin with a '/' character
-CswsConnector.UseLAPI=Use LAPI
 CswsConnector.SelectAViewProtocol=Select a view protocol

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=1853138&r1=1853137&r2=1853138&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 Thu Feb  7 14:14:46 2019
@@ -36,6 +36,10 @@ CswsConnector.ServerName=Nombre del serv
 CswsConnector.ServerPort=Puerto de servidor:
 CswsConnector.ServerUserName=Nombre de usuario del servidor:
 CswsConnector.ServerPassword=Contraseña del servidor:
+CswsConnector.AuthenticationServicePath=Authentication service path:
+CswsConnector.DocumentManagementServicePath=DocumentManagement service path:
+CswsConnector.ContentServiceServicePath=ContentService service path:
+CswsConnector.MemberServiceServicePath=MemberService service path:
 CswsConnector.UserNameRegularExpression=Nombre de usuario expresión regular:
 CswsConnector.LivelinkUserExpression=Expresión user link directo:
 CswsConnector.Parameters=Paràmetros:
@@ -43,28 +47,25 @@ CswsConnector.ChooseACertificateFile=Eli
 CswsConnector.AValidNumberIsRequired=Se requiere un número válido
 CswsConnector.AValidNumberOrBlankIsRequired=Un número válido , o en blanco, se requiere
 CswsConnector.EnterALivelinkServerName=Introduzca un nombre de servidor de acoplamiento directo
+CswsConnector.EnterTheAuthenticationServicePath=Enter the Authentication service path
+CswsConnector.TheAuthenticationServicePathMustBeginWithACharacter=The Authentication service path must begin with a / character
+CswsConnector.EnterTheDocumentManagementServicePath=Enter the DocumentManagement service path
+CswsConnector.TheDocumentManagementServicePathMustBeginWithACharacter=The DocumentManager service path must begin with a / character
+CswsConnector.EnterTheMemberServiceServicePath=Enter the MemberService service path
+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.AServerPortNumberIsRequired=Se requiere un número de puerto del servidor
-CswsConnector.EnterTheCrawlCgiPathToLivelink=Introduzca la ruta cgi rastreo directo enlace
-CswsConnector.TheIngestCgiPathMustBeginWithACharacter=El camino cgi ingresado debe comenzar con una / carácter
 CswsConnector.TheViewCgiPathMustBeBlankOrBeginWithACharacter=El camino vista cgi debe estar en blanco , o comenzar con un / carácter
-CswsConnector.DocumentFetchProtocol=Protocolo de traída de documento:
-CswsConnector.DocumentFetchPort=Puerto de traída de documento:
-CswsConnector.DocumentFetchSSLCertificateList=Traída de documento SSL lista de certificado:
 CswsConnector.NoCertificatesPresent=Ningún presente de certificados
 CswsConnector.DeleteCert=eliminar cert 
 CswsConnector.AddCert=Añadir cert
 CswsConnector.Certificate=Certificado:
-CswsConnector.DocumentFetchCGIPath=Documento ha podido recuperar la senda CGI:
-CswsConnector.DocumentFetchNTLMDomain=Traída de documento NTLM dominio:
 CswsConnector.SetIfNTLMAuthDesired=(establecer si NTLM autenticación deseado)
-CswsConnector.DocumentFetchNTLMUserName=Traída de documento NTLM nombre de usuario:
 CswsConnector.SetIfDifferentFromServerUserName=(establecer si es diferente del nombre de usuario del servidor)
-CswsConnector.DocumentFetchNTLMPassword=Traída de documento NTLM contraseña:
 CswsConnector.SetIfDifferentFromServerPassword=(establecer si es diferente de la contraseña del servidor)
 CswsConnector.DocumentViewProtocol=Protocolo de vista del documento:
-CswsConnector.SameAsFetchProtocol=Igual que se ha podido recuperar protocolo
 CswsConnector.DocumentViewServerName=Nombre del servidor de vista del documento:
-CswsConnector.BlankSameAsFetchServer=(blanco = mismo que se ha podido recuperar del servidor)
 CswsConnector.DocumentViewPort=Documento puerto vista:
 CswsConnector.DocumentViewCGIPath=Ruta vista CGI Documento
 CswsConnector.DocumentViewAction=Vista de documento CGI camino
@@ -137,19 +138,14 @@ CswsConnector.CacheLRUSizeCannotBeNull=T
 CswsConnector.CacheLRUSizeMustBeAnInteger=Tamaño de caché LRU debe ser un entero
 
 CswsConnector.ServerProtocol=protocolo de servidor:
-CswsConnector.internal=interna
-CswsConnector.ServerHTTPCGIPath=Ruta de acceso HTTP CGI del servidor:
 CswsConnector.ServerHTTPNTLMDomain=Servidor dominio de HTTP:
 CswsConnector.ServerHTTPNTLMUserName=Servidor HTTP NTLM nombre de usuario:
 CswsConnector.ServerHTTPNTLMPassword=Servidor HTTP NTLM contraseña:
 CswsConnector.ServerSSLCertificateList=Servidor SSL lista de certificado:
-CswsConnector.EnterTheServerCgiPathToLivelink=Introduzca la ruta CGI del servidor para llegar enlace en directo
 CswsConnector.TheServerCgiPathMustBeginWithACharacter=El camino CGI del servidor debe comenzar con una '/' carácter
 CswsConnector.Delete=Borrar
 CswsConnector.Add=Add
 CswsConnector.CrawlUserWorkspaces=Espacios de trabajo de usuario de velocidad lenta?
 
 CswsConnector.EnterTheViewCgiPathToLivelink=Introduzca la ruta vista CGI para un Enlace directo
-CswsConnector.TheIngestCgiPathMustBeBlankOrBeginWithACharacter=El camino CGI ingreso debe estar en blanco o comenzar con un '/' carácter
-CswsConnector.UseLAPI=Usar LAPI
 CswsConnector.SelectAViewProtocol=Seleccione un protocolo de vista

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=1853138&r1=1853137&r2=1853138&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 Thu Feb  7 14:14:46 2019
@@ -30,12 +30,24 @@ CswsConnector.UserMapping=Mapping utilis
 CswsConnector.AValidNumberIsRequired=Un nombre valide est nécessaire
 CswsConnector.UserNameRegularExpressionMustBeValidRegularExpression=L'expression régulière du nom d'utilisateur doit être une expression régulière valide
 CswsConnector.EnterALivelinkServerName=Entrer le nom d'un serveur livelink
+CswsConnector.EnterTheAuthenticationServicePath=Enter the Authentication service path
+CswsConnector.TheAuthenticationServicePathMustBeginWithACharacter=The Authentication service path must begin with a / character
+CswsConnector.EnterTheDocumentManagementServicePath=Enter the DocumentManagement service path
+CswsConnector.TheDocumentManagementServicePathMustBeginWithACharacter=The DocumentManager service path must begin with a / character
+CswsConnector.EnterTheMemberServiceServicePath=Enter the MemberService service path
+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.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:
 CswsConnector.ServerPort=Port du serveur:
 CswsConnector.ServerUserName=Nom d'utilisateur du serveur:
 CswsConnector.ServerPassword=Mot de passe du serveur:
+CswsConnector.AuthenticationServicePath=Authentication service path:
+CswsConnector.DocumentManagementServicePath=DocumentManagement service path:
+CswsConnector.ContentServiceServicePath=ContentService service path:
+CswsConnector.MemberServiceServicePath=MemberService service path:
 CswsConnector.UserNameRegularExpression=Expression régulière du nom d'utilisateur:
 CswsConnector.LivelinkUserExpression=Expression de l'utilisateur Livelink:
 CswsConnector.Parameters=Paramètres:
@@ -44,27 +56,13 @@ CswsConnector.AValidNumberIsRequired=Un
 CswsConnector.AValidNumberOrBlankIsRequired=Un nombre valide, ou vide, est requis
 CswsConnector.EnterALivelinkServerName=Entrer un nom de serveur livelink
 CswsConnector.AServerPortNumberIsRequired=Un numéro de port du serveur est requis
-CswsConnector.EnterTheCrawlCgiPathToLivelink=Entrer le chemin de crawl cgi vers livelink
-CswsConnector.TheIngestCgiPathMustBeginWithACharacter=Le chemin ingest cgi doit commencer par le caractère /
 CswsConnector.TheViewCgiPathMustBeBlankOrBeginWithACharacter=Le chemin view cgi doit être vide ou doit commencer par le caractère /
-CswsConnector.DocumentFetchProtocol=Protocole de récupération de document (document fetch protocol):
-CswsConnector.DocumentFetchPort=Port de récupération de document:
-CswsConnector.DocumentFetchSSLCertificateList=Liste de certificats SSL pour la récupération de document:
 CswsConnector.NoCertificatesPresent=Aucun certificat présent
 CswsConnector.DeleteCert=Supprimer cert
 CswsConnector.AddCert=Ajouter cert
 CswsConnector.Certificate=Certificat:
-CswsConnector.DocumentFetchCGIPath=Chemin CGI pour la récupération de document (Document fetch):
-CswsConnector.DocumentFetchNTLMDomain=Domaine NTLM pour la récupération de document (document fetch):
-CswsConnector.SetIfNTLMAuthDesired=(activé si l'authentification NTML est voulue)
-CswsConnector.DocumentFetchNTLMUserName=Nom d'utilisateur du NTML de récupération de document (document fetch):
-CswsConnector.SetIfDifferentFromServerUserName=(activé si différent du nom d'utilisateur du serveur)
-CswsConnector.DocumentFetchNTLMPassword=Mot de passe du NTML de récupération de document (Document fetch):
-CswsConnector.SetIfDifferentFromServerPassword=(activé si différent du mot de passe serveur)
 CswsConnector.DocumentViewProtocol=Protocole de visualisation de document:
-CswsConnector.SameAsFetchProtocol=Identique au protocole de récupération
 CswsConnector.DocumentViewServerName=Nom du serveur de visualisation de document (Document view):
-CswsConnector.BlankSameAsFetchServer=(vide = identifique au serveur de récupération)
 CswsConnector.DocumentViewPort=Port de visualisation de document:
 CswsConnector.DocumentViewCGIPath=Chemin CGI de visualisation de document
 CswsConnector.Parameters=Paramètres:
@@ -133,19 +131,13 @@ CswsConnector.CacheLRUSizeCannotBeNull=L
 CswsConnector.CacheLRUSizeMustBeAnInteger=La taille du cache LRU doit être un entier
 
 CswsConnector.ServerProtocol=Protocole du serveur:
-CswsConnector.internal=interne
-CswsConnector.ServerHTTPCGIPath=Chemin CGI du serveur HTTP:
 CswsConnector.ServerHTTPNTLMDomain=Domaine du serveur HTTP:
 CswsConnector.ServerHTTPNTLMUserName=Nom d'utilisateur du NTML du serveur HTTP:
 CswsConnector.ServerHTTPNTLMPassword=Mot de passe du NTML du serveur HTTP:
 CswsConnector.ServerSSLCertificateList=Liste des certificats SSL du serveur:
-CswsConnector.EnterTheServerCgiPathToLivelink=Entrer le chemin CGI du serveur pour atteindre Livelink
-CswsConnector.TheServerCgiPathMustBeginWithACharacter=Le chemin CGI du serveur doit commencer par le caractère '/'
 CswsConnector.Delete=Supprimer
 CswsConnector.Add=Ajouter
 CswsConnector.CrawlUserWorkspaces=Crawler les espaces de travail de l'utilisateur (user workspaces)?
 
 CswsConnector.EnterTheViewCgiPathToLivelink=Entrer le chemin view CGI (view CGI path) vers LiveLink
-CswsConnector.TheIngestCgiPathMustBeBlankOrBeginWithACharacter=Le chemin d'ingestion CGI (Ingestion CGI path) doit être vide ou commencer par le caractère '/'
-CswsConnector.UseLAPI=Utiliser LAPI
 CswsConnector.SelectAViewProtocol=Sélectionner un protocole de visualisation (view protocol)

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=1853138&r1=1853137&r2=1853138&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 Thu Feb  7 14:14:46 2019
@@ -30,12 +30,24 @@ CswsConnector.UserMapping=ユーã
 CswsConnector.AValidNumberIsRequired=数値を入力してください
 CswsConnector.UserNameRegularExpressionMustBeValidRegularExpression=正しいユーザ名正規表現式を入力してください
 CswsConnector.EnterALivelinkServerName=LiveLinkサーバ名を入力してください
+CswsConnector.EnterTheAuthenticationServicePath=Enter the Authentication service path
+CswsConnector.TheAuthenticationServicePathMustBeginWithACharacter=The Authentication service path must begin with a / character
+CswsConnector.EnterTheDocumentManagementServicePath=Enter the DocumentManagement service path
+CswsConnector.TheDocumentManagementServicePathMustBeginWithACharacter=The DocumentManager service path must begin with a / character
+CswsConnector.EnterTheMemberServiceServicePath=Enter the MemberService service path
+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.AServerPortNumberIsRequired=サーバポート番号を入力してください
 CswsConnector.UserNameRegularExpressionCannotBeNull=ユーザ名正規表現を入力してください
 CswsConnector.ServerName=サーバ名:
 CswsConnector.ServerPort=サーバポート:
 CswsConnector.ServerUserName=サーバユーザ名:
 CswsConnector.ServerPassword=サーバパスワード:
+CswsConnector.AuthenticationServicePath=Authentication service path:
+CswsConnector.DocumentManagementServicePath=DocumentManagement service path:
+CswsConnector.ContentServiceServicePath=ContentService service path:
+CswsConnector.MemberServiceServicePath=MemberService service path:
 CswsConnector.UserNameRegularExpression=ユーザ名正規表現式:
 CswsConnector.LivelinkUserExpression=Livelinkユーザ式:
 CswsConnector.Parameters=引数:
@@ -44,27 +56,16 @@ 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=引数:
@@ -133,19 +134,13 @@ CswsConnector.CacheLRUSizeCannotBeNull=�
 CswsConnector.CacheLRUSizeMustBeAnInteger=キャッシュLRUサイズには整数を入力してください
 
 CswsConnector.ServerProtocol=サーバプロトコル:
-CswsConnector.internal=internal
-CswsConnector.ServerHTTPCGIPath=サーバ HTTP CGI パス: 
 CswsConnector.ServerHTTPNTLMDomain=サーバ HTTP ドメイン: 
 CswsConnector.ServerHTTPNTLMUserName=サーバ HTTP NTLM ユーザ名: 
 CswsConnector.ServerHTTPNTLMPassword=サーバ HTTP NTLM パスワード: 
 CswsConnector.ServerSSLCertificateList=サーバ SSL 証明書一覧: 
-CswsConnector.EnterTheServerCgiPathToLivelink=Enter the server CGI path to reach Livelink
-CswsConnector.TheServerCgiPathMustBeginWithACharacter=The server CGI path must begin with a '/' character
 CswsConnector.Delete=削除
 CswsConnector.Add=追加
 CswsConnector.CrawlUserWorkspaces=Crawl user workspaces?
 
 CswsConnector.EnterTheViewCgiPathToLivelink=Enter the view CGI path to LiveLink
-CswsConnector.TheIngestCgiPathMustBeBlankOrBeginWithACharacter=The ingestion CGI path must be blank or begin with a '/' character
-CswsConnector.UseLAPI=Use LAPI
 CswsConnector.SelectAViewProtocol=Select a view protocol

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=1853138&r1=1853137&r2=1853138&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 Thu Feb  7 14:14:46 2019
@@ -36,6 +36,10 @@ CswsConnector.ServerName=服务å�
 CswsConnector.ServerPort=服务器端口: 
 CswsConnector.ServerUserName=服务器用户名: 
 CswsConnector.ServerPassword=服务器密码: 
+CswsConnector.AuthenticationServicePath=Authentication service path:
+CswsConnector.DocumentManagementServicePath=DocumentManagement service path:
+CswsConnector.ContentServiceServicePath=ContentService service path:
+CswsConnector.MemberServiceServicePath=MemberService service path:
 CswsConnector.UserNameRegularExpression=用户名正则表达式: 
 CswsConnector.LivelinkUserExpression=Livelink用户表达式: 
 CswsConnector.Parameters=参数: 
@@ -43,28 +47,25 @@ CswsConnector.ChooseACertificateFile=è�
 CswsConnector.AValidNumberIsRequired=请输入有效的数字
 CswsConnector.AValidNumberOrBlankIsRequired=请输入有效的数字或设为空
 CswsConnector.EnterALivelinkServerName=请输入LiveLink服务器名
+CswsConnector.EnterTheAuthenticationServicePath=Enter the Authentication service path
+CswsConnector.TheAuthenticationServicePathMustBeginWithACharacter=The Authentication service path must begin with a / character
+CswsConnector.EnterTheDocumentManagementServicePath=Enter the DocumentManagement service path
+CswsConnector.TheDocumentManagementServicePathMustBeginWithACharacter=The DocumentManager service path must begin with a / character
+CswsConnector.EnterTheMemberServiceServicePath=Enter the MemberService service path
+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.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=参数: 
@@ -133,19 +134,13 @@ CswsConnector.CacheLRUSizeCannotBeNull=�
 CswsConnector.CacheLRUSizeMustBeAnInteger=缓存LRU大小需输入整数
 
 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=爬取用户工作区
 
 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/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=1853138&r1=1853137&r2=1853138&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 Thu Feb  7 14:14:46 2019
@@ -38,27 +38,6 @@
       }
     }
 
-    function IngestDeleteCertificate(aliasName)
-    {
-      editconnection.ingestkeystorealias.value = aliasName;
-      editconnection.ingestconfigop.value = "Delete";
-      postForm();
-    }
-
-    function IngestAddCertificate()
-    {
-      if (editconnection.ingestcertificate.value == "")
-      {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.ChooseACertificateFile'))");
-        editconnection.ingestcertificate.focus();
-      }
-      else
-      {
-        editconnection.ingestconfigop.value = "Add";
-        postForm();
-      }
-    }
-
     function checkConfig()
     {
       if (editconnection.serverport.value != "" && !isInteger(editconnection.serverport.value))
@@ -67,12 +46,6 @@
         editconnection.serverport.focus();
         return false;
       }
-      if (editconnection.ingestport.value != "" && !isInteger(editconnection.ingestport.value))
-      {
-        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('CswsConnector.AValidNumberOrBlankIsRequired'))");
@@ -98,41 +71,78 @@
         editconnection.serverport.focus();
         return false;
       }
-      if (editconnection.serverhttpcgipath.value == "")
+
+      if (editconnection.authenticationservicepath.value == "")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.EnterTheServerCgiPathToLivelink'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.EnterTheAuthenticationServicePath'))");
         SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
-        editconnection.serverhttpcgipath.focus();
+        editconnection.authenticationservicepath.focus();
         return false;
       }
-      if (editconnection.serverhttpcgipath.value.substring(0,1) != "/")
+      if (editconnection.authenticationservicepath.value.substring(0,1) != "/")
       {
-        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.TheServerCgiPathMustBeginWithACharacter'))");
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.TheAuthenticationServicePathMustBeginWithACharacter'))");
         SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
-        editconnection.serverhttpcgipath.focus();
+        editconnection.authenticationservicepath.focus();
         return false;
       }
-      if (editconnection.viewprotocol.value == "" && editconnection.ingestprotocol.value == "")
+      if (editconnection.documentmanagementservicepath.value == "")
+      {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.EnterTheDocumentManagementServicePath'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
+        editconnection.documentmanagementservicepath.focus();
+        return false;
+      }
+      if (editconnection.documentmanagementservicepath.value.substring(0,1) != "/")
+      {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.TheDocumentManagementServicePathMustBeginWithACharacter'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
+        editconnection.documentmanagementservicepath.focus();
+        return false;
+      }
+      if (editconnection.memberserviceservicepath.value == "")
+      {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.EnterTheMemberServiceServicePath'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
+        editconnection.memberserviceservicepath.focus();
+        return false;
+      }
+      if (editconnection.memberserviceservicepath.value.substring(0,1) != "/")
+      {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.TheMemberServiceServicePathMustBeginWithACharacter'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
+        editconnection.memberserviceservicepath.focus();
+        return false;
+      }
+      if (editconnection.contentserviceservicepath.value == "")
+      {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.EnterTheContentServiceServicePath'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
+        editconnection.contentserviceservicepath.focus();
+        return false;
+      }
+      if (editconnection.contentserviceservicepath.value.substring(0,1) != "/")
+      {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.TheContentServiceServicePathMustBeginWithACharacter'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('CswsConnector.Server'))");
+        editconnection.contentserviceservicepath.focus();
+        return false;
+      }
+
+      if (editconnection.viewprotocol.value == "")
       {
         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 == "")
+      if (editconnection.viewcgipath.value == "")
       {
         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('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('CswsConnector.TheViewCgiPathMustBeBlankOrBeginWithACharacter'))");

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=1853138&r1=1853137&r2=1853138&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 Thu Feb  7 14:14:46 2019
@@ -25,7 +25,6 @@
     <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('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>
@@ -66,14 +65,40 @@
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerHTTPCGIPath'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.AuthenticationServicePath'))</nobr>
     </td>
     <td class="value">
-      <input type="text" size="32" name="serverhttpcgipath" value="$Encoder.attributeEscape($SERVERHTTPCGIPATH)"/>
+      <input type="text" size="32" name="authenticationservicepath" value="$Encoder.attributeEscape($AUTHENTICATIONSERVICEPATH)"/>
     </td>
   </tr>
   <tr>
     <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.DocumentManagementServicePath'))</nobr>
+    </td>
+    <td class="value">
+      <input type="text" size="32" name="documentmanagementservicepath" value="$Encoder.attributeEscape($DOCUMENTMANAGEMENTSERVICEPATH)"/>
+    </td>
+  </tr>
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ContentServiceServicePath'))</nobr>
+    </td>
+    <td class="value">
+      <input type="text" size="32" name="contentserviceservicepath" value="$Encoder.attributeEscape($CONTENTSERVICESERVICEPATH)"/>
+    </td>
+  </tr>
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.MemberServiceServicePath'))</nobr>
+    </td>
+    <td class="value">
+      <input type="text" size="32" name="memberserviceservicepath" value="$Encoder.attributeEscape($MEMBERSERVICESERVICEPATH)"/>
+    </td>
+  </tr>
+
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr>
+    <td class="description">
       <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.ServerHTTPNTLMDomain'))</nobr>
       <br/>
       <nobr>$Encoder.bodyEscape($ResourceBundle.getString('CswsConnector.SetIfNTLMAuthDesired'))</nobr>



Mime
View raw message