svn commit: r1531268 - in /manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main: java/org/apache/manifoldcf/crawler/connectors/sharepoint/ java/org/apache/manifoldcf/sharepoint/ native2ascii/org/apache/manifoldcf/authorities/auth...

Fri, 11 Oct 2013 05:22:04 -0700 

Author: kwright
Date: Fri Oct 11 12:20:39 2013
New Revision: 1531268

URL: http://svn.apache.org/r1531268
Log:
Move common transport support into common area, and also move UI pieces to 
support SharePoint authority to connect with SharePoint.

Added:
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/sharepoint/
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/sharepoint/CommonsHTTPSender.java
      - copied, changed from r1531251, 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/CommonsHTTPSender.java
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
   (with props)
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/sharepoint/
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/sharepoint/sharepoint-client-config.wsdd
      - copied, changed from r1531251, 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/sharepoint-client-config.wsdd
Removed:
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/CommonsHTTPSender.java
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/sharepoint-client-config.wsdd
Modified:
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html

Modified: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java?rev=1531268&r1=1531267&r2=1531268&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
 Fri Oct 11 12:20:39 2013
@@ -67,7 +67,7 @@ import org.w3c.dom.Document;
 public class SPSProxyHelper {
 
 
-  public static final String HTTPCLIENT_PROPERTY = "ManifoldCF_HttpClient";
+  public static final String HTTPCLIENT_PROPERTY = 
org.apache.manifoldcf.sharepoint.CommonsHTTPSender.HTTPCLIENT_PROPERTY;
 
   private String serverUrl;
   private String serverLocation;

Modified: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1531268&r1=1531267&r2=1531268&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
 Fri Oct 11 12:20:39 2013
@@ -254,7 +254,7 @@ public class SharePointRepository extend
       httpClient = localHttpClient;
       
       proxy = new SPSProxyHelper( serverUrl, encodedServerLocation, 
serverLocation, userName, password,
-        getClass(), "sharepoint-client-config.wsdd",
+        org.apache.manifoldcf.sharepoint.CommonsHTTPSender.class, 
"sharepoint-client-config.wsdd",
         httpClient );
       
     }

Copied: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/sharepoint/CommonsHTTPSender.java
 (from r1531251, 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/CommonsHTTPSender.java)
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/sharepoint/CommonsHTTPSender.java?p2=manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/sharepoint/CommonsHTTPSender.java&p1=manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/CommonsHTTPSender.java&r1=1531251&r2=1531268&rev=1531268&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/CommonsHTTPSender.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/sharepoint/CommonsHTTPSender.java
 Fri Oct 11 12:20:39 2013
@@ -15,7 +15,7 @@
 *
 * $Id: CommonsHTTPSender.java 988245 2010-08-23 18:39:35Z kwright $
 */
-package org.apache.manifoldcf.crawler.connectors.sharepoint;
+package org.apache.manifoldcf.sharepoint;
 
 import org.apache.manifoldcf.core.common.XThreadInputStream;
 
@@ -89,6 +89,8 @@ import java.util.List;
 
 public class CommonsHTTPSender extends BasicHandler {
 
+  public static final String HTTPCLIENT_PROPERTY = "ManifoldCF_HttpClient";
+
   /** Field log           */
   protected static Log log =
     LogFactory.getLog(CommonsHTTPSender.class.getName());
@@ -123,7 +125,7 @@ public class CommonsHTTPSender extends B
         new URL(msgContext.getStrProp(MessageContext.TRANS_URL));
 
       // Get the HttpClient
-      HttpClient httpClient = 
(HttpClient)msgContext.getProperty(SPSProxyHelper.HTTPCLIENT_PROPERTY);
+      HttpClient httpClient = 
(HttpClient)msgContext.getProperty(HTTPCLIENT_PROPERTY);
 
       boolean posting = true;
       // If we're SOAP 1.2, allow the web method to be set from the

Modified: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties?rev=1531268&r1=1531267&r2=1531268&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties
 Fri Oct 11 12:20:39 2013
@@ -41,16 +41,32 @@ SharePointAuthority.CacheLRUSizeCannotBe
 SharePointAuthority.CacheLRUSizeMustBeAnInteger=Cache LRU size must be an 
integer
 SharePointAuthority.certificate=certificate(s)
 
-
-
-
-
-
-
-
-
-
-
+SharePointAuthority.Server=Server
+SharePointAuthority.ServerSharePointVersion=Server SharePoint version:
+SharePointAuthority.ServerProtocol=Server protocol:
+SharePointAuthority.ServerName=Server name:
+SharePointAuthority.ServerPort=Server port:
+SharePointAuthority.SitePath=Site path:
+SharePointAuthority.UserName=User name:
+SharePointAuthority.Password=Password:
+SharePointAuthority.SSLCertificateList=SSL certificate list:
+SharePointAuthority.NoCertificatesPresent=No certificates present
+SharePointAuthority.Delete=Delete
+SharePointAuthority.DeleteCert=Delete cert
+SharePointAuthority.Add=Add
+SharePointAuthority.AddCert=Add cert
+SharePointAuthority.Parameters=Parameters:
+SharePointAuthority.ChooseACertificateFile=Choose a certificate file
+SharePointAuthority.PleaseSupplyAValidNumber=Please supply a valid number
+SharePointAuthority.PleaseSpecifyAnyServerPathInformation=Please specify any 
server path information in the site path field, not the server name field
+SharePointAuthority.SitePathMustBeginWithWCharacter=Site path must begin with 
a '/' character
+SharePointAuthority.SitePathCannotEndWithACharacter=Site path cannot end with 
a '/' character
+SharePointAuthority.AValidSharePointUserNameHasTheForm=A valid SharePoint user 
name has the form <domain>\\<user>
+SharePointAuthority.PleaseFillInASharePointServerName=Please fill in a 
SharePoint server name
+SharePointAuthority.PleaseSpecifyAnyServerPathInformationInTheSitePathField=Please
 specify any server path information in the site path field, not the server 
name field
+SharePointAuthority.PleaseSupplyASharePointPortNumber=Please supply a 
SharePoint port number, or none for default
+SharePointAuthority.TheConnectionRequiresAValidSharePointUserName=The 
connection requires a valid SharePoint user name of the form <domain>\\<user>
+SharePointAuthority.Certificate=Certificate:
 
 
 

Modified: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties?rev=1531268&r1=1531267&r2=1531268&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties
 Fri Oct 11 12:20:39 2013
@@ -40,3 +40,30 @@ SharePointAuthority.CacheLifetimeMustBeA
 SharePointAuthority.CacheLRUSizeCannotBeNull=キャッシュLRUサイズをå…
¥åŠ›ã—てください
 
SharePointAuthority.CacheLRUSizeMustBeAnInteger=キャッシュLRUサイズには整数をå
…¥åŠ›ã—てください
 SharePointAuthority.certificate=証明書
+
+SharePointAuthority.Server=サーバ
+SharePointAuthority.ServerSharePointVersion=サーバSharePointバージョン：
+SharePointAuthority.ServerProtocol=サーバプロトコル：
+SharePointAuthority.ServerName=サーバ名：
+SharePointAuthority.ServerPort=サーバポート番号：
+SharePointAuthority.SitePath=サイトパス：
+SharePointAuthority.UserName=ユーザ名：
+SharePointAuthority.Password=パスワード：
+SharePointAuthority.SSLCertificateList=SSL認証一覧：
+SharePointAuthority.NoCertificatesPresent=認証がありません
+SharePointAuthority.Delete=削除
+SharePointAuthority.DeleteCert=認証の削除
+SharePointAuthority.Add=追加
+SharePointAuthority.AddCert=認証の追加
+SharePointAuthority.Parameters=引数：
+SharePointAuthority.ChooseACertificateFile=証明書ファイルを選択してくã
 ã•ã„
+SharePointAuthority.PleaseSupplyAValidNumber=数字を入力してください
+SharePointAuthority.PleaseSpecifyAnyServerPathInformation=サーバ名ではなく、サイトパスにサーバパスæƒ
…報を入力してください
+SharePointAuthority.SitePathMustBeginWithWCharacter=サイトパスは文字「/」から始めてくã
 ã•ã„
+SharePointAuthority.SitePathCannotEndWithACharacter=サイトパスの未尾に文字「/」を使わないでくã
 ã•ã„
+SharePointAuthority.AValidSharePointUserNameHasTheForm=SharePointユーザ名は<ドメイン>\\<ユーザ>\で指定してくã
 ã•ã„
+SharePointAuthority.PleaseFillInASharePointServerName=SharePointサーバ名をå
…¥åŠ›ã—てください
+SharePointAuthority.PleaseSpecifyAnyServerPathInformationInTheSitePathField=サーバ名ではなく、サイトパスにサーバパスæƒ
…報を入力してください
+SharePointAuthority.PleaseSupplyASharePointPortNumber=SharePointポート番号をå
…¥åŠ›ã—てください。デフォルト値を利用するå 
´åˆã¯ç©ºç™½ã«ã—てください
+SharePointAuthority.TheConnectionRequiresAValidSharePointUserName=コネクションのSharePointユーザ名は<ドメイン>\\<ユーザ>\形式で指定してくã
 ã•ã„
+SharePointAuthority.Certificate=証明証：

Modified: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js?rev=1531268&r1=1531267&r2=1531268&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js
 (original)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js
 Fri Oct 11 12:20:39 2013
@@ -39,6 +39,37 @@ function checkConfig()
     }
     i += 1;
   }
+  if (editconnection.serverPort.value != "" && 
!isInteger(editconnection.serverPort.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.PleaseSupplyAValidNumber'))");
+    editconnection.serverPort.focus();
+    return false;
+  }
+  if (editconnection.serverName.value.indexOf("/") >= 0)
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.PleaseSpecifyAnyServerPathInformation'))");
+    editconnection.serverName.focus();
+    return false;
+  }
+  var svrloc = editconnection.serverLocation.value;
+  if (svrloc != "" && svrloc.charAt(0) != "/")
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.SitePathMustBeginWithWCharacter'))");
+    editconnection.serverLocation.focus();
+    return false;
+  }
+  if (svrloc != "" && svrloc.charAt(svrloc.length - 1) == "/")
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.SitePathCannotEndWithACharacter'))");
+    editconnection.serverLocation.focus();
+    return false;
+  }
+  if (editconnection.userName.value != "" && 
editconnection.userName.value.indexOf("\\") <= 0)
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.AValidSharePointUserNameHasTheForm'))");
+    editconnection.userName.focus();
+    return false;
+  }
   return true;
 }
 
@@ -72,6 +103,49 @@ function checkConfigForSave()
     editconnection.cachelrusize.focus();
     return false;
   }
+  if (editconnection.serverName.value == "")
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.PleaseFillInASharePointServerName'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.Server'))");
+    editconnection.serverName.focus();
+    return false;
+  }
+  if (editconnection.serverName.value.indexOf("/") >= 0)
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.PleaseSpecifyAnyServerPathInformationInTheSitePathField'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.Server'))");
+    editconnection.serverName.focus();
+    return false;
+  }
+  var svrloc = editconnection.serverLocation.value;
+  if (svrloc != "" && svrloc.charAt(0) != "/")
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.SitePathMustBeginWithWCharacter'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.Server'))");
+    editconnection.serverLocation.focus();
+    return false;
+  }
+  if (svrloc != "" && svrloc.charAt(svrloc.length - 1) == "/")
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.SitePathCannotEndWithACharacter'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.Server'))");
+    editconnection.serverLocation.focus();
+    return false;
+  }
+  if (editconnection.serverPort.value != "" && 
!isInteger(editconnection.serverPort.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.PleaseSupplyASharePointPortNumber'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.Server'))");
+    editconnection.serverPort.focus();
+    return false;
+  }
+  if (editconnection.userName.value != "" && 
editconnection.userName.value.indexOf("\\") <= 0)
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.TheConnectionRequiresAValidSharePointUserName'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.Server'))");
+    editconnection.userName.focus();
+    return false;
+  }
   return true;
 }
 
@@ -129,6 +203,27 @@ function addDC()
   postFormSetAnchor("dcrecord");
 }
 
+function ShpDeleteCertificate(aliasName)
+{
+  editconnection.shpkeystorealias.value = aliasName;
+  editconnection.configop.value = "Delete";
+  postForm();
+}
+
+function ShpAddCertificate()
+{
+  if (editconnection.shpcertificate.value == "")
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.ChooseACertificateFile'))");
+    editconnection.shpcertificate.focus();
+  }
+  else
+  {
+    editconnection.configop.value = "Add";
+    postForm();
+  }
+}
+
 //-->
 </script>
 

Added: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html?rev=1531268&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
 (added)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
 Fri Oct 11 12:20:39 2013
@@ -0,0 +1,121 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+#if($KEYSTORE)
+<input type="hidden" name="keystoredata" 
value="$Encoder.attributeEscape($KEYSTORE)"/>
+#end
+
+#if($TabName == $ResourceBundle.getString('SharePointAuthority.Server'))
+
+<table class="displaytable">
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ServerSharePointVersion'))</nobr></td>
+    <td class="value">
+      <select name="serverVersion">
+  #if($SERVERVERSION == '2.0')
+        <option value="2.0" selected="true">SharePoint Services 2.0 
(2003)</option>
+  #else
+        <option value="2.0">SharePoint Services 2.0 (2003)</option>
+  #end
+  #if($SERVERVERSION == '3.0')
+        <option value="3.0" selected="true">SharePoint Services 3.0 
(2007)</option>
+  #else
+        <option value="3.0">SharePoint Services 3.0 (2007)</option>
+  #end
+  #if($SERVERVERSION == '4.0')
+        <option value="4.0" selected="true">SharePoint Services 4.0 
(2010)</option>
+  #else
+        <option value="4.0">SharePoint Services 4.0 (2010)</option>
+  #end
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ServerProtocol'))</nobr></td>
+    <td class="value">
+      <select name="serverProtocol">
+  #if($SERVERPROTOCOL == 'http')
+        <option value="http" selected="true">http</option>
+  #else
+        <option value="http">http</option>
+  #end
+  #if($SERVERPROTOCOL == 'https')
+        <option value="https" selected="true">https</option>
+  #else
+        <option value="https">https</option>
+  #end
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ServerName'))</nobr></td>
+    <td class="value"><input type="text" size="64" name="serverName" 
value="$Encoder.attributeEscape($SERVERNAME)"/></td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ServerPort'))</nobr></td>
+    <td class="value"><input type="text" size="5" name="serverPort" 
value="$SERVERPORT"/></td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.SitePath'))</nobr></td>
+    <td class="value"><input type="text" size="64" name="serverLocation" 
value="$Encoder.attributeEscape($SERVERLOCATION)"/></td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.UserName'))</nobr></td>
+    <td class="value"><input type="text" size="32" name="userName" 
value="$Encoder.attributeEscape($USERNAME)"/></td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.Password'))</nobr></td>
+    <td class="value"><input type="password" size="32" name="password" 
value="$Encoder.attributeEscape($PASSWORD)"/></td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.SSLCertificateList'))</nobr></td>
+    <td class="value">
+      <input type="hidden" name="configop" value="Continue"/>
+      <input type="hidden" name="shpkeystorealias" value=""/>
+      <table class="displaytable">
+  #if($CERTIFICATELIST.size() == 0)
+        <tr><td class="message" 
colspan="2">$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.NoCertificatesPresent'))</td></tr>
+  #else
+    #foreach($certificate in $CERTIFICATELIST)
+        <tr>
+          <td class="description">
+            <input type="button" 
onclick='Javascript:ShpDeleteCertificate("$Encoder.attributeJavascriptEscape($certificate.get('ALIAS'))")'
 
alt="$Encoder.attributeEscape($ResourceBundle.getString('SharePointAuthority.DeleteCert'))$Encoder.attributeEscape($certificate.get('ALIAS'))"
 
value="$Encoder.attributeEscape($ResourceBundle.getString('SharePointAuthority.Delete'))"/>
+          </td>
+          <td class="value">
+            $Encoder.bodyEscape($certificate.get('DESCRIPTION'))
+          </td>
+        </tr>
+    #end
+  #end
+      </table>
+      <input type="button" onclick='Javascript:ShpAddCertificate()' 
alt="$Encoder.attributeEscape($ResourceBundle.getString('SharePointAuthority.AddCert'))"
 
value="$Encoder.attributeEscape($ResourceBundle.getString('SharePointAuthority.Add'))"/>&nbsp;
+      
$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.Certificate'))&nbsp;
+      <input name="shpcertificate" size="50" type="file"/>
+    </td>
+  </tr>
+</table>
+
+#else
+
+<input type="hidden" name="serverProtocol" value="$SERVERPROTOCOL"/>
+<input type="hidden" name="serverName" 
value="$Encoder.attributeEscape($SERVERNAME)"/>
+<input type="hidden" name="serverPort" value="$SERVERPORT"/>
+<input type="hidden" name="serverLocation" 
value="$Encoder.attributeEscape($SERVERLOCATION)"/>
+<input type="hidden" name="userName" 
value="$Encoder.attributeEscape($USERNAME)"/>
+<input type="hidden" name="password" 
value="$Encoder.attributeEscape($PASSWORD)"/>
+
+#end

Propchange: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html?rev=1531268&r1=1531267&r2=1531268&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
 (original)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
 Fri Oct 11 12:20:39 2013
@@ -47,7 +47,9 @@
       </table>
     </td>
   </tr>
+  
   <tr><td class="separator" colspan="2"><hr/></td></tr>
+  
   <tr>
     <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.CacheLifetime'))</nobr></td>
     <td class="value"><nobr>$Encoder.bodyEscape($CACHELIFETIME)</nobr> 
$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.minutes'))</td>
@@ -56,4 +58,76 @@
     <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.CacheLRUSize'))</nobr></td>
     <td class="value"><nobr>$Encoder.bodyEscape($CACHELRUSIZE)</nobr></td>
   </tr>
+  
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ServerSharePointVersion'))</nobr></td>
+    <td class="value">
+  #if($SERVERVERSION == '2.0')
+        SharePoint Services 2.0 (2003)
+  #elseif($SERVERVERSION == '3.0')
+        SharePoint Services 3.0 (2007)
+  #elseif($SERVERVERSION == '4.0')
+        SharePoint Services 4.0 (2010)
+  #else
+        Unknown
+  #end
+    </td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ServerProtocol'))</nobr></td>
+    <td class="value">
+      $SERVERPROTOCOL
+    </td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ServerName'))</nobr></td>
+    <td class="value">
+      $Encoder.bodyEscape($SERVERNAME)
+    </td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ServerPort'))</nobr></td>
+    <td class="value">
+      $SERVERPORT
+    </td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.SitePath'))</nobr></td>
+    <td class="value">
+      $Encoder.bodyEscape($SERVERLOCATION)
+    </td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.UserName'))</nobr></td>
+    <td class="value">
+      $Encoder.bodyEscape($USERNAME)
+    </td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.Password'))</nobr></td>
+    <td class="value">
+      ********
+    </td>
+  </tr>
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.SSLCertificateList'))</nobr></td>
+    <td class="value">
+      <table class="displaytable">
+  #if($CERTIFICATELIST.size() == 0)
+        <tr><td class="message" 
colspan="1">$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.NoCertificatesPresent'))</td></tr>
+  #else
+    #foreach($certificate in $CERTIFICATELIST)
+        <tr>
+          <td class="value">
+            $Encoder.bodyEscape($certificate.get('DESCRIPTION'))
+          </td>
+        </tr>
+    #end
+  #end
+      </table>
+    </td>
+  </tr>
+
 </table>

Copied: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/sharepoint/sharepoint-client-config.wsdd
 (from r1531251, 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/sharepoint-client-config.wsdd)
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/sharepoint/sharepoint-client-config.wsdd?p2=manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/sharepoint/sharepoint-client-config.wsdd&p1=manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/sharepoint-client-config.wsdd&r1=1531251&r2=1531268&rev=1531268&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/sharepoint-client-config.wsdd
 (original)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/sharepoint/sharepoint-client-config.wsdd
 Fri Oct 11 12:20:39 2013
@@ -20,7 +20,7 @@
   <globalConfiguration> 
     <parameter name="disablePrettyXML" value="true"/> 
   </globalConfiguration> 
-  <transport name="http" 
pivot="java:org.apache.manifoldcf.crawler.connectors.sharepoint.CommonsHTTPSender">
 
+  <transport name="http" 
pivot="java:org.apache.manifoldcf.sharepoint.CommonsHTTPSender"> 
     <parameter name="SO_TIMEOUT" locked="false">60000</parameter>
   </transport>
   <!-- transport name="http" 
pivot="java:org.apache.axis.transport.http.HTTPSender"/ -->

Reply via email to