svn commit: r1550499 - in /manifoldcf/branches/CONNECTORS-565-2: ./ connectors/sharepoint/ connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/ connectors/sharepoint/connector/src/main/resources/org/apache/...

kwright Thu, 12 Dec 2013 11:21:45 -0800

Author: kwright
Date: Thu Dec 12 19:20:27 2013
New Revision: 1550499

URL: http://svn.apache.org/r1550499
Log:
Pull up changes from original CONNECTORS-565 branch


Modified:
    manifoldcf/branches/CONNECTORS-565-2/   (props changed)
    manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/   (props 
changed)
    
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
    
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
    
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
    
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html
    
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html

Propchange: manifoldcf/branches/CONNECTORS-565-2/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/CONNECTORS-565:r1545907-1550085,1550088-1550498
  Merged /manifoldcf/branches/CONNECTORS-565-2:r1550086-1550087

Propchange: manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/
------------------------------------------------------------------------------
  Merged 
/manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint:r1550086-1550087
  Merged 
/manifoldcf/branches/CONNECTORS-565/connectors/sharepoint:r1545907-1550085,1550088-1550498

Modified: 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1550499&r1=1550498&r2=1550499&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
 Thu Dec 12 19:20:27 2013
@@ -159,7 +159,7 @@ public class SharePointRepository extend
       if (serverVersion == null)
         serverVersion = "2.0";
       supportsItemSecurity = !serverVersion.equals("2.0");
-      dspStsWorks = !serverVersion.equals("4.0");
+      dspStsWorks = serverVersion.equals("2.0") || serverVersion.equals("3.0");
       attachmentsSupported = !serverVersion.equals("2.0");
       
       String authorityType = params.getParameter( 
SharePointConfig.PARAM_AUTHORITYTYPE );

Modified: 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html?rev=1550499&r1=1550498&r2=1550499&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
 (original)
+++ 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
 Thu Dec 12 19:20:27 2013
@@ -42,6 +42,11 @@
   #else
         <option value="4.0">SharePoint Services 4.0 (2010)</option>
   #end
+  #if($SERVERVERSION == '5.0')
+        <option value="5.0" selected="true">SharePoint Services 5.0 
(2013)</option>
+  #else
+        <option value="5.0">SharePoint Services 5.0 (2013)</option>
+  #end
       </select>
     </td>
   </tr>

Modified: 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html?rev=1550499&r1=1550498&r2=1550499&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
 (original)
+++ 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
 Thu Dec 12 19:20:27 2013
@@ -25,6 +25,8 @@
         SharePoint Services 3.0 (2007)
   #elseif($SERVERVERSION == '4.0')
         SharePoint Services 4.0 (2010)
+  #elseif($SERVERVERSION == '5.0')
+        SharePoint Services 5.0 (2013)
   #else
         Unknown
   #end

Modified: 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html?rev=1550499&r1=1550498&r2=1550499&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html
 (original)
+++ 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html
 Thu Dec 12 19:20:27 2013
@@ -42,6 +42,11 @@
   #else
         <option value="4.0">SharePoint Services 4.0 (2010)</option>
   #end
+  #if($SERVERVERSION == '5.0')
+        <option value="5.0" selected="true">SharePoint Services 5.0 
(2013)</option>
+  #else
+        <option value="5.0">SharePoint Services 5.0 (2013)</option>
+  #end
       </select>
     </td>
   </tr>

Modified: 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html?rev=1550499&r1=1550498&r2=1550499&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html
 (original)
+++ 
manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html
 Thu Dec 12 19:20:27 2013
@@ -25,6 +25,8 @@
         SharePoint Services 3.0 (2007)
 #elseif($SERVERVERSION == '4.0')
         SharePoint Services 4.0 (2010)
+#elseif($SERVERVERSION == '5.0')
+        SharePoint Services 5.0 (2013)
 #else
         Unknown
 #end

svn commit: r1550499 - in /manifoldcf/branches/CONNECTORS-565-2: ./ connectors/sharepoint/ connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/ connectors/sharepoint/connector/src/main/resources/org/apache/...

Reply via email to