Author: kwright
Date: Tue Jun 10 15:07:26 2014
New Revision: 1601660
URL: http://svn.apache.org/r1601660
Log:
Pull up changes from 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,1550501-1567621,1567624-1584007,1584010-1601659
Merged
/manifoldcf/branches/CONNECTORS-565-2:r1550086-1550087,1550498-1550500,1567622-1567623,1584007-1584009
Propchange: manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint/
------------------------------------------------------------------------------
Merged
/manifoldcf/branches/CONNECTORS-565-2/connectors/sharepoint:r1550086-1550087,1550498-1550500,1567622-1567623,1584007-1584009
Merged
/manifoldcf/branches/CONNECTORS-565/connectors/sharepoint:r1545907-1550085,1550088-1550498,1550501-1567621,1567624-1584007,1584010-1601659
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=1601660&r1=1601659&r2=1601660&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
Tue Jun 10 15:07:26 2014
@@ -162,7 +162,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=1601660&r1=1601659&r2=1601660&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
Tue Jun 10 15:07:26 2014
@@ -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=1601660&r1=1601659&r2=1601660&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
Tue Jun 10 15:07:26 2014
@@ -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=1601660&r1=1601659&r2=1601660&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
Tue Jun 10 15:07:26 2014
@@ -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=1601660&r1=1601659&r2=1601660&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
Tue Jun 10 15:07:26 2014
@@ -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
